From 508d7d27b39caffc95a22c94644a26a13075a3b1 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 19:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=80=E5=8C=96=E8=BE=93=E5=87=BA?= 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 121729 -> 121394 bytes source/app/app_drv.c | 1 - source/app/app_task_485.c | 6 ------ 5 files changed, 7 deletions(-) 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 15052506be120167de5d395f5274a1188b35bfe5..7e6cdacab91a8f500d1c835c540e2494b7d558a8 100644 GIT binary patch delta 51 zcmeydUg^hrrG^&97N!>FEi4-*a~Ci$Ffal!CqqE{?#V1b%nHP8K+L{<_hb%R769Q> B5-k7# delta 51 zcmeydUg^hrrG^&97N!>FEi4-*bC)qNFfal!Cqr2K?#V1b%nHP8K+L{<_hb%R769U- B5;*_> 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..ce6efda4c611e014098d3dffd01256a3a54144a2 100644 GIT binary patch delta 21 ZcmX@YbcBhA0SFj@n2CXbeIt(rBLE|10+|2+ delta 21 YcmX@YbcBhA0SFj@mnne03$*Ik^lez diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 9078c1eb60753ddcf88356e1b351b0335d9f5afb..f39bad8bef11df7af005f72e5fbcd21c2b96edfe 100644 GIT binary patch delta 10454 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 lYdgyk6HYRp=yrs3 diff --git a/source/app/app_drv.c b/source/app/app_drv.c index cb7b5dd..480df67 100644 --- a/source/app/app_drv.c +++ b/source/app/app_drv.c @@ -72,7 +72,6 @@ void L3_UARTcom3_exp_protocol(TS_Handle_PH3 *p) { G.rfid = G._rfid = ccmodbus.buf[0]; } - L0_uart3_uc(G.rfid & 0xFF); #else L0_uart3_uc(p->reg); #endif diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 162525e..85af9a5 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -65,9 +65,6 @@ void L3_task_485_handle(TS_485 *s) //TODO 这里可以根据modbus协议让代码通用, if(s->pAckPkg->oper == MODBUS_OPER_READ) { - L0_uart0_uc(s->pAckPkg->salver); - Lc_delay_ms(70); - L0_uart0_uc(G.md_slaver_info[4].slaver); if(s->pAckPkg->salver == G.md_slaver_info[0].slaver) { G.total_weight = @@ -82,9 +79,6 @@ void L3_task_485_handle(TS_485 *s) } else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver) { - L0_uart0_uc(s->pAckPkg->buf[1]); - Lc_delay_ms(70); - L0_uart0_uc(s->pAckPkg->buf[2]); //if(s->pAckPkg->buf[1] != 0 || s->pAckPkg->buf[2] != 0) //按键不为0 //{ // G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]);