From 1e9370be58c2c6bb3ec09f585592c13b6a0bb1a4 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Wed, 16 Dec 2020 20:47:12 +0800 Subject: [PATCH] =?UTF-8?q?tcp=E4=B8=8A=E4=BC=A0=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E4=B8=B2=E5=8F=A30=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 563192 -> 563192 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 121684 -> 121691 bytes source/app/app_task_tcp.c | 3 ++- 4 files changed, 2 insertions(+), 1 deletion(-) 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 df8e79afb24058d2f2789c7bbf87a032311ad9e6..0654671145e88d65bab4bfb83e449098108b78b2 100644 GIT binary patch delta 78 zcmeydUg^hrrG^&97N!>F7M2#)7Pc+y9!a9{3=9m6K+MWu4F7M2#)7Pc+y9!a9H3=9m6K+MWu3nU?+X1ZW9yZGds294Wk 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 20f8fa12c28a6520d2daa0832faa5f3163d99d78..5bf3baa312b8438bfcc1c1de8de450b58aeb4dd4 100644 GIT binary patch delta 11 ScmX@YbcAVwGb8e)XVjss2r delta 11 ScmX@YbcAVwGb6)77e)XVasx*I diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index b22d730d911ef42268eb3f312e8e121ff6c6c7ec..f6f36de2bf51ffefe64abdfa7a25f38cd1bdb0f3 100644 GIT binary patch delta 10843 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 K_y?aTW&aDQ$6d_; delta 10685 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,s->pkglen); + 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); @@ -56,6 +56,7 @@ void L3_task_tcp_handle(TS_tcp *s) { s_uart4_tcp_rec.ok = 0; s->pAckPkg = (TS_PH3_ccmodbus*)(s_uart4_tcp_rec.sp); + L0_uart0_sendArray(s->pAckPkg,s->pAckPkg->num + 3); if(s->pAckPkg->slaver == G.ccmd_slaver_info[s->slaverIndex].slaver) { s->ackFlag = 1;