diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 75f0e8c..66280f8 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork and b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork differ 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]); } } }