From 9e48a5d01cd83129c3b74b1f1ef22cbada3b8851 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Fri, 16 Jun 2017 16:57:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ovenstateics error mask 수정 시 복귀 가능 --- app/gui/oven_control/ovenstatics.cpp | 9 +++++---- app/gui/oven_control/ovenstatics.h | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index db64a56..6e2a8f9 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -82,26 +82,27 @@ void OvenStatistics::onDataChanged() curdoorstate = state.door_state; } + if(state.system_error!=0 && state.system_error != curSysErrorState){ - processSystemError( state.system_error,ltime); + processSystemError( state.system_error & SYS_ERROR_MASK,ltime); } curSysErrorState = state.system_error; errstatetemp = state.communication_error; if(errstatetemp!=0 && errstatetemp != curCommErrorState ){ - processCommError( errstatetemp,ltime ); + processCommError( errstatetemp&COMM_ERROR_MASK,ltime ); } curCommErrorState = errstatetemp; errstatetemp = state.sensor_error; if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){ - processSensorError(errstatetemp,ltime ); + processSensorError(errstatetemp&SENSOR_ERROR_MASK,ltime ); } curSensorErrorState = errstatetemp; errstatetemp = state.controller_error; if(errstatetemp != 0 && errstatetemp != curControlErrorState){ - processStateError(errstatetemp,ltime); + processStateError(errstatetemp&STATE_ERROR_MASK,ltime); } curControlErrorState = errstatetemp; diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index 3a3136e..af6806f 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -14,6 +14,11 @@ #define SYS_ERR_MAX 10 +#define SYS_ERROR_MASK 0 +#define COMM_ERROR_MASK 0 +#define STATE_ERROR_MASK 0 +#define SENSOR_ERROR_MASK 0 + #define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff #define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING 0x00ff #define SYS_ERR_MASK_COOKING 0x00ff -- 2.1.4