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 4656755..10d2d86 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym and b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym differ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index fa41e13..75f0e8c 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_common.c b/source/app/app_common.c index ed8a868..9726334 100644 --- a/source/app/app_common.c +++ b/source/app/app_common.c @@ -61,6 +61,12 @@ void Lu_register_init() G.md_slaver_info[3].buf = (U8*)&G.rfid; G.md_slaver_info[3].mask = 0; + G.md_slaver_info[4].slaver = SLAVER_SHOW01_ID; //显示板按键 + G.md_slaver_info[4].oper = MODBUS_OPER_READ; + G.md_slaver_info[4].reg = 0x08; + G.md_slaver_info[4].regnum = 0x01; + G.md_slaver_info[4].mask = 2; + for(i=0;ipAckPkg->buf[3]) << 8 | (U16)(s->pAckPkg->buf[4]); G.asga.zaxis = (U16)(s->pAckPkg->buf[5]) << 8 | (U16)(s->pAckPkg->buf[6]); } + 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 + { + G.rfid = s->pAckPkg->buf[1] << 8 | s->pAckPkg->buf[2]; + } + } } } s->retryTimes++;