Browse Source

gm35上电等待时间10s->2s

master
zhangsan 5 years ago
parent
commit
dc5c72f38b
  1. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym
  2. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm
  3. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.siwork
  4. 2
      source/app/app_task_gm35.c
  5. 8
      source/app/app_task_tcp.c

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym

Binary file not shown.

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm

Binary file not shown.

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.siwork

Binary file not shown.

2
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) void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
{ {
TTSS_Task_init() 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) TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATEQV)
L0_uart4_sendstr(AT_INS_ATEQV); L0_uart4_sendstr(AT_INS_ATEQV);

8
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) if(s->pAckPkg->slaver == G.ccmd_slaver_info[s->slaverIndex].slaver)
{ {
s->ackFlag = 1; s->ackFlag = 1;
if(G.ccmd_slaver_info[s->slaverIndex].mask == 1)
{
G.ccmd_slaver_info[s->slaverIndex].mask = 0;
}
} }
} }
else else
@ -72,10 +76,6 @@ void L3_task_tcp_handle(TS_tcp *s)
} }
if(s->ackFlag || s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) 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); L2_task_go(D_task_tcp_switch_next_slaver);
} }
else else

Loading…
Cancel
Save