|
|
@ -6,7 +6,7 @@ |
|
|
|
|
|
|
|
#define MODBUS_SLAVER_DW20_REG_START 0x02 |
|
|
|
#define MODBUS_SLAVER_DW20_REG_NUM 0x02 |
|
|
|
#define MODBUS_SLAVER_RETRY_MAX_TIME 3 |
|
|
|
#define MODBUS_SLAVER_RETRY_MAX_TIME 5 |
|
|
|
|
|
|
|
TS_tcp ts_tcp; |
|
|
|
|
|
|
@ -44,14 +44,13 @@ void L3_task_tcp_handle(TS_tcp *s) |
|
|
|
} |
|
|
|
|
|
|
|
TTSS_Task_step(D_task_tcp_send_modbus_pkg) |
|
|
|
|
|
|
|
//L0_uart0_sendArray((U8*)&s->loopPkg,s->pkglen);
|
|
|
|
L3_gm35_send((U8*)&s->loopPkg,s->pkglen); |
|
|
|
s->sendStamp = s_nos_tick.t_5ms; |
|
|
|
L2_task_go(D_task_tcp_wait_modbus_ack); |
|
|
|
|
|
|
|
TTSS_Task_step(D_task_tcp_wait_modbus_ack) |
|
|
|
if(s_nos_tick.t_5ms - s->sendStamp >= 200) |
|
|
|
if(s_nos_tick.t_5ms - s->sendStamp >= 300) |
|
|
|
{ |
|
|
|
if(s_uart4_tcp_rec.ok) |
|
|
|
{ |
|
|
@ -62,7 +61,14 @@ void L3_task_tcp_handle(TS_tcp *s) |
|
|
|
s->ackFlag = 1; |
|
|
|
} |
|
|
|
} |
|
|
|
s->retryTimes++; |
|
|
|
else |
|
|
|
{ |
|
|
|
if(++s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) |
|
|
|
{ |
|
|
|
//断开连接
|
|
|
|
g_at_send_status.conn_ok = 0; |
|
|
|
} |
|
|
|
} |
|
|
|
if(s->ackFlag || s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) |
|
|
|
{ |
|
|
|
if(G.ccmd_slaver_info[s->slaverIndex].mask == 1) |
|
|
|