From d129c781e7ddcce69104869db13e5c51c4b41673 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 17:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=94=AE=E8=BE=93?= =?UTF-8?q?=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 121677 -> 121713 bytes source/app/app_task_485.c | 3 +++ 4 files changed, 3 insertions(+) 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 7b1248359070f88bd73434fa35b856a3a787b0ec..88665fd3d8efb7540f694977678f537af26cf314 100644 GIT binary patch delta 51 zcmeydUg^hrrG^&97N!>FEi4-*bLTTKFfal!Cxc)6?#V1b%nHP8K+L{<_hb%R769P{ B5-I=y delta 51 zcmeydUg^hrrG^&97N!>FEi4-*bLTKHFfal!CxcJ>?#V1b%nHP8K+L{<_hb%R769OL B5+wit 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..32c03eb0f4810f32c3566f9bcd47a789149634b2 100644 GIT binary patch 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 literal 324 zcmWN=iBbVj006)jk%&r;F6l&4NKuj$l|=ggudzF`A%w7I#Hj1WjJsjOnF%*dnsUpu z3;$gDZ^ms;%(`dJyakKyd*Go*9$T_%*;DWBxZ|#8p8MdVU3)%R^V+&M-g;-#mTjNy eJMq(B=YIL^)E_Ur^u>X%4t;avyC06dvf>I_&J3vl diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 19c990228b410beaf865a3c96253c7946a5542fb..a1694e0eb82712456e2ccc99d4e767c232136885 100644 GIT binary patch delta 10287 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 delta 10574 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 diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 5672e78..61bba68 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -79,6 +79,9 @@ 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]);