에프에이리눅스 / 1611_0007_prime_oven

Compare View

switch
from
...
to
 
Commits (3)
Showing 3 changed files   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @03d3768
... ... @@ -5,13 +5,14 @@
5 5  
6 6 #define MAJOR_VER 2
7 7 #define MINOR_VER 0
8   -#define HOTFIX_VER 4
  8 +#define HOTFIX_VER 7
9 9  
10 10 // 0 for normal
11 11 // 1 for premium
12 12 #define MODEL_GRADE 0
13 13  
14 14 #define ENABLE_WASH_RESUMING 0
  15 +#define WATER_LEVEL_HACCP_STAMP 0
15 16  
16 17 namespace Define
17 18 {
... ...
app/gui/oven_control/haccp.cpp
  Diff comments   View file @03d3768
... ... @@ -664,8 +664,10 @@ void check()
664 664 if (oven->door() != lastDoor)
665 665 stamp();
666 666  
  667 +#if WATER_LEVEL_HACCP_STAMP
667 668 if (udp->waterLevel() != lastWaterLevel)
668 669 stamp();
  670 +#endif
669 671  
670 672 if (lastStampedTime.elapsed() > 30 * 1000 - 100)
671 673 stamp();
... ...
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @03d3768
... ... @@ -134,9 +134,9 @@ void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){
134 134 uint8_t state;
135 135 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
136 136 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
137   - else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
138   - else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
139 137 else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
  138 + else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
  139 + else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
140 140 else state = SYS_ON_COOK_OFF;
141 141  
142 142 if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){
... ... @@ -211,9 +211,9 @@ void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){
211 211 uint8_t state;
212 212 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
213 213 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
214   - else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
215   - else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
216 214 else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
  215 + else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
  216 + else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
217 217 else state = SYS_ON_COOK_OFF;
218 218  
219 219 if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){
... ... @@ -254,9 +254,9 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){
254 254 uint8_t state;
255 255 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
256 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 258 else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
258 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 260 else state = SYS_ON_COOK_OFF;
261 261  
262 262 if(errflag & MAKE_MASK(STATE_ERR_BUNNER1)){
... ... @@ -297,9 +297,9 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
297 297 uint8_t state;
298 298 bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
299 299 if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF;
300   - else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
301   - else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
302 300 else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH;
  301 + else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
  302 + else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
303 303 else state = SYS_ON_COOK_OFF;
304 304  
305 305 if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){
... ...