From dc5c72f38bf3a12a536b7404ef385d3c7c75a47b Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 13:32:37 +0800 Subject: [PATCH] =?UTF-8?q?gm35=E4=B8=8A=E7=94=B5=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E9=97=B410s->2s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 563192 -> 563192 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 121605 -> 121677 bytes source/app/app_task_gm35.c | 2 +- source/app/app_task_tcp.c | 8 ++++---- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym index fef1fb703c0982378c6fd1cf0b7b4f7cf47bf862..7b1248359070f88bd73434fa35b856a3a787b0ec 100644 GIT binary patch delta 231 zcmeydUg^hrB|%Yk28LJ$1{O|k1_m=828Pm&g4y+xA52zhUQoY%K|SM=51eJp3=AB_ zsd*`rKm78ZT)@IIJ>dx($MhuyOd%|VK)Lom1x!H9y!}rB3y1mi5A&E=rZ?m<@i1CW z7hS=!nUQC5W4AEloXHF8g_nO=0n)x4s3M??U17S&T9ygZy4h8xp8ztZ8|VR9HS1Uw zOz+vwA~M}zJ<9~3OIW6#*~X$U{mFW$IPY>c28MtC|NmbNq`jsWPGdKjewLfje{zEm UOS{fS5M~8pw(U9_+0Q%!0DD+gi~s-t delta 270 zcmeydUg^hrB|%Yk28LJ$1{Q8^1_m=828P0og4y-c7nC!pG%u*%zM!6Q$%kpYEUYZW zsd*`rKm78ZT)@IIJ>dx($MhuyOd%kt_P+&8K+L@TZvhLt`SgV4%q+aD3=9l{Knwy_ z(?wUXY-Z%09=L;9m~qbJh4sSAKdfM3nY4jrdcjv_f$1!3Sr$xIkYJgf@s3$x`iZqH z6DB{H%)-kE)C+VR81PLFOcb78vyNo}Bj4o4IPvKw>sflHf0zffN(`t#0Eof#^o#3( zR`E?%OcAbsvXPyB7 D7Kv3z diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm index 210a773a03373345b012b93e68362c3ff26a688a..20f8fa12c28a6520d2daa0832faa5f3163d99d78 100644 GIT binary patch delta 16 XcmX@YbcAVwGAn}@0|UcG4H-rNC3pjc delta 16 XcmX@YbcAVwGAp|m0|Wa;4H-rNCE5d% diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 8a3d955d6157d30db70d4036c42163cebb918e5a..19c990228b410beaf865a3c96253c7946a5542fb 100644 GIT binary patch delta 10629 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 ZuP3p7T3b>q&<>mw>x`66J9tu@{Qr%^XY~L8 delta 10487 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 Wzd9l{Y6SpAckPkg->slaver == G.ccmd_slaver_info[s->slaverIndex].slaver) { s->ackFlag = 1; + if(G.ccmd_slaver_info[s->slaverIndex].mask == 1) + { + G.ccmd_slaver_info[s->slaverIndex].mask = 0; + } } } else @@ -72,10 +76,6 @@ void L3_task_tcp_handle(TS_tcp *s) } if(s->ackFlag || s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) { - if(G.ccmd_slaver_info[s->slaverIndex].mask == 1) - { - G.ccmd_slaver_info[s->slaverIndex].mask = 0; - } L2_task_go(D_task_tcp_switch_next_slaver); } else