팝업 관련 동작 정의 수정

- 일부 팝업 메시지 오타 수정 포함

팝업 관련 동작 정의 수정
- 일부 팝업 메시지 오타 수정 포함
고영탁
1 parent 18e9a51e56
Showing 2 changed files with 27 additions and 28 deletions Show diff stats
app/gui/oven_control/ovenstatics.cpp
app/gui/oven_control/ovenstatics.h
@@ -247,7 +247,7 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){
     if(errflag & MAKE_MASK(STATE_ERR_BUNNER3)){
         item = &(srvdata->err_log.items.steam_pan_fail);
         strMsg  = tr("버너컨트롤러 3 이상 발생하였습니다.");
-        strTitle  = tr("버너컨트로러 3 이상 발생");
+        strTitle  = tr("버너컨트롤러 3 이상 발생");
         processErrorItems(item,state_err_type_def[state][STATE_ERR_BUNNER3],strMsg,strTitle, ltime);
     }
     if(errflag & MAKE_MASK(STATE_ERR_LOWERFAN)){
@@ -563,19 +563,6 @@ void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype,
         item->last_fried = ltime;
     }
-    if(errtype > error_type_clrsplit){
-        //에러 클리어 명령 송신
-       if(errtype == error_type_engclr){
-            //확인 후 송신
-            bNeedErrorClear = true;
-        }
-        else{
-            //에러클리어 메시지 즉시 송신
-            //udp->set(TG_ERROR_CLEAR,0xCECE);
-            bNeedErrorClear=true;
-        }
-    }
-
     switch(errtype){
         case error_type_onlypop:
         case error_type_popclr:
@@ -601,6 +588,18 @@ void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype,
             break;
     }
+    if(errtype > error_type_clrsplit){
+        //에러 클리어 명령 송신
+       if(errtype == error_type_engclr){
+            //확인 후 송신
+            bNeedErrorClear = true;
+        }
+        else{
+            //에러클리어 메시지 즉시 송신
+            udp->set(TG_ERROR_CLEAR,0xCECE);
+        }
+    }
+
 }
@@ -198,7 +198,7 @@ public:
 private:
-    const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={
+    const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={ //30047
                                                         {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_OFF state
                                                         {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
@@ -209,27 +209,27 @@ private:
                                                         error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_OFF_COOK_ON state
                                                         };
-    const error_exe_type comm_err_type_def[SYS_STATE_MAX][COMM_ERR_MAX] ={\
+    const error_exe_type comm_err_type_def[SYS_STATE_MAX][COMM_ERR_MAX] ={  //30048
                                                        {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_OFF
-                                                       {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_ON_COO_OFF
-                                                       {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_ON_COO_ON
+                                                       {error_type_popclr,error_type_popclr,error_type_popclr,error_type_engnonclr,error_type_engnonclr}, //SYS_ON_COO_OFF
+                                                       {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_COO_ON
                                                        {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_ON
     };
-    const error_exe_type state_err_type_def[SYS_STATE_MAX][STATE_ERR_MAX] ={\
-                                                       {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_OFF_COO_OFF
-                                                       {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_ON_COO_OFF
-                                                       {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_ON_COO_ON
-                                                       {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_OFF_COO_ON
+    const error_exe_type state_err_type_def[SYS_STATE_MAX][STATE_ERR_MAX] ={ //30057
+                                                       {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_OFF
+                                                       {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_COO_OFF
+                                                       {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_COO_ON
+                                                       {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_ON
     };
-    const error_exe_type sensor_err_type_def[SYS_STATE_MAX][SENSOR_ERR_MAX]={
+    const error_exe_type sensor_err_type_def[SYS_STATE_MAX][SENSOR_ERR_MAX]={ //30049
                                                         {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_OFF state
-                                                        {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_ON_COOK_OFF state
-                                                        {error_type_onlychk,error_type_onlychk,error_type_allnone,error_type_popnonclr,error_type_popnonclr,
-                                                        error_type_popnonclr,error_type_allnone,error_type_allnone,error_type_allnone,error_type_popnonclr}, // SYS_ON_COOK_ON state
+                                                        {error_type_engnonclr,error_type_popclr,error_type_allnone,error_type_popclr,error_type_onlychk,
+                                                        error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_OFF state
+                                                        {error_type_onlychk,error_type_onlychk,error_type_allnone,error_type_popclr,error_type_popclr,
+                                                        error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_ON state
                                                         {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
     };