Commit 9e48a5d01cd83129c3b74b1f1ef22cbada3b8851

Authored by 고영탁
1 parent cc63fa9f84
Exists in master and in 2 other branches fhd, fhd-demo

에러 체크 해제

 - ovenstateics error mask 수정 시 복귀 가능
app/gui/oven_control/ovenstatics.cpp
@@ -82,26 +82,27 @@ void OvenStatistics::onDataChanged() @@ -82,26 +82,27 @@ void OvenStatistics::onDataChanged()
82 curdoorstate = state.door_state; 82 curdoorstate = state.door_state;
83 } 83 }
84 84
  85 +
85 if(state.system_error!=0 && state.system_error != curSysErrorState){ 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 curSysErrorState = state.system_error; 89 curSysErrorState = state.system_error;
89 90
90 errstatetemp = state.communication_error; 91 errstatetemp = state.communication_error;
91 if(errstatetemp!=0 && errstatetemp != curCommErrorState ){ 92 if(errstatetemp!=0 && errstatetemp != curCommErrorState ){
92 - processCommError( errstatetemp,ltime ); 93 + processCommError( errstatetemp&COMM_ERROR_MASK,ltime );
93 } 94 }
94 curCommErrorState = errstatetemp; 95 curCommErrorState = errstatetemp;
95 96
96 errstatetemp = state.sensor_error; 97 errstatetemp = state.sensor_error;
97 if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){ 98 if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){
98 - processSensorError(errstatetemp,ltime ); 99 + processSensorError(errstatetemp&SENSOR_ERROR_MASK,ltime );
99 } 100 }
100 curSensorErrorState = errstatetemp; 101 curSensorErrorState = errstatetemp;
101 102
102 errstatetemp = state.controller_error; 103 errstatetemp = state.controller_error;
103 if(errstatetemp != 0 && errstatetemp != curControlErrorState){ 104 if(errstatetemp != 0 && errstatetemp != curControlErrorState){
104 - processStateError(errstatetemp,ltime); 105 + processStateError(errstatetemp&STATE_ERROR_MASK,ltime);
105 } 106 }
106 curControlErrorState = errstatetemp; 107 curControlErrorState = errstatetemp;
107 108
app/gui/oven_control/ovenstatics.h
@@ -14,6 +14,11 @@ @@ -14,6 +14,11 @@
14 14
15 #define SYS_ERR_MAX 10 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 #define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff 22 #define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff
18 #define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING 0x00ff 23 #define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING 0x00ff
19 #define SYS_ERR_MASK_COOKING 0x00ff 24 #define SYS_ERR_MASK_COOKING 0x00ff