에러 체크 해제

- ovenstateics error mask 수정 시 복귀 가능

에러 체크 해제
- ovenstateics error mask 수정 시 복귀 가능
고영탁
1 parent cc63fa9f84
Showing 2 changed files with 10 additions and 4 deletions Show diff stats
app/gui/oven_control/ovenstatics.cpp
app/gui/oven_control/ovenstatics.h
@@ -82,26 +82,27 @@ void OvenStatistics::onDataChanged()
         curdoorstate = state.door_state;
     }
  
+
     if(state.system_error!=0 &&  state.system_error != curSysErrorState){
-        processSystemError( state.system_error,ltime);
+        processSystemError( state.system_error & SYS_ERROR_MASK,ltime);
     }
     curSysErrorState = state.system_error;
  
     errstatetemp = state.communication_error;
     if(errstatetemp!=0 && errstatetemp != curCommErrorState ){
-        processCommError( errstatetemp,ltime );
+        processCommError( errstatetemp&COMM_ERROR_MASK,ltime );
     }
     curCommErrorState = errstatetemp;
  
     errstatetemp = state.sensor_error;
     if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){
-        processSensorError(errstatetemp,ltime );
+        processSensorError(errstatetemp&SENSOR_ERROR_MASK,ltime );
     }
     curSensorErrorState = errstatetemp;
  
     errstatetemp = state.controller_error;
     if(errstatetemp != 0 && errstatetemp != curControlErrorState){
-        processStateError(errstatetemp,ltime);
+        processStateError(errstatetemp&STATE_ERROR_MASK,ltime);
     }
     curControlErrorState = errstatetemp;
  
@@ -14,6 +14,11 @@
  
 #define SYS_ERR_MAX     10
  
+#define SYS_ERROR_MASK  0
+#define COMM_ERROR_MASK 0
+#define STATE_ERROR_MASK    0
+#define SENSOR_ERROR_MASK   0
+
 #define SYS_ERR_MASK_ERR_CLEAR_COOKING          0x00ff
 #define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING  0x00ff
 #define SYS_ERR_MASK_COOKING             0x00ff
...	...	@@ -82,26 +82,27 @@ void OvenStatistics::onDataChanged()
82	82	curdoorstate = state.door_state;
83	83	}
84	84
	85	+
85	86	if(state.system_error!=0 && state.system_error != curSysErrorState){
86		- processSystemError( state.system_error,ltime);
	87	+ processSystemError( state.system_error & SYS_ERROR_MASK,ltime);
87	88	}
88	89	curSysErrorState = state.system_error;
89	90
90	91	errstatetemp = state.communication_error;
91	92	if(errstatetemp!=0 && errstatetemp != curCommErrorState ){
92		- processCommError( errstatetemp,ltime );
	93	+ processCommError( errstatetemp&COMM_ERROR_MASK,ltime );
93	94	}
94	95	curCommErrorState = errstatetemp;
95	96
96	97	errstatetemp = state.sensor_error;
97	98	if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){
98		- processSensorError(errstatetemp,ltime );
	99	+ processSensorError(errstatetemp&SENSOR_ERROR_MASK,ltime );
99	100	}
100	101	curSensorErrorState = errstatetemp;
101	102
102	103	errstatetemp = state.controller_error;
103	104	if(errstatetemp != 0 && errstatetemp != curControlErrorState){
104		- processStateError(errstatetemp,ltime);
	105	+ processStateError(errstatetemp&STATE_ERROR_MASK,ltime);
105	106	}
106	107	curControlErrorState = errstatetemp;
107	108
...	...
...	...	@@ -14,6 +14,11 @@
14	14
15	15	#define SYS_ERR_MAX 10
16	16
	17	+#define SYS_ERROR_MASK 0
	18	+#define COMM_ERROR_MASK 0
	19	+#define STATE_ERROR_MASK 0
	20	+#define SENSOR_ERROR_MASK 0
	21	+
17	22	#define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff
18	23	#define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING 0x00ff
19	24	#define SYS_ERR_MASK_COOKING 0x00ff
...	...