에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 5105f257267cc1485e2045180c8a2c996a93623a

Authored by 고영탁
1 parent b6c9062d53
Exists in master

버전 1.6.06 세척 오류 수정 및 배포

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @5105f25
@@ -5,14 +5,14 @@ @@ -5,14 +5,14 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 6 7 #define MINOR_VER 6
8 -#define HOTFIX_VER 5 8 +#define HOTFIX_VER 6
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
12 #define MODEL_GRADE 1 12 #define MODEL_GRADE 1
13 13
14 #define ENABLE_WASH_RESUMING 0 14 #define ENABLE_WASH_RESUMING 0
15 -#define VALVE_HACCP_STAMP 1 15 +#define VALVE_HACCP_STAMP 0
16 16
17 namespace Define 17 namespace Define
18 { 18 {
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @5105f25
@@ -134,9 +134,9 @@ void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){ @@ -134,9 +134,9 @@ void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){
134 uint8_t state; 134 uint8_t state;
135 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); 135 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
136 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; 136 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
  137 + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
137 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; 138 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
138 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; 139 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
139 - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;  
140 else state = SYS_ON_COOK_OFF; 140 else state = SYS_ON_COOK_OFF;
141 141
142 if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){ 142 if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){
@@ -211,9 +211,9 @@ void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){ @@ -211,9 +211,9 @@ void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){
211 uint8_t state; 211 uint8_t state;
212 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); 212 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
213 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; 213 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
  214 + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
214 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; 215 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
215 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; 216 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
216 - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;  
217 else state = SYS_ON_COOK_OFF; 217 else state = SYS_ON_COOK_OFF;
218 218
219 if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){ 219 if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){
@@ -254,9 +254,9 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){ @@ -254,9 +254,9 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){
254 uint8_t state; 254 uint8_t state;
255 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); 255 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
256 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; 256 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
  257 + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
257 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; 258 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
258 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; 259 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
259 - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;  
260 else state = SYS_ON_COOK_OFF; 260 else state = SYS_ON_COOK_OFF;
261 261
262 if(errflag & MAKE_MASK(STATE_ERR_BUNNER1)){ 262 if(errflag & MAKE_MASK(STATE_ERR_BUNNER1)){
@@ -297,9 +297,9 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){ @@ -297,9 +297,9 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
297 uint8_t state; 297 uint8_t state;
298 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); 298 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
299 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; 299 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
  300 + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
300 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; 301 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
301 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; 302 else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
302 - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;  
303 else state = SYS_ON_COOK_OFF; 303 else state = SYS_ON_COOK_OFF;
304 304
305 if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){ 305 if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){