From b69abdac20c346aad6280225a681353abd21a7c8 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Thu, 6 Jul 2017 13:01:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=20=EB=B3=84=20=ED=95=98?= =?UTF-8?q?=EB=B6=80=20=EC=97=90=EB=9F=AC=20=EB=A7=88=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 착하 오타 수정 -> 착화 --- app/gui/oven_control/ovenstatics.cpp | 12 ++++---- app/gui/oven_control/ovenstatics.h | 56 +++++++++++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index c379112..5959bfa 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -283,21 +283,21 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){ if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){ //버너 컨트롤러 1 착화 이상 item = &(srvdata->err_log.items.upper_fire_fail); - strMsg = tr("상부 버너 착하가 되지 않습니다."); - strTitle = tr("상부 버너 착하 이상 발생"); + strMsg = tr("상부 버너 착화가 되지 않습니다."); + strTitle = tr("상부 버너 착화 이상 발생"); processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER1],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER2)){ //버너 컨트롤러 2 착화 이상 item = &(srvdata->err_log.items.lower_fire_fail); - strMsg = tr("하부 버너 착하가 되지 않습니다."); - strTitle = tr("하부 버너 착하 이상 발생"); + strMsg = tr("하부 버너 착화가 되지 않습니다."); + strTitle = tr("하부 버너 착화 이상 발생"); processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER2],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER3)){ item = &(srvdata->err_log.items.steam_fire_fail); - strMsg = tr("스팀 버너 착하가 되지 않습니다."); - strTitle = tr("스팀 버너 착하 이상 발생"); + strMsg = tr("스팀 버너 착화가 되지 않습니다."); + strTitle = tr("스팀 버너 착화 이상 발생"); processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER3],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_OVNE_TEMP_ALARM)){ diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index 0be17d6..153330d 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -211,10 +211,58 @@ public: private: - const uint32_t sys_err_mask[MAX_MODEL_COUNT] = {0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff,0x03ff}; - const uint32_t comm_err_mask[MAX_MODEL_COUNT] = {0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f}; - const uint32_t sensor_err_mask[MAX_MODEL_COUNT] = {0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213,0x0213}; - const uint32_t state_err_mask[MAX_MODEL_COUNT] = {0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018}; + const uint32_t sys_err_mask[MAX_MODEL_COUNT] = {0x03ff, //ele_10 + 0x03ff, //ele_20 + 0x03ff, //ele_24 + 0x03ff, //ele_40 + 0x03fd, //lpg_10 + 0x03ff, //lpg_20 + 0x03fd, //lpg_24 + 0x03ff, //lpg_40 + 0x03fd, //lng_10 + 0x03ff, //lng_20 + 0x03fd, //lng_24 + 0x03ff //lng_40 + }; + const uint32_t comm_err_mask[MAX_MODEL_COUNT] = {0x001f, //ele_10 + 0x001f, //ele_20 + 0x001f, //ele_24 + 0x001f, //ele_40 + 0x001d, //lpg_10 + 0x001f, //lpg_20 + 0x001d, //lpg_24 + 0x001f, //lpg_40 + 0x001d, //lng_10 + 0x001f, //lng_20 + 0x001d, //lng_24 + 0x001f //lng_40 + }; + const uint32_t sensor_err_mask[MAX_MODEL_COUNT] = {0x0213, //ele10 + 0x0213, //ele 20 + 0x0213, //ele 24 + 0x0213, //ele 40 + 0x0213, //lpg 10 + 0x0213, //lpg 20 + 0x0213, //lpg 24 + 0x0213, //lpg 40 + 0x0213, //lng 10 + 0x0213, //lng 20 + 0x0213, //lng 24 + 0x0213 //lng40 + }; + const uint32_t state_err_mask[MAX_MODEL_COUNT] = {0x0018, //ele 10 + 0x0018, //ele 20 + 0x0018, //ele 24 + 0x0018, //ele 40 + 0x0018, //lpg 10 + 0x0018, //lpg 20 + 0x0018, //lpg 24 + 0x0018, //lpg 40 + 0x0018, //lng 10 + 0x0018, //lng 20 + 0x0018, //lng 24 + 0x0018 //lng 40 + }; const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={ //30047 -- 2.1.4