From 892bb563edca04c3a3376974620170f6ef387929 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sun, 20 Dec 2020 16:57:39 +0800 Subject: [PATCH] 2323232323 --- .../soft_gsm_main.sip_sym | Bin 509732 -> 509732 bytes .../soft_gsm_main.siwork | Bin 121848 -> 121913 bytes source/app/app_task_tcp.c | 10 +--------- 3 files changed, 1 insertion(+), 9 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 789c675451fb5bea566d10976c8c2b8229d83074..5e17e23f60fb65d9b42fcce4264b21e881090250 100644 GIT binary patch delta 77 zcmZ3|C%>dmzF`ZagrI0L0|Nsi5VJEl14#&InEp_ZQGD{8T8-%i+Kim-rGkt=%ml>D SK+FQftU%1Ry;P8W{Z;^_BNG4s delta 77 zcmZ3|C%>dmzF`ZagrI0P0|Nsi5OXki14#&InEp_ZQGD{8T8-%i+Kim-rGkt=%ml>D SK+FQftU%1Ry;P8W{Z;^}91{@$ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 1e8d4e86db998f6c1a11f65f7a498e7a5931719b..f5f944d6737ad611cb44d640818314158395679d 100644 GIT binary patch delta 10074 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 delta 10087 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 >= MODBUS_SLAVER_RETRY_MAX_TIME) - { - //断开连接 - g_at_send_status.conn_ok = 0; - } - } - if(s->ackFlag || s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) + if(s->ackFlag || ++s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) { L2_task_go(D_task_tcp_switch_next_slaver); }