From 4e9cd180f046ceda68ae8860612a9041d0e0dd9f Mon Sep 17 00:00:00 2001 From: byloveletter Date: Thu, 20 Sep 2018 13:58:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EC=8B=AC=EC=98=A8=EB=8F=84=20?= =?UTF-8?q?=EA=B3=BC=EC=97=B4=20=EC=97=90=EB=9F=AC=20=EC=82=AD=EC=A0=9C?= 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 | 78 ++++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index 8ece2ee..61cd6c3 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 2 -#define HOTFIX_VER 01 +#define HOTFIX_VER 02 // 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 d117d69..3d96bbe 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -218,46 +218,48 @@ public: void resetSensorHistory(void); private: - + /* + * 180920 : 중심온도 센서 과열 에러 삭제 * + */ const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = { - {0x03b8, //ele_10 - 0x03b8, //ele_20 - 0x03b8, //ele_24 - 0x03b8, //ele_40 - 0x03b8, //lpg_10 - 0x03b8, //lpg_20 - 0x03b8, //lpg_24 - 0x03b8, //lpg_40 - 0x03b8, //lng_10 - 0x03b8, //lng_20 - 0x03b8, //lng_24 - 0x03b8 //lng_40 + {0x0398, //ele_10 + 0x0398, //ele_20 + 0x0398, //ele_24 + 0x0398, //ele_40 + 0x0398, //lpg_10 + 0x0398, //lpg_20 + 0x0398, //lpg_24 + 0x0398, //lpg_40 + 0x0398, //lng_10 + 0x0398, //lng_20 + 0x0398, //lng_24 + 0x0398 //lng_40 },// noncooking state - {0x03bd, //ele_10 - 0x03bf, //ele_20 - 0x03bd, //ele_24 - 0x03bf, //ele_40 - 0x03bd, //lpg_10 - 0x03bf, //lpg_20 - 0x03bd, //lpg_24 - 0x03bf, //lpg_40 - 0x03bd, //lng_10 - 0x03bf, //lng_20 - 0x03bd, //lng_24 - 0x03bf //lng_40 + {0x039d, //ele_10 + 0x039f, //ele_20 + 0x039d, //ele_24 + 0x039f, //ele_40 + 0x039d, //lpg_10 + 0x039f, //lpg_20 + 0x039d, //lpg_24 + 0x039f, //lpg_40 + 0x039d, //lng_10 + 0x039f, //lng_20 + 0x039d, //lng_24 + 0x039f //lng_40 },//cooking state - {0x03bd, //ele_10 - 0x03bf, //ele_20 - 0x03bd, //ele_24 - 0x03bf, //ele_40 - 0x03bd, //lpg_10 - 0x03bf, //lpg_20 - 0x03bd, //lpg_24 - 0x03bf, //lpg_40 - 0x03bd, //lng_10 - 0x03bf, //lng_20 - 0x03bd, //lng_24 - 0x03bf //lng_40 + {0x039d, //ele_10 + 0x039f, //ele_20 + 0x039d, //ele_24 + 0x039f, //ele_40 + 0x039d, //lpg_10 + 0x039f, //lpg_20 + 0x039d, //lpg_24 + 0x039f, //lpg_40 + 0x039d, //lng_10 + 0x039f, //lng_20 + 0x039d, //lng_24 + 0x039f //lng_40 } //washing state }; const uint32_t comm_err_mask[3][MAX_MODEL_COUNT] = { @@ -315,6 +317,8 @@ private: // 0x0213 //lng40 // }; + + const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = { {0x0213, //ele10 0x0213, //ele 20 -- 2.1.4