解决ID=1的键盘不能扫描上来的问题

李外
1 parent 5913e7ab
Showing 2 changed files with 2 additions and 2 deletions
Base_core/core_src/base_process_rx_keypad.c
Base_core/core_src/base_process_tx_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)//密码正确或无密码
             {
@@ -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)//密码正确或无密码
                     {