告警状态，自验证完成

BoardInterface/onechip_devinf_define.h

@@ -110,6 +110,8 @@ typedef struct {
 	uint8_t updateQR;
 	uint32_t resendeQRtimer;
 	uint32_t QRBeepTimeer;
+    uint32_t error_delay; 
+
 	
 	ProcessStateMachine_t psmMaster;
 	ProcessStateMachine_t psmSlave;

Core/Src/main.c

@@ -211,14 +211,14 @@ int main(void)
 	}
 	if(	SensorSelfCheckPass()){
 		Van_Device_Printf(VAN_LOG_ALLPRINT, "SensorSelfCheck pass\n\r");	
-   sysinf.psmMaster.state = SW_Read_To_Board_Selftest;
+    sysinf.psmMaster.state = SW_Read_To_Board_Selftest;
+    sysinf.lysis.thermostat_st = THERMOSTAT_PWRON;
+    sysinf.lysis.firstin = True;
 	}else{
 		Van_Device_Printf(VAN_LOG_ALLPRINT, "SensorSelfCheck failed\n\r");
     error_set(ERROR_SENSOR_SELF_CHECK);
     updateAmplifState(SYS_STATE_ERROR_HW); 
     sysinf.psmMaster.state =  SW_SystemError;
-    sysinf.lysis.thermostat_st = THERMOSTAT_PWRON;
-    sysinf.lysis.firstin = True;
 	}
   
 	PackDeviceNum();
@@ -253,6 +253,9 @@ int main(void)
 			HAL_GPIO_TogglePin((GPIO_TypeDef *)sysinf.run_led_port, sysinf.run_led_pin); /*green*/      
       update_work();
       resetSampleData(&sysinf.psmMaster);
+      if(sysinf.error_delay){
+        sysinf.error_delay--;
+      }
 		}
     if(sysinf.resendFlag == 1 ){
       sysinf.resendFlag  = 0;      

DriverInterface/ESP32_WROOM_32D.h

@@ -61,7 +61,7 @@ typedef enum{
 #define User_ESP32_TCPServer_IP     "192.168.3.182"
 #define User_ESP32_TCPServer_PORT   "8002"
 #define User_ESP32_UDPServer_IP     "255.255.255.255"
-#define User_ESP32_UDPServer_PORT   "9090"
+#define User_ESP32_UDPServer_PORT   "9091"
 
 char* find_str(void *src, int size,char *str);
 void WIFI_set_ssid(void);

DriverInterface/state_mini.c

@@ -14,7 +14,6 @@ int samp_num = 0;
 uint8_t datasope_flag = 0;
 
 str_error_info_t error_info = {0};    //错误信息
-uint32_t error_delay = 0;    //错误持续时长
 // test_result_struct result = {0};
 heat_ctrl_struct g_heat_ctrl = {0};
 
@@ -204,7 +203,7 @@ uint8_t error_set(uint8_t error)
 
     if(error == ERROR_SAMP_MOVE_CARD)   //检测中拔卡，需等待60S才能消除
     {
-       error_delay = 60; 
+       sysinf.error_delay = 60; 
     }    
     error_info.error_code = error;
     error_info.id = 0;
@@ -215,7 +214,7 @@ uint8_t error_set(uint8_t error)
 	error_info.SN[7] = 0;
     error_info.error_report = 1;
     data_send_to_pc(PC_CMD_REPORT_REEOR, (char*)&error_info, sizeof(str_error_info_t));
-    
+    sysinf.psmMaster.state = SW_Fault;
 //    if(error != ERROR_MOTOR_FIALED){
 // 	   sysinf.psmMaster.state = SW_Fault;
 // 	//    mcu_ack_ctrl.re_send_card = ACK_TIMEOUT;
@@ -309,7 +308,7 @@ void usr_state_machine(ProcessStateMachine_t *sts, heat_ctrl_def *heater)
         
         sts->sampleStart = 0;
 
-        if(error_info.error_code < ERROR_SENSOR_SELF_CHECK && error_delay == 0)
+        if(error_info.error_code < ERROR_SENSOR_SELF_CHECK && sysinf.error_delay == 0)
         {
             //拔卡消除故障
             if (TrigStateCheck() == CardOFF)

DriverInterface/user_heater.c

@@ -64,18 +64,18 @@ void heater_work(heat_ctrl_def *heater)
         }
     }
     
-    if((heater->pid.realtemp < HEATER_MIN_TEMP) || (heater->pid.realtemp > HEATER_MAX_TEMP)){
+    if((heater->pid.realtemp < HEATER_MIN_ERROR_TEMP) || (heater->pid.realtemp > HEATER_MAX_ERROR_TEMP)){
         /*稍后添加*/
          com_pwm_Set(heater->pwdId,0);  
-         heater->HeatState = SystemPreHeat;
+         heater->HeatState = SysERRORHeat;
+         error_set(ERROR_HEAT_SELF_CHECK);
+         updateAmplifState(SYS_STATE_ERROR_HW);
          return;
-
     }
-    if((heater->pid.realtemp < HEATER_MIN_ERROR_TEMP) || (heater->pid.realtemp > HEATER_MAX_ERROR_TEMP)){
+    if((heater->pid.realtemp < HEATER_MIN_TEMP) || (heater->pid.realtemp > HEATER_MAX_TEMP)){
         /*稍后添加*/
          com_pwm_Set(heater->pwdId,0);  
-         heater->HeatState = SysERRORHeat;
-         error_set(ERROR_HEAT_SELF_CHECK);
+         heater->HeatState = SystemPreHeat;
          return;
 
     }
@@ -98,6 +98,8 @@ void heater_work(heat_ctrl_def *heater)
                         com_pwm_Set(heater->pwdId,0);
                         /*TODO 加热模块故障*/
                         error_set(ERROR_HEAT_TIMEOUT);
+                        updateAmplifState(SYS_STATE_ERROR_HW);
+                        Van_Device_Printf(VAN_LOG_ERROR, "HEAT_TIMEOUT at:%d\n\r",__LINE__);
                         heater->HeatState = SysERRORHeat;
                         return;
                     }
@@ -137,8 +139,10 @@ void heater_work(heat_ctrl_def *heater)
                 if((heater->pid.realtemp<heater->PresetTempVal))
                 {
                     /*TODO 加热模块故障*/
-                    com_pwm_Set(heater->pwdId,0);                    
+                    com_pwm_Set(heater->pwdId,0);      
+                        Van_Device_Printf(VAN_LOG_ERROR, "HEAT_TIMEOUT at:%d\n\r",__LINE__);              
                     error_set(ERROR_HEAT_TIMEOUT);
+                    updateAmplifState(SYS_STATE_ERROR_HW);
                     heater->HeatState = SysERRORHeat;
                     return;
                 }
@@ -184,6 +188,8 @@ void heater_work(heat_ctrl_def *heater)
                     {
                         com_pwm_Set(heater->pwdId,0);
                         error_set(ERROR_HEAT_TIMEOUT);
+                        updateAmplifState(SYS_STATE_ERROR_HW);
+                        Van_Device_Printf(VAN_LOG_ERROR, "HEAT_TIMEOUT at:%d\n\r",__LINE__);
                         heater->HeatState = SysERRORHeat;
                         return;
                     }

DriverInterface/usr_lysis.c

@@ -23,7 +23,7 @@ extern uint32_t conter10ms;
 #define COOL_WORK_THD 5 
 #define HEAT_WORK_THD 2.5
 #define COOL_TEST_TIME 30 
-#define HEAT_TEST_TIME 6000
+#define HEAT_TEST_TIME 3000
 #define COOL_TEST_PWR -50
 #define HEAT_TEST_PWR 50 
 #define THERM_ADC_CHN 5 
@@ -189,7 +189,8 @@ uint32_t lysis_work(void) {
 
   temp = getADC_Chanel_value(1);  
   if(temp < MIN_TEMPERATUARE || temp > MAX_TEMPERATUARE){
-	error_set(ERROR_TEMPSENSOR_EER);
+	error_set(ERROR_TEMPSENSOR_EER);		
+	updateLysisState(SYS_STATE_ERROR_HM);
 	ptherm->thermostat_st = THERMOSTAT_ERROR;
   }
   ptherm->pid.realtemp = temp + ptherm->offset;
@@ -272,7 +273,7 @@ uint32_t lysis_work(void) {
 		    if(ptherm->recGoalFlag){
 				set_lysis(ptherm->pid.goal);	
 				ptherm->recGoalFlag = 0;	
-				updateLysisState(SYS_STATE_PREPARE);
+				updateLysisState(SYS_STATE_PREHEAT);
 			}
 			if(ptherm->pid_stable){
 				ptherm->thermostat_st = THERMOSTAT_INSERT;
@@ -334,7 +335,7 @@ uint32_t lysis_work(void) {
 			if((conter10ms-last10ms)> GOTO_IDLE_GAP){
 //			if(Read_Tupe() == 0){
 			/*管管移除，进入到预热状态*/
-				ptherm->thermostat_st = THERMOSTAT_WARM;
+				ptherm->thermostat_st = THERMOSTAT_IDLE;
 				ptherm->firstin = true;
 			}
 		}

DriverInterface/ws2812.c

@@ -111,12 +111,12 @@ void light_set(uint8_t mode_select, uint16_t speed_ms, uint32_t rgb_color, uint8
     lihgt_ctrl.light_color[channel] = rgb_color;
 
     //两边步调同步
-    if(lihgt_ctrl.light_mode[0] == lihgt_ctrl.light_mode[1])
-    {
-        lihgt_ctrl.breath_count[0] = lihgt_ctrl.breath_count[1];
-        lihgt_ctrl.breath_dir[0] = lihgt_ctrl.breath_dir[1];
-        lihgt_ctrl.light_color_use[0] = lihgt_ctrl.light_color_use[1];
-    }
+    // if(lihgt_ctrl.light_mode[0] == lihgt_ctrl.light_mode[1])
+    // {
+    //     lihgt_ctrl.breath_count[0] = lihgt_ctrl.breath_count[1];
+    //     lihgt_ctrl.breath_dir[0] = lihgt_ctrl.breath_dir[1];
+    //     lihgt_ctrl.light_color_use[0] = lihgt_ctrl.light_color_use[1];
+    // }
 }
 
 

MDK-ARM/mini7_V2.uvoptx

@@ -148,56 +148,7 @@
           <Name>-U-O142 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RE$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>216</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134333064</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../Core/Src/main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../Core/Src/main.c\216</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>261</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134339762</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\DriverInterface\state_mini.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../DriverInterface/state_mini.c\261</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>227</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134332118</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\DriverInterface\usr_lysis.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../DriverInterface/usr_lysis.c\227</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -242,7 +193,7 @@
         <Ww>
           <count>8</count>
           <WinNumber>1</WinNumber>
-          <ItemText>DeviceNum</ItemText>
+          <ItemText>lihgt_ctrl</ItemText>
         </Ww>
       </WatchWindow1>
       <MemoryWindow1>

tshell/van_bsp_debug_uart.c

@@ -164,6 +164,7 @@ void Van_Debug_UART_Init(UART_HandleTypeDef * puart)
 	HAL_UART_Receive_DMA(debugUart, debug_rec_type1.usartDMA_rxBuf,
 								 RECEIVELEN);
 	__HAL_UART_ENABLE_IT(debugUart, UART_IT_IDLE);
+	__HAL_UART_ENABLE_IT(debugUart, UART_IT_ERR);
 }
 
 void Van_Debug_UART1_test(void)