From 5cedff8901fa1af2f4019991883823442e8b9509 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Thu, 2 Jul 2020 19:12:36 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=B8=90=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EA=B8=B0=EB=A1=9D=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=97=90=EB=9F=AC=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EC=A2=85=ED=95=A9=20=ED=95=AD=EB=AA=A9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/define.h | 2 +- app/gui/oven_control/historylistwindow.cpp | 52 ++++++++++++++++++++++++++++-- app/gui/oven_control/historylistwindow.h | 2 +- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index a286c20..f21789c 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -5,7 +5,7 @@ #define MAJOR_VER 1 #define MINOR_VER 5 -#define HOTFIX_VER 4 +#define HOTFIX_VER 5 // 0 for normal // 1 for premium diff --git a/app/gui/oven_control/historylistwindow.cpp b/app/gui/oven_control/historylistwindow.cpp index 865f71a..d90f177 100644 --- a/app/gui/oven_control/historylistwindow.cpp +++ b/app/gui/oven_control/historylistwindow.cpp @@ -291,14 +291,62 @@ void HistoryListWindow::setTotalServiceDataSet(void){ total_items[9].first_fired = firsttimebuf; total_items[9].last_fried = lasttimebuf; - //12 수위센 + //11 PCB 온도센서 고온 발생 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; - item = &(ovenst->srvdata->err_log.items.water_level_sensor_fail); + item = &(ovenst->srvdata->err_log.items.pcb_temp_high_alarm); firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; total_items[10].fired_cnt = firecntbuf; total_items[10].first_fired = firsttimebuf; total_items[10].last_fried = lasttimebuf; + //12 배수 탱크 온도 센서 이상 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdata->err_log.items.qunching_temp_fail); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[11].fired_cnt = firecntbuf; + total_items[11].first_fired = firsttimebuf; + total_items[11].last_fried = lasttimebuf; + + //13 중심 온도 센서 이상 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdata->err_log.items.meatprove_temp1_fail); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[12].fired_cnt = firecntbuf; + total_items[12].first_fired = firsttimebuf; + total_items[13].last_fried = lasttimebuf; + + //14 벽면 온도 센서 이상 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdata->err_log.items.wall_temp1_fail); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[13].fired_cnt = firecntbuf; + total_items[13].first_fired = firsttimebuf; + total_items[13].last_fried = lasttimebuf; + + //15 스팀 온도 센서 이상 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdata->err_log.items.steam_gen_temp_fail); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[14].fired_cnt = firecntbuf; + total_items[14].first_fired = firsttimebuf; + total_items[14].last_fried = lasttimebuf; + + //16 PCB 온도 센서 이상 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdata->err_log.items.steam_gen_temp_fail); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[15].fired_cnt = firecntbuf; + total_items[15].first_fired = firsttimebuf; + total_items[15].last_fried = lasttimebuf; + + //17 수위센 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdata->err_log.items.water_level_sensor_fail); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[16].fired_cnt = firecntbuf; + total_items[16].first_fired = firsttimebuf; + total_items[16].last_fried = lasttimebuf; + for(i=0;i<20;i++){ err_items[i] = &total_items[i]; diff --git a/app/gui/oven_control/historylistwindow.h b/app/gui/oven_control/historylistwindow.h index 9110aec..aedb3d9 100644 --- a/app/gui/oven_control/historylistwindow.h +++ b/app/gui/oven_control/historylistwindow.h @@ -19,7 +19,7 @@ namespace ERROR_LOG_SPACE { ERROR_HISTORY_LOWERBUNNER, ERROR_HISTORY_TOTAL }; - static const uint8_t m_arrErrorMaxIdx[4] = {3,4,3,11}; + static const uint8_t m_arrErrorMaxIdx[4] = {3,4,3,17}; static const uint16_t m_arrErrorIdxs[3][20] = { //서비스 에러 기록 종합은 합산 {ERROR_IDX_upper_fire_fail,ERROR_IDX_upper_pan_fail,ERROR_IDX_upper_motor_fail}, {ERROR_IDX_steam_fire_fail,ERROR_IDX_steam_pan_fail,ERROR_IDX_water_level_sensor_fail,ERROR_IDX_steam_gen_temp_high_alram}, -- 2.1.4