From 1d148ecd5344a9f4a58057b2139ce317b777db06 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 9 Mar 2023 09:55:51 +0800 Subject: [PATCH] 解决ID=1的键盘不能扫描上来的问题 --- Base_core/core_src/base_process_rx_keypad.c | 2 +- Base_core/core_src/base_process_tx_keypad.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Base_core/core_src/base_process_rx_keypad.c b/Base_core/core_src/base_process_rx_keypad.c index 411054d..50b0a94 100644 --- a/Base_core/core_src/base_process_rx_keypad.c +++ b/Base_core/core_src/base_process_rx_keypad.c @@ -241,7 +241,7 @@ unsigned char keypad_crs2_mode(const unsigned char *rxkp,unsigned char rf_id) tmp[0] =type; mem_cpy(rxkp+2,tmp+1,len); - if(rxkp[17] == 1)//入网申请,20220621 + if(rxkp[17] == 1 && rxkp[2] == 11)//入网申请,20220621 { if((rxkp[15]*256 + rxkp[16])== function.network__get_pwd() || function.network__get_pwd()==0)//密码正确或无密码 { diff --git a/Base_core/core_src/base_process_tx_keypad.c b/Base_core/core_src/base_process_tx_keypad.c index c901f6d..21219fa 100644 --- a/Base_core/core_src/base_process_tx_keypad.c +++ b/Base_core/core_src/base_process_tx_keypad.c @@ -189,7 +189,7 @@ unsigned char keypad_idsn_save(const unsigned char *idsn,unsigned char byteN,uns // multi.multi_idsn[rf_id].idsn[idsn_count][4] =1; multi.multi_idsn[rf_id].idsn[idsn_count][4] = idsn[8];//20221008 用于解决测验题丢题，键盘发了， 基站未收到的bug,可能是键盘ACK逻辑问题 - if(idsn[14] == 1)//入网申请,20220621 + if(idsn[14] == 1 && *(idsn-1)== 11)//入网申请,20220621 { if((idsn[12]*256 + idsn[13])== function.network__get_pwd() || function.network__get_pwd()==0)//密码正确或无密码 { -- libgit2 0.21.4