异常告警修改

BoardInterface/one_chip_git_inf.h

@@ -1,5 +1,5 @@
 #ifndef _ONE_CHIP_GITINF_H 
 #define _ONE_CHIP_GITINF_H 
-#define ONE_CHIP_GIT_SHA  "a03a00e3fdefd932108f21a7a4f4380b1a806737"
-#define ONE_CHIP_GIT_SHA_SHORT  "a03a00e3fd"
+#define ONE_CHIP_GIT_SHA  "0b2374af299392e54a459e8407a7b94175d59c64"
+#define ONE_CHIP_GIT_SHA_SHORT  "0b2374af29"
 #endif 

BoardInterface/onechip_devinf_define.h

@@ -6,7 +6,7 @@
 #include "state_mini.h"
 #include "user_heater.h"
 #include "usr_lysis.h"
-#define OFFLINE_TIME 20*20  /*一分钟*/
+#define OFFLINE_TIME 20*30  /*一分钟*/
 
 
 #define CMD_BUF_SIZE (128)	// 调试串口缓冲区长度

BoardInterface/onechip_load_inf.h

@@ -8,7 +8,7 @@
 #define SOFT_VERSION_1  7	//软件版本号
 #define SOFT_VERSION_2  4	//软件版本号
 #define SOFT_VERSION_3  0	//软件版本号
-#define SOFT_VERSION_4  9	//软件版本号
+#define SOFT_VERSION_4  10	//软件版本号
 
 
 

DriverInterface/state_mini.c

@@ -307,8 +307,12 @@ void usr_state_machine(ProcessStateMachine_t *sts, heat_ctrl_def *heater)
     static uint32_t delay = 0;
     //采样前，3秒发一次加热指令
     if((sts->state < SW_Chip_Id) && (sts->state != SW_Fault)){
-        if (TrigStateCheck() == CardON){            
-            error_set(ERROR_NO_QRCODE);
+        if (TrigStateCheck() == CardON){    
+            if(sts->state == SW_Target_reached){
+                 error_set(ERROR_HEAT_INSERT_CARD);
+            }else {
+                 error_set(ERROR_NO_QRCODE);
+            }               
             updateAmplifState(SYS_STATE_ERROR_HM);
         }
     }

DriverInterface/usr_lysis.c

@@ -11,13 +11,6 @@
 
 
 
-extern uint32_t conter100ms;
-extern uint32_t conter10ms;
-
-
-
-
-
 #define MIN_TEMPERATUARE 5
 #define MAX_TEMPERATUARE 120 
 #define COOL_WORK_THD 5 
@@ -181,6 +174,7 @@ uint32_t get_lysis_st(float *temp,unsigned int *st) {
 uint32_t lysis_work(void) {
   float temp;
   static uint32_t last10ms;
+  static float firstTemp;
   lysis_ctr_def *ptherm = &sysinf.lysis;
 
   temp = getADC_Chanel_value(1);  
@@ -195,7 +189,6 @@ uint32_t lysis_work(void) {
   switch(ptherm->thermostat_st){
 	case THERMOSTAT_PWRON:{
 		
-  		static float firstTemp;
 		if(ptherm->firstin){
 			ptherm->firstin = false;
 			updateLysisState(SYS_STATE_PREPARE);sysinf.lysisState = SYS_STATE_PREPARE; 
@@ -203,7 +196,7 @@ uint32_t lysis_work(void) {
 			set_lysis(95);				
    			ptherm->pid.goal = 95;	
     		ptherm->worktime = 3000;
-			last10ms = conter10ms;				
+			last10ms = sysinf.conter10ms;			
 		}else{
 			float heattemp = getADC_Chanel_value(1); 
 			if((heattemp - firstTemp) > HEAT_WORK_THD){
@@ -211,7 +204,7 @@ uint32_t lysis_work(void) {
 					ptherm->firstin = true;
 					ptherm->pid_st = PID_IDLE;
 			  }
-			if((conter10ms-last10ms)> HEAT_TEST_TIME){
+			if((sysinf.conter10ms-last10ms)> HEAT_TEST_TIME){
 				/*超时判断*/
 				ptherm->thermostat_st = THERMOSTAT_ERROR;
 				updateLysisState(SYS_STATE_ERROR_HW);
@@ -267,22 +260,28 @@ uint32_t lysis_work(void) {
 			ptherm->firstin = false;
 			Close_therm(0);
 			ptherm->recGoalFlag = 0;
+			firstTemp = getADC_Chanel_value(1);
 			
 		}else{	
 		    if(ptherm->recGoalFlag){
 				set_lysis(ptherm->pid.goal);	
 				ptherm->recGoalFlag = 0;	
 				updateLysisState(SYS_STATE_PREHEAT);
+				firstTemp = getADC_Chanel_value(1);
+				last10ms = sysinf.conter10ms;
 			}
 			if(ptherm->pid_stable){
 				ptherm->thermostat_st = THERMOSTAT_INSERT;
 				ptherm->firstin = true;	
 			}
-//		    if(Read_Tupe()){
-//				/*预热插管管，进入提示状态*/
-//				ptherm->thermostat_st = THERMOSTAT_NOTICE;
-//				ptherm->firstin = TRUE;
-//			}
+			if(((ptherm->pid.realtemp - firstTemp) < HEAT_WORK_THD)&&
+				((sysinf.conter10ms-last10ms)> HEAT_TEST_TIME)&&((ptherm->pid.goal - firstTemp)>10)){
+					/*目标温差大于10，加热启动30s之内没升温2.5° 超时判断*/
+					ptherm->thermostat_st = THERMOSTAT_ERROR;
+					updateLysisState(SYS_STATE_ERROR_HW);
+					error_set(ERROR_HEATFUC_EER);
+					ptherm->firstin = true;
+			  }
 		}
 	}break;
 	case THERMOSTAT_INSERT:{
@@ -330,9 +329,9 @@ uint32_t lysis_work(void) {
 			ptherm->firstin = false;
 			Close_therm(0);
 			beep_set(BEEP_WORKEND);
-			last10ms = conter10ms;
+			last10ms = sysinf.conter10ms;
 		}else{			
-			if((conter10ms-last10ms)> GOTO_IDLE_GAP){
+			if((sysinf.conter10ms-last10ms)> GOTO_IDLE_GAP){
 //			if(Read_Tupe() == 0){
 			/*管管移除，进入到预热状态*/
 				ptherm->thermostat_st = THERMOSTAT_IDLE;
@@ -344,14 +343,6 @@ uint32_t lysis_work(void) {
 		if(ptherm->firstin){
 			ptherm->firstin = false;
 			Close_therm(0);
-		}else{	
-			if(ptherm->eerst == THERMOSTAT_TUBENOEXIST_EER){
-				if((conter10ms-last10ms)> EER_NOEXIST_TIME_GAP){			
-					ptherm->thermostat_st = THERMOSTAT_IDLE;
-					error_clear();
-					ptherm->firstin = true;		
-				}
-			}	
 		}
 	}break;
 		

MDK-ARM/build_get_git.bat

@@ -0,0 +1,17 @@
+
+@echo off
+
+echo current time is %date%  %time%
+ 
+echo get git sha
+ 
+echo.
+
+for /f "delims=" %%i in ('git rev-parse HEAD') do set git_head=%%i
+echo git sha=%git_head% 
+echo git sha_short=%git_head:~0,10% 
+echo #ifndef _ONE_CHIP_GITINF_H > ../BoardInterface/one_chip_git_inf.h
+echo #define _ONE_CHIP_GITINF_H >> ../BoardInterface/one_chip_git_inf.h
+echo #define ONE_CHIP_GIT_SHA  "%git_head%">> ../BoardInterface/one_chip_git_inf.h
+echo #define ONE_CHIP_GIT_SHA_SHORT  "%git_head:~0,10%">> ../BoardInterface/one_chip_git_inf.h
+echo #endif >> ../BoardInterface/one_chip_git_inf.h

MDK-ARM/mini7_V2.uvoptx

@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -154,7 +154,7 @@
           <Type>0</Type>
           <LineNumber>547</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134321174</Address>
+          <Address>134321202</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -170,7 +170,7 @@
           <Type>0</Type>
           <LineNumber>167</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134341504</Address>
+          <Address>134341596</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -181,38 +181,6 @@
           <ExecCommand></ExecCommand>
           <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
         </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>151</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134336890</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\151</Expression>
-        </Bp>
-        <Bp>
-          <Number>3</Number>
-          <Type>0</Type>
-          <LineNumber>233</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\DriverInterface\ESP32_WROOM_32D.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>
@@ -266,6 +234,13 @@
           <ItemText>wifi_set_ssid</ItemText>
         </Ww>
       </WatchWindow1>
+      <WatchWindow2>
+        <Ww>
+          <count>0</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>DeviceNum</ItemText>
+        </Ww>
+      </WatchWindow2>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
@@ -390,7 +365,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -469,7 +444,7 @@
           <Type>0</Type>
           <LineNumber>547</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134321174</Address>
+          <Address>134255506</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -485,7 +460,7 @@
           <Type>0</Type>
           <LineNumber>167</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134341504</Address>
+          <Address>134275960</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -496,38 +471,6 @@
           <ExecCommand></ExecCommand>
           <Expression>\\mini7_V2\../DriverInterface/van_BSP_Scanner.c\167</Expression>
         </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>151</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>../Core/Src/main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>3</Number>
-          <Type>0</Type>
-          <LineNumber>233</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\DriverInterface\ESP32_WROOM_32D.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>

MDK-ARM/startup_stm32f103xe.lst

@@ -544,11 +544,11 @@ ARM Macro Assembler    Page 9
               00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=mini7_v2\startup_stm32f103xe.d -omini7_v2\startup_stm32f103xe.o -I
-.\RTE\_mini7_V2 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include -IC:\K
-eil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.4.1\Device\Include --predefine="__MICROLIB
- SETA 1" --predefine="__UVISION_VERSION SETA 526" --predefine="_RTE_ SETA 1" --
-predefine="STM32F10X_HD SETA 1" --list=startup_stm32f103xe.lst startup_stm32f10
-3xe.s
+.\RTE\_mini7_V2_debug -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include 
+-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.4.1\Device\Include --predefine="__MI
+CROLIB SETA 1" --predefine="__UVISION_VERSION SETA 526" --predefine="_RTE_ SETA
+ 1" --predefine="STM32F10X_HD SETA 1" --list=startup_stm32f103xe.lst startup_st
+m32f103xe.s