에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 5cedff8901fa1af2f4019991883823442e8b9509

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

오븐 서비스 기록 수정 

- 서비스 에러 기록 종합 항목 추가
Showing 3 changed files with 52 additions and 4 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @5cedff8
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 5 7 #define MINOR_VER 5
8 -#define HOTFIX_VER 4 8 +#define HOTFIX_VER 5
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
app/gui/oven_control/historylistwindow.cpp
  Diff comments   View file @5cedff8
@@ -291,14 +291,62 @@ void HistoryListWindow::setTotalServiceDataSet(void){ @@ -291,14 +291,62 @@ void HistoryListWindow::setTotalServiceDataSet(void){
291 total_items[9].first_fired = firsttimebuf; 291 total_items[9].first_fired = firsttimebuf;
292 total_items[9].last_fried = lasttimebuf; 292 total_items[9].last_fried = lasttimebuf;
293 293
294 - //12 수위센 294 + //11 PCB 온도센서　고온　발생
295 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; 295 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
296 - item = &(ovenst->srvdata->err_log.items.water_level_sensor_fail); 296 + item = &(ovenst->srvdata->err_log.items.pcb_temp_high_alarm);
297 firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; 297 firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
298 total_items[10].fired_cnt = firecntbuf; 298 total_items[10].fired_cnt = firecntbuf;
299 total_items[10].first_fired = firsttimebuf; 299 total_items[10].first_fired = firsttimebuf;
300 total_items[10].last_fried = lasttimebuf; 300 total_items[10].last_fried = lasttimebuf;
301 301
  302 + //12 배수 탱크 온도 센서 이상
  303 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
  304 + item = &(ovenst->srvdata->err_log.items.qunching_temp_fail);
  305 + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
  306 + total_items[11].fired_cnt = firecntbuf;
  307 + total_items[11].first_fired = firsttimebuf;
  308 + total_items[11].last_fried = lasttimebuf;
  309 +
  310 + //13 중심 온도 센서 이상
  311 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
  312 + item = &(ovenst->srvdata->err_log.items.meatprove_temp1_fail);
  313 + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
  314 + total_items[12].fired_cnt = firecntbuf;
  315 + total_items[12].first_fired = firsttimebuf;
  316 + total_items[13].last_fried = lasttimebuf;
  317 +
  318 + //14 벽면 온도 센서 이상
  319 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
  320 + item = &(ovenst->srvdata->err_log.items.wall_temp1_fail);
  321 + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
  322 + total_items[13].fired_cnt = firecntbuf;
  323 + total_items[13].first_fired = firsttimebuf;
  324 + total_items[13].last_fried = lasttimebuf;
  325 +
  326 + //15 스팀 온도 센서 이상
  327 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
  328 + item = &(ovenst->srvdata->err_log.items.steam_gen_temp_fail);
  329 + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
  330 + total_items[14].fired_cnt = firecntbuf;
  331 + total_items[14].first_fired = firsttimebuf;
  332 + total_items[14].last_fried = lasttimebuf;
  333 +
  334 + //16 PCB 온도 센서 이상
  335 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
  336 + item = &(ovenst->srvdata->err_log.items.steam_gen_temp_fail);
  337 + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
  338 + total_items[15].fired_cnt = firecntbuf;
  339 + total_items[15].first_fired = firsttimebuf;
  340 + total_items[15].last_fried = lasttimebuf;
  341 +
  342 + //17 수위센
  343 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0;
  344 + item = &(ovenst->srvdata->err_log.items.water_level_sensor_fail);
  345 + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt;
  346 + total_items[16].fired_cnt = firecntbuf;
  347 + total_items[16].first_fired = firsttimebuf;
  348 + total_items[16].last_fried = lasttimebuf;
  349 +
302 350
303 for(i=0;i<20;i++){ 351 for(i=0;i<20;i++){
304 err_items[i] = &total_items[i]; 352 err_items[i] = &total_items[i];
app/gui/oven_control/historylistwindow.h
  Diff comments   View file @5cedff8
@@ -19,7 +19,7 @@ namespace ERROR_LOG_SPACE { @@ -19,7 +19,7 @@ namespace ERROR_LOG_SPACE {
19 ERROR_HISTORY_LOWERBUNNER, 19 ERROR_HISTORY_LOWERBUNNER,
20 ERROR_HISTORY_TOTAL 20 ERROR_HISTORY_TOTAL
21 }; 21 };
22 - static const uint8_t m_arrErrorMaxIdx[4] = {3,4,3,11}; 22 + static const uint8_t m_arrErrorMaxIdx[4] = {3,4,3,17};
23 static const uint16_t m_arrErrorIdxs[3][20] = { //서비스 에러 기록 종합은 합산 23 static const uint16_t m_arrErrorIdxs[3][20] = { //서비스 에러 기록 종합은 합산
24 {ERROR_IDX_upper_fire_fail,ERROR_IDX_upper_pan_fail,ERROR_IDX_upper_motor_fail}, 24 {ERROR_IDX_upper_fire_fail,ERROR_IDX_upper_pan_fail,ERROR_IDX_upper_motor_fail},
25 {ERROR_IDX_steam_fire_fail,ERROR_IDX_steam_pan_fail,ERROR_IDX_water_level_sensor_fail,ERROR_IDX_steam_gen_temp_high_alram}, 25 {ERROR_IDX_steam_fire_fail,ERROR_IDX_steam_pan_fail,ERROR_IDX_water_level_sensor_fail,ERROR_IDX_steam_gen_temp_high_alram},