Sfoglia il codice sorgente

解决检测后,再次扫码问题

yidongFan 1 mese fa
parent
commit
36cd0d7ff4

+ 4 - 2
DriverInterface/state_mini.c

@@ -405,8 +405,10 @@ void usr_state_machine(ProcessStateMachine_t *sts, heat_ctrl_def *heater)
     case SW_Chip_Id:
     {
         if (TrigStateCheck() == CardON)
-        {
-			HAL_Delay(1000);/*插卡后延时1s检测*/
+        {		
+      		Refresh_IWDG();
+			HAL_Delay(1000);/*插卡后延时1s检测*/		
+      		Refresh_IWDG();
 			if(!(sysinf.skip_CheckOrRun & SKIP_CHECK_CARDINSERT)){
 				if(check_first_zero() == 1){                    
                     updateAmplifState(SYS_STATE_ERROR_HW); 

+ 7 - 3
DriverInterface/van_BSP_Scanner.c

@@ -113,7 +113,8 @@ void svanner_receive_analysis(void)
 {
 	if(received_len){	
 		// Van_Device_Printf(VAN_LOG_INFO, "rec QR inif %d \n\r",received_len);
-		if (('{' == g_uart2_rx_buf[0]) && (sysinf.updateQR == false)){
+		if (('{' == g_uart2_rx_buf[0]) && (sysinf.updateQR == false)){			
+      		Refresh_IWDG();
 			if(0 == parse_qrcode_info(&m_str_card_param_info,  (char *)&g_uart2_rx_buf[0])){
 				haveheaderflag = QR_REC_STATE_SENDPRAM; 	
 				memcpy(&g_uart2_rx_buf[received_len],  sysinf.SN, 7);
@@ -124,15 +125,18 @@ void svanner_receive_analysis(void)
 					sysinf.updateQR = true;
 					data_send_to_pc(PC_CMD_QRCODE,(char *)g_uart2_rx_buf, received_len);	
 					memcpy(&sysinf.psmMaster.card_param_info, &m_str_card_param_info, sizeof(str_card_param_info_t));
+					sysinf.resendeQRtimer = 1;				       
+					// beep_set(BEEP_SCANOK);
 				}
-				else{
+				else{	
+					svanner_receive_Rec_Start(sysinf.scannerUart);
 #ifdef ONECHIP_MINI_PLUSE
 				if((sysinf.psmSlave.state == SW_Scan_Qrcode || sysinf.psmSlave.state == SW_Chip_Id  )){
 
 					}
 #endif
 				}
-				sysinf.resendeQRtimer = 1;
+				// sysinf.resendeQRtimer = 1;
 				       
 				beep_set(BEEP_SCANOK);
 			}

File diff suppressed because it is too large
+ 2 - 2
MDK-ARM/mini7_V2.uvguix.Administrator


Some files were not shown because too many files changed in this diff