From 2ecb630ee35cbfee217d85e233c8b73ba0d83ee2 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 18:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=8C=89=E9=94=AE=E4=B8=8Erf?= =?UTF-8?q?id?= 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 121713 -> 121729 bytes source/app/app_common.c | 2 ++ source/app/app_common.h | 2 ++ source/app/app_drv.c | 5 ++++- source/app/app_task_485.c | 11 +++++++++-- 7 files changed, 17 insertions(+), 3 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 88665fd3d8efb7540f694977678f537af26cf314..15052506be120167de5d395f5274a1188b35bfe5 100644 GIT binary patch delta 398 zcmeydUg^hrB|%Yk28LJ$1{Q8^1_m=828P0og2uw!c?=8;j6lrH5VF}{I8|(N!44K) zO`yPSAO_Qu4;~iYd_(gI+vExJSa^XN8SVlx&@hI(lg}C~o_?W_6(W2GDtu>iqhUDX z^nwHIDx3cpz2Tj#aE65!WXDb*27wEc4d)9_y2~zu-vr%zbO#xmLAoWkTEt`nvQD6jxkUsTw<#!bdznlc;D^bILYER3;}9UFuO6PdoCgq3BwPd`wZ$$Ww71%*J%q9=b0v}xa1$OOd9 z+cy@n{8!{IgWAf;5Vn2yWR{Jh(=Yr0YShtU;a~+yF)V4XUC9E(tU%1Ry>=yg^*aEH C^m*R^ delta 380 zcmeydUg^hrB|%Yk28LJ$1{O|k1_m=828Pm&g2uw!ISdR8j6lrH5WLx6I8|)&f!Qp) znm~b@Kn$iQA3Q9)`G)2bw#fxMSa^XN8EykH&@hJElg}C~7Q6*yfkZ(xNc7g`M#FH% z=>ZBXERzK;Ds28^^oDnO10xd)FUX#qKnw!sCL7Kdo^%(e#BmPexyg-j;**bnS&2^4 zOlb_8>zu-vrxzSxSDF07b;9%?a?C25*SN`8Oi!51A;1_l-LaNgc=MaO5JpB{FuOUV zVS7jeU4ugL*CEYo!w*##!EcnC}{C}d)p9X%4t;avyC06dvf>I_&J3vl literal 324 zcmWN}=~e+y6b8^+l%bG>Ml=W+QmD|Nk!bM#Ph-)~RcbyPIbd7Z)MA=|7gjh_r zm=h;KGK8?jww{u|@{fO(q{-Nq*wu6Fk*7eBeQyUG>PPaJ6Kdu%6>iNvcJwT#`Wbx& z+;PtXbsAjJr0su)Yr5PpWW)!bEcoGzDKow~=faJ#eB?=gmM=_r<&AgyDwnJP>1_>w diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index a1694e0eb82712456e2ccc99d4e767c232136885..9078c1eb60753ddcf88356e1b351b0335d9f5afb 100644 GIT binary patch literal 121729 zcmeHw3wRvGm2S&cj}7KAwruPm2m=@_8zYZiwrm5I@gp`kAY>WaSTHjl$(CY025Ag7 zdFi_eHzw<36`l@oL68^-Bt#H4>yQnZBy4aXfB;*Vm;{kcvd&`@eRs*mo1447|6g4- zQ_~tfW+d)rCUw5=OjXyZQ&oMcr~f+D)m;-OTh{fKl|KV)84?y)xuh=KR^QaRJ+Pyp zskts34zza!T0%{&fsntXuA`~EuA^;RG_bv+MWhxZCDPvZk%n+IS&*&f9O3-icD9Eb z>OzqSIS>tX>hcddm&Pq2c=rplN~7%-{+*4@vr>jbjzxkH|4($%KwR*$hmij

6E|cmU@TxP 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,p->ts_ccmodbus.num + 3); - G.rfid = ccmodbus.buf[0]; + if(ccmodbus.buf[0] != G._rfid) //rfid发生改变 + { + G.rfid = G._rfid = ccmodbus.buf[0]; + } L0_uart3_uc(G.rfid & 0xFF); #else L0_uart3_uc(p->reg); diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 61bba68..162525e 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -65,6 +65,9 @@ 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 +85,13 @@ void L3_task_485_handle(TS_485 *s) 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 + //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]); + //} + if(s->pAckPkg->buf[2] != G._keyled) //按键发生改变 { - G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); + G.rfid = G._keyled = s->pAckPkg->buf[2]; } } }