From bbbdcb3f9c725b8e99ef08aa000799f72e61be11 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sun, 20 Dec 2020 16:37:18 +0800 Subject: [PATCH] 222 --- .../soft_gsm_main.siwork | Bin 121682 -> 121524 bytes source/app/app_common.c | 2 +- source/app/app_task_tcp.c | 2 +- source/app/app_task_tcp_control.c | 5 +++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 906c4d75a1e22df3b83f06039a2d9d089990073e..bc94bd3e84f479f0271cd4901e102fae66757b8c 100644 GIT binary patch delta 10358 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 C^f5pH delta 10159 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 Qv8un^t7*n5`DDuf0YmWiF8}}l diff --git a/source/app/app_common.c b/source/app/app_common.c index 1d86ec7..1afd5fa 100644 --- a/source/app/app_common.c +++ b/source/app/app_common.c @@ -93,7 +93,7 @@ void Lu_register_init() G.ccmd_slaver_info[2].reg = 0x03; G.ccmd_slaver_info[2].regnum = 0x01; G.ccmd_slaver_info[2].bytes = G.ccmd_slaver_info[2].regnum * 2; - G.ccmd_slaver_info[2].buf = (U8*)&G.flowStart; + G.ccmd_slaver_info[2].buf = (U8*)&G.flowStarted; G.ccmd_slaver_info[2].mask = 0; G.ccmd_slaver_info[3].slaver = SLAVER_TCP_SERVER_ID; //服务? diff --git a/source/app/app_task_tcp.c b/source/app/app_task_tcp.c index a1fe1e7..17ca18a 100644 --- a/source/app/app_task_tcp.c +++ b/source/app/app_task_tcp.c @@ -67,7 +67,7 @@ void L3_task_tcp_handle(TS_tcp *s) if(s->pAckPkg->oper == MODBUS_OPER_WRITE_M) { - U16 reg = (U16)(s->pAckPkg.buf[0]) << 8 | (U16)(s->pAckPkg.buf[1]); + U16 reg = (U16)(s->pAckPkg->buf[0]) << 8 | (U16)(s->pAckPkg->buf[1]); if(reg == G.ccmd_slaver_info[0].reg) { //收到认证包ack diff --git a/source/app/app_task_tcp_control.c b/source/app/app_task_tcp_control.c index 1cf079b..b355c06 100644 --- a/source/app/app_task_tcp_control.c +++ b/source/app/app_task_tcp_control.c @@ -57,6 +57,7 @@ void L3_task_tcp_control_handle(TS_tcp_control *s) } +#if 0 void L3_task_tcp_control_handle111(TS_tcp_control *s) { TTSS_Task_init(); @@ -73,7 +74,7 @@ void L3_task_tcp_control_handle111(TS_tcp_control *s) G.ccmd_slaver_info[0].mask = 1; //发送流程开始包 - if(G.flowStart == 0) + if(G.flowStarted == 0) { G.flowStart = 1; G.ccmd_slaver_info[2].mask = 1; @@ -96,6 +97,6 @@ void L3_task_tcp_control_handle111(TS_tcp_control *s) TTSS_Task_end(); } - +#endif