diff --git a/app/gui/oven_control/historylistwindow.cpp b/app/gui/oven_control/historylistwindow.cpp index 6f4ab84..6643787 100644 --- a/app/gui/oven_control/historylistwindow.cpp +++ b/app/gui/oven_control/historylistwindow.cpp @@ -235,61 +235,61 @@ void historyListWindow::setTotalServiceDataSet(void){ total_items[4].last_fried = 0; //06 중복 에러 - firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + /*firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; item = &(ovenst->srvdatas->err_log.items.repeat_error); firecntbuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; total_items[5].fired_cnt = firecntbuf; total_items[5].first_fired = firsttimebuf; - total_items[5].last_fried = lasttimebuf; + total_items[5].last_fried = lasttimebuf;*/ //07 B1 센서 에러 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; item = &(ovenst->srvdatas->err_log.items.inner_temp_high_alarm); - firecntbuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + total_items[5].fired_cnt = firecntbuf; + total_items[5].first_fired = firsttimebuf; + total_items[5].last_fried = lasttimebuf; + + //08 B2 센서 에러 + firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; + item = &(ovenst->srvdatas->err_log.items.qunching_temp_high_alarm); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; total_items[6].fired_cnt = firecntbuf; total_items[6].first_fired = firsttimebuf; total_items[6].last_fried = lasttimebuf; - //08 B2 센서 에러 + //09 B3 센서 에러 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; - item = &(ovenst->srvdatas->err_log.items.qunching_temp_high_alarm); - firecntbuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + item = &(ovenst->srvdatas->err_log.items.meatprove_temp1_high_alarm); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; total_items[7].fired_cnt = firecntbuf; total_items[7].first_fired = firsttimebuf; total_items[7].last_fried = lasttimebuf; - //09 B3 센서 에러 + //10 B4 센서 에러 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; - item = &(ovenst->srvdatas->err_log.items.meatprove_temp1_high_alarm); - firecntbuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + item = &(ovenst->srvdatas->err_log.items.wall_temp1_high_alarm); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; total_items[8].fired_cnt = firecntbuf; total_items[8].first_fired = firsttimebuf; total_items[8].last_fried = lasttimebuf; - //10 B4 센서 에러 + //11 B5 센서 에러 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; - item = &(ovenst->srvdatas->err_log.items.wall_temp1_high_alarm); - firecntbuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + item = &(ovenst->srvdatas->err_log.items.steam_gen_temp_high_alram); + firsttimebuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; total_items[9].fired_cnt = firecntbuf; total_items[9].first_fired = firsttimebuf; total_items[9].last_fried = lasttimebuf; - //11 B5 센서 에러 + //12 수위센 firecntbuf = 0;firsttimebuf = 0; lasttimebuf=0; - item = &(ovenst->srvdatas->err_log.items.steam_gen_temp_high_alram); - firecntbuf = item->first_fired;lasttimebuf = item->last_fried;firecntbuf=item->fired_cnt; + item = &(ovenst->srvdatas->err_log.items.water_level_sensor_fail); + 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->srvdatas->err_log.items.water_level_sensor_fail); - firecntbuf = 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; - for(i=0;i<20;i++){ err_items[i] = &total_items[i]; @@ -320,12 +320,6 @@ void historyListWindow::setWindosDataSet(ERROR_HISTORY_TYPE type){ void historyListWindow::on_ctrlBackBtn_clicked() { - OvenStatics* ovenst = OvenStatics::getInstance(); - time_t ltime; - ltime = time(NULL); - ovenst->srvdatas->err_log.items.upper_fire_fail.fired_cnt++; - if(ovenst->srvdatas->err_log.items.upper_fire_fail.first_fired ==0) ovenst->srvdatas->err_log.items.upper_fire_fail.first_fired = ltime; - ovenst->srvdatas->err_log.items.upper_fire_fail.last_fried = ltime; deleteLater(); } diff --git a/app/gui/oven_control/historylistwindow.h b/app/gui/oven_control/historylistwindow.h index 923f40b..a7f5639 100644 --- a/app/gui/oven_control/historylistwindow.h +++ b/app/gui/oven_control/historylistwindow.h @@ -44,7 +44,7 @@ private slots: private: Ui::historyListWindow *ui; - const uint8_t m_arrErrorMaxIdx[4] = {3,4,3,12}; + const uint8_t m_arrErrorMaxIdx[4] = {3,4,3,11}; const char m_strWindowName[4][64] = {"상부점화장치\0", "스팀점화장치\0","하부점화장치\0","서비스에러기록종합\0"}; diff --git a/app/gui/oven_control/historylistwindow.ui b/app/gui/oven_control/historylistwindow.ui index 60901e7..0f48f4a 100644 --- a/app/gui/oven_control/historylistwindow.ui +++ b/app/gui/oven_control/historylistwindow.ui @@ -673,8 +673,8 @@ QPushButton { text-align:center;} 나눔고딕 8 - 75 - true + 50 + false @@ -879,8 +879,8 @@ QPushButton { text-align:center;} 나눔고딕 8 - 75 - true + 50 + false diff --git a/app/gui/oven_control/operationtimeheat.cpp b/app/gui/oven_control/operationtimeheat.cpp index 92704c0..5f1141e 100644 --- a/app/gui/oven_control/operationtimeheat.cpp +++ b/app/gui/oven_control/operationtimeheat.cpp @@ -51,6 +51,8 @@ void operationTimeHeat::reloadUI(void){ timetemp = ovs->srvdatas->use_log.items.dry_heat; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime2->setText(strTemp); + qDebug() << "Steam heat time : " << ovs->srvdatas->use_log.items.steam_heat; + qDebug() << "Dry heat time : " << ovs->srvdatas->use_log.items.dry_heat; } } diff --git a/app/gui/oven_control/operationtimemode.cpp b/app/gui/oven_control/operationtimemode.cpp index 86d776c..d1200bd 100644 --- a/app/gui/oven_control/operationtimemode.cpp +++ b/app/gui/oven_control/operationtimemode.cpp @@ -32,49 +32,59 @@ void operationTimeMode::reloadUi(void){ totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime1->setText(strTemp); + qDebug() << "Dry Cook Time : " <srvdatas->use_log.items.cook_steam_mode; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime2->setText(strTemp); + qDebug() << "Steam Cook Time : " <srvdatas->use_log.items.cook_combi_mode; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime3->setText(strTemp); + qDebug() << "Combi Cook Time : " <srvdatas->use_log.items.wash_mode_nocleanser; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime4->setText(strTemp); + qDebug() << "Wash Nocleanser Time : " <srvdatas->use_log.items.wash_mode_simple; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime5->setText(strTemp); + qDebug() << "Wash Simple Time : " <srvdatas->use_log.items.wash_mode_standard; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime6->setText(strTemp); + qDebug() << "Wash Standard Time : " <srvdatas->use_log.items.wash_mode_strong; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime7->setText(strTemp); + qDebug() << "Wash Strong Time : " <srvdatas->use_log.items.wash_mode_speed; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime8->setText(strTemp); + qDebug() << "Wash Speed Time : " <srvdatas->use_log.items.cooldown_mode; totaltime += timetemp; strTemp.sprintf("%d h", timetemp/3600); ui->m_ctrlLbListTime9->setText(strTemp); + qDebug() << "Cool Down Time : " <m_ctrlLbListTime10->setText(strTemp); + qDebug() << "Total Time : " <cooking()) state = SYS_OFF_COOK_OFF; else if(control.system != 0 && !oven->cooking()) state = SYS_ON_COOK_OFF; @@ -113,63 +113,73 @@ void OvenStatics::processSensorError(uint16_t errflag, time_t ltime){ if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){ item = &(srvdatas->err_log.items.inner_temp_fail); - strMsg = tr("내부 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_1],strMsg,ltime); + strTitle = tr("내부 온도 이상 발생"); + strMsg = tr("내부 온도 센서에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_1],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_2)){ item = &(srvdatas->err_log.items.qunching_temp_fail); - strMsg = tr("퀀칭 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_2],strMsg,ltime); + strTitle = tr("퀀칭 온도 이상 발생"); + strMsg = tr("퀀칭 온도에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_2],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_3)){ //Reserved allerrornoe 설정 item = &(srvdatas->err_log.items.qunching_temp_fail); - strMsg = tr("퀀칭 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_3],strMsg,ltime); + strTitle = tr("퀀칭 온도 이상 발생"); + strMsg = tr("퀀칭 온도 센서에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_3],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_4)){ item = &(srvdatas->err_log.items.wall_temp1_fail); - strMsg = tr("벽면 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_4],strMsg,ltime); + strTitle = tr("벽면 온도 이상 발생"); + strMsg = tr("벽면 온도 센서에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_4],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_5)){ item = &(srvdatas->err_log.items.steam_gen_temp_fail); - strMsg = tr("스팀제네레이터 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_5],strMsg,ltime); + strTitle = tr("스팀제네레이터 온도 이상 발생"); + strMsg = tr("스팀제네레이터 온도 센서에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_5],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_6)){ item = &(srvdatas->err_log.items.meatprove_temp1_fail); - strMsg = tr("미트프로브 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_6],strMsg,ltime); + strTitle = tr("미트프로브 온도 이상 발생"); + strMsg = tr("미트프로브 온도 센서에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_6],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_7)){ //Reseved item = &(srvdatas->err_log.items.meatprove_temp2_fail); - strMsg = tr("미트프로브2 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_7],strMsg,ltime); + strTitle = tr("미트프로브2 온도 이상 발생"); + strMsg = tr("미트프로브2 온도 센서에 이상이 발생하였습니다."); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_7],strMsg , strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_8)){ //Reserved item = &(srvdatas->err_log.items.meatprove_temp3_fail); - strMsg = tr("미트프로브3 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_8],strMsg,ltime); + strMsg = tr("미트프로브3 온도 센서에 이상이 발생하였습니다."); + strTitle = tr("미트프로브3 온도 이상 발생"); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_8],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_9)){ //Reserved item = &(srvdatas->err_log.items.meatprove_temp4_fail); - strMsg = tr("미트프로브4 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_9],strMsg,ltime); + strMsg = tr("미트프로브4 온도 센서에 이상이 발생하였습니다."); + strTitle = tr("미트프로브4 온도 이상 발생"); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_9],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_10)){ item = &(srvdatas->err_log.items.pcb_temp_fail); - strMsg = tr("PCB 온도 이상 발생"); - processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_10],strMsg,ltime); + strMsg = tr("PCB 온도 센서에 이상이 발생하였습니다."); + strTitle = tr("PCB 온도 이상 발생"); + processErrorItems(item,sensor_err_type_def[state][SENSOR_ERR_SENSOR_10],strMsg,strTitle, ltime); } } void OvenStatics::processCommError(uint16_t errflag, time_t ltime){ error_item *item; - QString strMsg = ""; + QString strMsg = "",strTitle=""; uint8_t state; if( control.system==0 && !oven->cooking()) state = SYS_OFF_COOK_OFF; else if(control.system != 0 && !oven->cooking()) state = SYS_ON_COOK_OFF; @@ -179,33 +189,38 @@ void OvenStatics::processCommError(uint16_t errflag, time_t ltime){ if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){ item = &(srvdatas->err_log.items.upper_pan_fail); strMsg = tr("상부 송풍기 이상 발생"); - processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER1],strMsg,ltime); + strTitle = tr("상부 송풍기 이상 발생"); + processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER1],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(COMM_ERR_BUNNER2)){ item = &(srvdatas->err_log.items.lower_pan_fail); strMsg = tr("하부 송풍기 이상 발생"); - processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER2],strMsg,ltime); + strTitle = tr("하부 송풍기 이상 발생"); + processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER2],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(COMM_ERR_BUNNER3)){ item = &(srvdatas->err_log.items.steam_pan_fail); strMsg = tr("스팀 송풍기 이상 발생"); - processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER3],strMsg,ltime); + strTitle = tr("스팀 송풍기 이상 발생"); + processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER3],strMsg,strTitle, ltime); } - if(errflag & MAKE_MASK(COMM_ERR_LOWERPAN)){ + if(errflag & MAKE_MASK(COMM_ERR_LOWERFAN)){ item = &(srvdatas->err_log.items.lower_motor_fail); - strMsg = tr("상부 모터 컨트롤러 이상 발생"); - processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER2],strMsg,ltime); + strMsg = tr("하부 모터 컨트롤러 이상 발생"); + strTitle = tr("하부 모터 컨트롤러 이상 발생"); + processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER2],strMsg,strTitle, ltime); } if(errflag & MAKE_MASK(COMM_ERR_UPPERFAN)){ item = &(srvdatas->err_log.items.upper_motor_fail); strMsg = tr("상부 모터 컨트롤러 이상 발생"); - processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER2],strMsg,ltime); + strTitle = tr("상부 모터 컨트롤러 이상 발생"); + processErrorItems(item,comm_err_type_def[state][COMM_ERR_BUNNER2],strMsg,strTitle, ltime); } } void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){ error_item *item; - QString strMsg = ""; + QString strMsg = "",strTitle = ""; uint8_t state; if( control.system==0 && !oven->cooking()) state = SYS_OFF_COOK_OFF; else if(control.system != 0 && !oven->cooking()) state = SYS_ON_COOK_OFF; @@ -216,52 +231,67 @@ void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){ //버너 컨트롤러 1 착화 이상 item = &(srvdatas->err_log.items.upper_fire_fail); strMsg = tr("상부 버너 착하가 되지 않습니다."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER1],strMsg,ltime); + strTitle = tr("상부 버너 착하 이상 발생"); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER1],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER2)){ //버너 컨트롤러 2 착화 이상 item = &(srvdatas->err_log.items.lower_fire_fail); strMsg = tr("하부 버너 착하가 되지 않습니다."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER2],strMsg,ltime); + strTitle = tr("하부 버너 착하 이상 발생"); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER2],strMsg,strTitle,ltime); } - if(errflag & SYS_ERR_FIRE_TRIGGER3){ + if(errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER3)){ item = &(srvdatas->err_log.items.steam_fire_fail); strMsg = tr("스팀 버너 착하가 되지 않습니다."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER3],strMsg,ltime); + strMsg = tr("스팀 버너 착하 이상 발생"); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_FIRE_TRIGGER3],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_OVNE_TEMP_ALARM)){ item = &(srvdatas->err_log.items.inner_temp_high_alarm); - strMsg = tr("내부 온도 과열 발생."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_OVNE_TEMP_ALARM],strMsg,ltime); + strMsg = tr("내부 온도가 과열되었습니다."); + strTitle = tr("내부 온도 과열 발생"); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_OVNE_TEMP_ALARM],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_QUN_TEMP_ALARM)){ //퀀칭 온도 센서 과열 item = &(srvdatas->err_log.items.qunching_temp_high_alarm); - strMsg = tr("퀀칭 온도 센서 이상 발생."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_QUN_TEMP_ALARM],strMsg,ltime); + strTitle = tr("퀀칭 온도 센서 이상 발생"); + strMsg = tr("퀀칭 온도 센서가 과열되었습니다"); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_QUN_TEMP_ALARM],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_CENTER_TEMP_ALARM)){ //중심 온도 과열 item = &(srvdatas->err_log.items.meatprove_temp1_high_alarm); - strMsg = tr("미트프로브 온도 센서 이상 발생."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_CENTER_TEMP_ALARM],strMsg,ltime); + strTitle = tr("미트프로브 온도 센서 이상 발생."); + strMsg = tr("미트프로브 온도 센서 과열되었습니다."); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_CENTER_TEMP_ALARM],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_WALL_TEMP_ALARM)){ item = &(srvdatas->err_log.items.wall_temp1_high_alarm); - strMsg = tr("벽면 온도 센서 이상 발생."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_WALL_TEMP_ALARM],strMsg,ltime); - } + strTitle = tr("벽면 온도 센서 이상 발생."); + strMsg = tr("벽면 온도 센서가 과열 되었습니다."); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_WALL_TEMP_ALARM],strMsg,strTitle,ltime); + } + if(errflag & MAKE_MASK(SYS_ERR_STAM_TEMP_ALARM)){ + item = &(srvdatas->err_log.items.steam_gen_temp_high_alram); + strTitle = tr("스팀제네레이터 온도 과열 발생."); + strMsg = tr("스팀제네레이터 온도 센서 과열이 발생되었습니다."); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_STAM_TEMP_ALARM],strMsg,strTitle,ltime); + } if(errflag & MAKE_MASK(SYS_ERR_WATER_SPLY_FAIL)){ //급수 이상 -> 유량 센서 이상 item = &(srvdatas->err_log.items.water_level_sensor_fail); + strTitle = tr("급수 이상 발생"); strMsg = tr("급수가 되지 않습니다."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_WATER_SPLY_FAIL],strMsg,ltime); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_WATER_SPLY_FAIL],strMsg,strTitle,ltime); } if(errflag & MAKE_MASK(SYS_ERR_WATER_LEVEL_FAIL)){ //급수 이상 -> 수위 센서 이상 item = &(srvdatas->err_log.items.water_level_sensor_fail); + strTitle = tr("급수 이상 발생"); strMsg = tr("급수가 되지 않습니다."); - processErrorItems(item, sys_err_type_def[state][SYS_ERR_WATER_LEVEL_FAIL],strMsg,ltime); + processErrorItems(item, sys_err_type_def[state][SYS_ERR_WATER_LEVEL_FAIL],strMsg,strTitle,ltime); } } @@ -319,7 +349,7 @@ void OvenStatics::oneSecTimerFired(void){ } else srvdatas->use_log.items.cook_combi_mode+=1; } - if(state.cleaning_mode !=0){ + if(state.cleaning_mode !=0 && state.cleaning_sate !=0){ switch (state.cleaning_mode) { case (uint16_t)wash_mode_nocleanser: srvdatas->use_log.items.wash_mode_nocleanser+=1; @@ -382,7 +412,7 @@ void OvenStatics::oneSecTimerFired(void){ realdata.b.qnv_open = (state.onoff_state2&LOAD_STATE2_QNV)==0?0:1; realdata.b.sgnv_open = (state.onoff_state2&LOAD_STATE2_SGNV)==0?0:1; realdata.b.snv_open = (state.onoff_state2&LOAD_STATE2_SNV)==0?0:1; - realdata.b.ssp_opne = (state.onoff_state2&LOAD_STATE2_SSP)==0?0:1; + realdata.b.wsv_open = (state.onoff_state2&LOAD_STATE2_WSV)==0?0:1; realdata.b.ssv_open = (state.onoff_state2&LOAD_STATE2_SSV)==0?0:1; realdata.b.water_level = 0; @@ -462,8 +492,9 @@ void OvenStatics::oneSecTimerFired(void){ } -void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, time_t ltime){ +void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, const QString &MsgTitle, time_t ltime){ + qDebug() << (int) (item - &(srvdatas->err_log.values[0])) << "ERROR Fired!"; if(m_pLastErrItem == item ){ srvdatas->err_log.items.repeat_error.fired_cnt =item->fired_cnt; srvdatas->err_log.items.repeat_error.first_fired = item->first_fired; @@ -481,11 +512,11 @@ void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, co case error_type_popclr: case error_type_popnonclr: { - errorPopupDlg *dlg = new errorPopupDlg(QApplication::activeWindow(),MsgDesc); + errorPopupDlg *dlg = new errorPopupDlg(QApplication::activeWindow(),MsgDesc,MsgTitle); dlg->exec(); break; } - case error_type_engclr: + case error_type_engclr: case error_type_engnonclr: case error_type_onlyeng: { diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index 527528e..db80d78 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -104,7 +104,7 @@ enum comm_err_id{ COMM_ERR_BUNNER2 , COMM_ERR_BUNNER3 , COMM_ERR_UPPERFAN , - COMM_ERR_LOWERPAN + COMM_ERR_LOWERFAN }; enum sensor_err_id{ @@ -150,7 +150,7 @@ typedef union { uint32_t reserved : 9; uint32_t door_open : 1; - uint32_t ssp_opne : 1; + uint32_t wsv_open : 1; uint32_t dv_open : 1; uint32_t sgnv_open : 1; uint32_t water_level : 16; @@ -234,7 +234,7 @@ private: void processSystemError(uint16_t errflag,time_t ltime); void processCommError(uint16_t errflag,time_t ltime); void processSensorError(uint16_t errflag, time_t ltime); - void processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, time_t ltime); + void processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc,const QString &MsgTitle, time_t ltime); public slots: diff --git a/app/gui/oven_control/realtimepartswindow.cpp b/app/gui/oven_control/realtimepartswindow.cpp index 98c04cd..16e3ad4 100644 --- a/app/gui/oven_control/realtimepartswindow.cpp +++ b/app/gui/oven_control/realtimepartswindow.cpp @@ -83,7 +83,7 @@ void realtimePartsWindow::reloadUi(void){ if(realdata.b.dv_open) ui->m_ctrlLbListState_1_6->setText(tr("ON")); else ui->m_ctrlLbListState_1_6->setText(tr("OFF")); - if(realdata.b.ssp_opne) ui->m_ctrlLbListState_1_7->setText(tr("ON")); + if(realdata.b.wsv_open) ui->m_ctrlLbListState_1_7->setText(tr("ON")); else ui->m_ctrlLbListState_1_7->setText(tr("OFF")); if(realdata.b.door_open) ui->m_ctrlLbListState_1_8->setText(tr("ON"));