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 fef1fb7..7b12483 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym and b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym differ 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 210a773..20f8fa1 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm and b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm differ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 8a3d955..19c9902 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork and b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork differ diff --git a/source/app/app_task_gm35.c b/source/app/app_task_gm35.c index 3fa7189..91fc301 100644 --- a/source/app/app_task_gm35.c +++ b/source/app/app_task_gm35.c @@ -224,7 +224,7 @@ void L2_task_gm35_daemon_handle(struct _s_task_gm35_gprs_ *s) void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s) { TTSS_Task_init() - L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATEQV,D_Tdelay_10s);//上电等待10s + L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATEQV,D_Tdelay_2s);//上电等待10s TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATEQV) L0_uart4_sendstr(AT_INS_ATEQV); diff --git a/source/app/app_task_tcp.c b/source/app/app_task_tcp.c index 089fc1d..aafca60 100644 --- a/source/app/app_task_tcp.c +++ b/source/app/app_task_tcp.c @@ -60,6 +60,10 @@ void L3_task_tcp_handle(TS_tcp *s) if(s->pAckPkg->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