From 5105f257267cc1485e2045180c8a2c996a93623a Mon Sep 17 00:00:00 2001 From: byloveletter Date: Tue, 11 Jan 2022 10:34:27 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EC=A0=84=201.6.06=20=EC=84=B8?= =?UTF-8?q?=EC=B2=99=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=EB=B0=B0=ED=8F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/define.h | 4 ++-- app/gui/oven_control/ovenstatics.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index fdfab9c..0239c1d 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -5,14 +5,14 @@ #define MAJOR_VER 1 #define MINOR_VER 6 -#define HOTFIX_VER 5 +#define HOTFIX_VER 6 // 0 for normal // 1 for premium #define MODEL_GRADE 1 #define ENABLE_WASH_RESUMING 0 -#define VALVE_HACCP_STAMP 1 +#define VALVE_HACCP_STAMP 0 namespace Define { diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index 59e9d92..875102f 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -134,9 +134,9 @@ void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){ uint8_t state; bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else state = SYS_ON_COOK_OFF; if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){ @@ -211,9 +211,9 @@ void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){ uint8_t state; bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else state = SYS_ON_COOK_OFF; if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){ @@ -254,9 +254,9 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){ uint8_t state; bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else state = SYS_ON_COOK_OFF; if(errflag & MAKE_MASK(STATE_ERR_BUNNER1)){ @@ -297,9 +297,9 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){ uint8_t state; bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown()); if( control.system==0 && !bCookingState ) state = SYS_OFF_COOK_OFF; + else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF; else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON; - else if(control.system !=0 && this->state.cleaning_sate !=0 ) state = SYS_ON_WASH; else state = SYS_ON_COOK_OFF; if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){ -- 2.1.4