From 4483bc52fec116609756b36c59fcc6d6eacdf30c Mon Sep 17 00:00:00 2001 From: byloveletter Date: Thu, 2 Jul 2020 19:10:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=B8=90=20=EC=97=90=EB=9F=AC?= =?UTF-8?q?=EB=B0=9C=EC=83=9D=20=EC=88=98=EC=A0=95=20=EA=B3=A0=EA=B0=9D?= =?UTF-8?q?=EC=82=AC=20=EC=9A=94=EC=B2=AD=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=8C=9D=EC=97=85=20=EB=8F=99=EC=9E=91=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= 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.h | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index d9eb1ad..a286c20 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -5,11 +5,11 @@ #define MAJOR_VER 1 #define MINOR_VER 5 -#define HOTFIX_VER 3 +#define HOTFIX_VER 4 // 0 for normal // 1 for premium -#define MODEL_GRADE 1 +#define MODEL_GRADE 0 namespace Define { diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index ab46d7c..387949e 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -390,17 +390,17 @@ private: 0x0018 //lng 40 }, {0x0000, //ele 10 - 0x0000, //ele 20 + 0x0018, //ele 20 0x0000, //ele 24 - 0x0000, //ele 40 + 0x0018, //ele 40 0x0000, //lpg 10 - 0x0000, //lpg 20 + 0x0018, //lpg 20 0x0000, //lpg 24 - 0x0000, //lpg 40 + 0x0018, //lpg 40 0x0000, //lng 10 - 0x0000, //lng 20 + 0x0018, //lng 20 0x0000, //lng 24 - 0x0000 //lng 40 + 0x0018 //lng 40 }//washing state }; @@ -412,8 +412,8 @@ private: error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_OFF state {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd, error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_ON state - {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr, - error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_WASH state + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd, + error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_WASH state {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr, error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_OFF_COOK_ON state }; @@ -422,7 +422,7 @@ private: {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_OFF {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_OFF {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_ON - {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_WASH + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_WASH {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_ON }; @@ -430,7 +430,7 @@ private: {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_OFF {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_OFF {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_ON - {error_type_allnone,error_type_allnone,error_type_allnone,error_type_allnone,error_type_allnone}, //SYS_ON_WASH + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_WASH //{error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_WASH {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_ON }; @@ -442,8 +442,8 @@ private: error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_OFF state {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_allnone,error_type_popclrstopcmd,error_type_popclrstopcmd, error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_ON state - {error_type_popclr,error_type_popclr,error_type_allnone,error_type_allnone,error_type_popclr, - error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_WASH + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_allnone,error_type_allnone,error_type_popclrstopcmd, + error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclrstopcmd}, // SYS_ON_WASH {error_type_engnonclr,error_type_popnonclr,error_type_allnone,error_type_popnonclr,error_type_onlychk, error_type_popnonclr,error_type_allnone,error_type_allnone,error_type_allnone,error_type_popnonclr}, // SYS_OFF_COOK_ON state same with SYS_OFF_COOK_OFF }; -- 2.1.4