에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 3fd8255a11f586a56e7ebc39c3a581e1bacc35e7

Authored by 고영탁
1 parent 18e9a51e56
Exists in master and in 2 other branches fhd, fhd-demo

팝업 관련 동작 정의 수정 

- 일부 팝업 메시지 오타 수정 포함
Showing 2 changed files with 27 additions and 28 deletions   Show diff stats
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @3fd8255
... ... @@ -247,7 +247,7 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){
247 247 if(errflag & MAKE_MASK(STATE_ERR_BUNNER3)){
248 248 item = &(srvdata->err_log.items.steam_pan_fail);
249 249 strMsg = tr("버너컨트롤러 3 이상 발생하였습니다.");
250   - strTitle = tr("버너컨트로러 3 이상 발생");
  250 + strTitle = tr("버너컨트롤러 3 이상 발생");
251 251 processErrorItems(item,state_err_type_def[state][STATE_ERR_BUNNER3],strMsg,strTitle, ltime);
252 252 }
253 253 if(errflag & MAKE_MASK(STATE_ERR_LOWERFAN)){
... ... @@ -563,19 +563,6 @@ void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype,
563 563 item->last_fried = ltime;
564 564 }
565 565  
566   - if(errtype > error_type_clrsplit){
567   - //에러 클리어 명령 송신
568   - if(errtype == error_type_engclr){
569   - //확인 후 송신
570   - bNeedErrorClear = true;
571   - }
572   - else{
573   - //에러클리어 메시지 즉시 송신
574   - //udp->set(TG_ERROR_CLEAR,0xCECE);
575   - bNeedErrorClear=true;
576   - }
577   - }
578   -
579 566 switch(errtype){
580 567 case error_type_onlypop:
581 568 case error_type_popclr:
... ... @@ -601,6 +588,18 @@ void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype,
601 588 break;
602 589 }
603 590  
  591 + if(errtype > error_type_clrsplit){
  592 + //에러 클리어 명령 송신
  593 + if(errtype == error_type_engclr){
  594 + //확인 후 송신
  595 + bNeedErrorClear = true;
  596 + }
  597 + else{
  598 + //에러클리어 메시지 즉시 송신
  599 + udp->set(TG_ERROR_CLEAR,0xCECE);
  600 + }
  601 + }
  602 +
604 603  
605 604 }
606 605  
... ...
app/gui/oven_control/ovenstatics.h
  Diff comments   View file @3fd8255
... ... @@ -198,7 +198,7 @@ public:
198 198  
199 199 private:
200 200  
201   - const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={
  201 + const error_exe_type sys_err_type_def[SYS_STATE_MAX][SYS_ERR_MAX]={ //30047
202 202 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
203 203 error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_OFF_COOK_OFF state
204 204 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
... ... @@ -209,27 +209,27 @@ private:
209 209 error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_OFF_COOK_ON state
210 210 };
211 211  
212   - const error_exe_type comm_err_type_def[SYS_STATE_MAX][COMM_ERR_MAX] ={\
  212 + const error_exe_type comm_err_type_def[SYS_STATE_MAX][COMM_ERR_MAX] ={ //30048
213 213 {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_OFF
214   - {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_ON_COO_OFF
215   - {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_ON_COO_ON
  214 + {error_type_popclr,error_type_popclr,error_type_popclr,error_type_engnonclr,error_type_engnonclr}, //SYS_ON_COO_OFF
  215 + {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_COO_ON
216 216 {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_ON
217 217 };
218 218  
219   - const error_exe_type state_err_type_def[SYS_STATE_MAX][STATE_ERR_MAX] ={\
220   - {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_OFF_COO_OFF
221   - {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_ON_COO_OFF
222   - {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_ON_COO_ON
223   - {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_popnonclr}, //SYS_OFF_COO_ON
  219 + const error_exe_type state_err_type_def[SYS_STATE_MAX][STATE_ERR_MAX] ={ //30057
  220 + {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_OFF
  221 + {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_COO_OFF
  222 + {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_COO_ON
  223 + {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_ON
224 224 };
225 225  
226   - const error_exe_type sensor_err_type_def[SYS_STATE_MAX][SENSOR_ERR_MAX]={
  226 + const error_exe_type sensor_err_type_def[SYS_STATE_MAX][SENSOR_ERR_MAX]={ //30049
227 227 {error_type_engnonclr,error_type_popnonclr,error_type_allnone,error_type_popnonclr,error_type_onlychk,
228 228 error_type_popnonclr,error_type_allnone,error_type_allnone,error_type_allnone,error_type_popnonclr}, // SYS_OFF_COOK_OFF state
229   - {error_type_engnonclr,error_type_popnonclr,error_type_allnone,error_type_popnonclr,error_type_onlychk,
230   - error_type_popnonclr,error_type_allnone,error_type_allnone,error_type_allnone,error_type_popnonclr}, // SYS_ON_COOK_OFF state
231   - {error_type_onlychk,error_type_onlychk,error_type_allnone,error_type_popnonclr,error_type_popnonclr,
232   - error_type_popnonclr,error_type_allnone,error_type_allnone,error_type_allnone,error_type_popnonclr}, // SYS_ON_COOK_ON state
  229 + {error_type_engnonclr,error_type_popclr,error_type_allnone,error_type_popclr,error_type_onlychk,
  230 + error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_OFF state
  231 + {error_type_onlychk,error_type_onlychk,error_type_allnone,error_type_popclr,error_type_popclr,
  232 + error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_ON state
233 233 {error_type_engnonclr,error_type_popnonclr,error_type_allnone,error_type_popnonclr,error_type_onlychk,
234 234 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
235 235 };
... ...