From ffcc0fa428166056514ccf92f7bfdd231e45f849 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 09:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.siwork | Bin 121586 -> 121683 bytes source/app/app_task_485.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 75f0e8cc027db12a5a03a4762ee6819502387079..66280f876b3934d62e0704bbf301f3810c02a12e 100644 GIT binary patch delta 10432 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 delta 10375 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 diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index ddead16..6ac80fc 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -72,9 +72,9 @@ void L3_task_485_handle(TS_485 *s) } else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver && s->pAckPkg->oper == MODBUS_OPER_READ) { - 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 = s->pAckPkg->buf[1] << 8 | s->pAckPkg->buf[2]; + G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); } } }