버그 및 동작 개선

- 모델 설정 후 초기화 명령 추가 - 에러 팝업 발생 후 오븐 중지 명령 추가

버그 및 동작 개선
- 모델 설정 후 초기화 명령 추가 - 에러 팝업 발생 후 오븐 중지 명령 추가
고영탁
1 parent e84d48604c
Showing 8 changed files with 114 additions and 79 deletions Show diff stats
app/gui/oven_control/config.cpp
app/gui/oven_control/errorpopupdlg.cpp
app/gui/oven_control/errorpopupdlg.h
app/gui/oven_control/main.cpp
app/gui/oven_control/mainwindow.cpp
app/gui/oven_control/mainwindow.h
app/gui/oven_control/ovenstatics.cpp
app/gui/oven_control/ovenstatics.h
@@ -246,7 +246,8 @@ void Config::applyConfig(){
     ipdata.netmask = QString("%1.%2.%3.%4").arg(configlist.items.netmask.d8.d8_0).arg(configlist.items.netmask.d8.d8_1).arg(configlist.items.netmask.d8.d8_2).arg(configlist.items.netmask.d8.d8_3);
     System::setIP(ipdata);
-
+    //All Error Reset
+    UdpHandler::getInstance()->set(TG_ERROR_CLEAR,0xCECE);
 }
 Define::config_item Config::getConfigValue(Define::ConfigType idx){
@@ -3,8 +3,9 @@
 #include <QDebug>
 #include "soundplayer.h"
+#include "udphandler.h"
-ErrorPopupDlg::ErrorPopupDlg(QWidget *parent, const QString &MsgDesc, const QString &MsgTitle) :
+ErrorPopupDlg::ErrorPopupDlg(QWidget *parent, const QString &MsgDesc, const QString &MsgTitle, bool sendClrCmd,int erridx) :
     QDialog(parent),
     ui(new Ui::ErrorPopupDlg)
 {
@@ -20,6 +21,8 @@ ErrorPopupDlg::ErrorPopupDlg(QWidget *parent, const QString &amp;MsgDesc, const QStr
     foreach (QPushButton *button, findChildren<QPushButton *>())
         connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+    m_bClrCmd = sendClrCmd;
+    m_nErrIdx = erridx;
 }
 ErrorPopupDlg::~ErrorPopupDlg()
@@ -29,8 +32,9 @@ ErrorPopupDlg::~ErrorPopupDlg()
 void ErrorPopupDlg::on_ctrlOkBtn_clicked()
 {
-    //emit closedPopup(m_pParent);
+    emit closedErrorPopup(m_nErrIdx);
     qApp->setActiveWindow(m_pParent);
     this->hide();
+    if(m_bClrCmd) UdpHandler::getInstance()->set(TG_ERROR_CLEAR,0xCECE);
     close();
 }
@@ -12,11 +12,12 @@ class ErrorPopupDlg : public QDialog
     Q_OBJECT
 public:
-    explicit ErrorPopupDlg(QWidget *parent = 0, const QString &MsgDesc=0, const QString &MsgTitle=0);
+    explicit ErrorPopupDlg(QWidget *parent = 0, const QString &MsgDesc=0, const QString &MsgTitle=0, bool sendClrCmd = false, int erridx = -1);
     ~ErrorPopupDlg();
 signals:
     void closedPopup(QWidget* parent=0);
+    void closedErrorPopup(int erridx);
 private slots:
     void on_ctrlOkBtn_clicked();
@@ -24,6 +25,8 @@ private slots:
 private:
     Ui::ErrorPopupDlg *ui;
     QWidget* m_pParent;
+    bool m_bClrCmd;
+    int m_nErrIdx;
 };
 #endif // ERRORPOPUPDLG_H
@@ -19,9 +19,10 @@ int main(int argc, char *argv[])
     UdpHandler *udp = UdpHandler::getInstance();
     interface->setUdpHandler(udp);
-    OvenStatistics::getInstance(oven);
     Config::getInstance(oven);
+    OvenStatistics::getInstance(oven);
+
     oven->setDefault(Define::CombiMode);
 //    QTranslator* trans = new QTranslator();
@@ -52,10 +52,17 @@ void MainWindow::killChild()
         instance->child->deleteLater();
 }
-void MainWindow::killChildCook()
+bool MainWindow::killChildCook()
 {
+
     if (instance->child && !instance->child->inherits("ConfigWindow"))
+    {
+        qDebug() << "kill child";
+        instance->child->hide();
         instance->child->deleteLater();
+        return true;
+    }
+    else return false;
 }
 void MainWindow::keyPressEvent(QKeyEvent *event)
@@ -22,7 +22,7 @@ public:
     static MainWindow *getInstance() { return instance; }
     static void jump(QMainWindow *newChild);
     static void killChild();
-    static void killChildCook();
+    static bool killChildCook();
 protected:
     void keyPressEvent(QKeyEvent *event);
@@ -40,6 +40,7 @@ OvenStatistics::OvenStatistics(QObject* parent) :QObject(parent)
     curSysErrorState = 0;
     curCommErrorState = 0;
     curSensorErrorState = 0;
+    curControlErrorState = 0;
     bDataRefreshed = false;
     realdata.d32 = 0;
     m_bPopupShow = false;
@@ -112,9 +113,10 @@ void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){
     error_item *item;
     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;
-    else if(control.system !=0 && oven->cooking()) state = SYS_ON_COOK_ON;
+    bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
+    if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
+    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
     else state = SYS_ON_COOK_OFF;
     if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){
@@ -187,9 +189,10 @@ void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){
     error_item *item;
     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;
-    else if(control.system !=0 && oven->cooking()) state = SYS_ON_COOK_ON;
+    bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
+    if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
+    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
     else state = SYS_ON_COOK_OFF;
     if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){
@@ -228,9 +231,10 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){
     error_item *item;
     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;
-    else if(control.system !=0 && oven->cooking()) state = SYS_ON_COOK_ON;
+    bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
+    if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
+    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
     else state = SYS_ON_COOK_OFF;
     if(errflag & MAKE_MASK(STATE_ERR_BUNNER1)){
@@ -269,9 +273,10 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
    error_item *item;
    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;
-   else if(control.system !=0 && oven->cooking()) state = SYS_ON_COOK_ON;
+   bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
+   if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
+   else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+   else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
    else state = SYS_ON_COOK_OFF;
     if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){
@@ -462,14 +467,9 @@ void OvenStatistics::oneSecTimerFired(void){
     realdata.b.snv_open = (state.onoff_state2&LOAD_STATE2_SNV)==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;
-    if( (state.reserved11 & 0x0018) !=0){
-        if( (state.reserved11&0x0008) != 0){
-            realdata.b.water_level = water_level_high;
-        }
-        else if( (state.reserved11 & 0x0010) !=0){
-            realdata.b.water_level = water_level_low;
-        }
-    }
+
+    if( (state.reserved11&0x0018)  ==  0x0018)  realdata.b.water_level = water_level_high;
+    else if( (state.reserved11&0x0018)  == 0x0000) realdata.b.water_level = water_level_low;
     else realdata.b.water_level = water_level_normal;
     if(srvdata->sensor_log.items.B1.high_temp.itemp < state.sensor1 ){
@@ -549,7 +549,9 @@ void OvenStatistics::oneSecTimerFired(void){
 }
 void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, const QString &MsgTitle, time_t ltime){
-   uint32_t erridx = (uint32_t) (item - &(srvdata->err_log.values[0]));
+    QWidget* pParent;
+    uint32_t erridx = (uint32_t) (item - &(srvdata->err_log.values[0]));
+
     qDebug() << (uint32_t) (item - &(srvdata->err_log.values[0]))  <<   "ERROR Fired!";
    if(m_pLastErrItem == item ){
         srvdata->err_log.items.repeat_error.fired_cnt =item->fired_cnt;
@@ -557,49 +559,78 @@ void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype,
         srvdata->err_log.items.repeat_error.last_fried = item->last_fried;
    }
    m_pLastErrItem = item;
-
+    qDebug() << "error type" << errtype;
     if(errtype >= error_type_onlychk){
         item->fired_cnt+=1;
         if(item->first_fired == 0) item->first_fired = ltime;
         item->last_fried = ltime;
     }
+    if(errtype>=error_type_chkclrstopcmd){
+        qDebug() << "exec killchild";
+        if(MainWindow::killChildCook()){
+            pParent = MainWindow::getInstance();
+        }
+        else{
+            pParent = QApplication::activeWindow();
+        }
+    }
+    else{
+        pParent = QApplication::activeWindow();
+    }
+
+
+
     switch(errtype){
         case error_type_onlypop:
         case error_type_popclr:
         case error_type_popnonclr:
+        case error_type_popclrstopcmd:
             {
-                ErrorPopupDlg *dlg = new ErrorPopupDlg(QApplication::activeWindow(),MsgDesc,MsgTitle);
-                dlg->exec();
+                if(m_mapPopupList.find(erridx) == m_mapPopupList.end()){
+                    ErrorPopupDlg *dlg = new ErrorPopupDlg(pParent,MsgDesc,MsgTitle , (errtype > error_type_clrsplit), erridx);
+                    connect(dlg,SIGNAL(closedErrorPopup(int)), this, SLOT(onErrorPopupClosed(int)));
+                    m_mapPopupList.insert(erridx,dlg);
+                    qApp->setActiveWindow(dlg);
+                    dlg->showFullScreen();
+                }
                 break;
             }
-    case error_type_engclr:
+        case error_type_engclr:
         case error_type_engnonclr:
         case error_type_onlyeng:
+        case error_type_engclrstopcmd:
             {
                 //EngineerMenuWindow *w = new EngineerMenuWindow(0);
                 //w->showFullScreen();
-                ErrorPopupDlg *dlg = new ErrorPopupDlg(QApplication::activeWindow(),MsgDesc,MsgTitle);
-                dlg->exec();
-                ServicePassInputDlg *w = new ServicePassInputDlg(QApplication::activeWindow());
-                w->exec();
+                if(m_mapPopupList.find(erridx)==m_mapPopupList.end()){
+                    ErrorPopupDlg *dlg = new ErrorPopupDlg(pParent,MsgDesc,MsgTitle, (errtype > error_type_clrsplit),erridx);
+                    connect(dlg,SIGNAL(closedErrorPopup(int)),this,SLOT(onErrorPopupClosed(int)));
+                    m_mapPopupList.insert(erridx,dlg);
+                    dlg->showFullScreen();
+
+                    ServicePassInputDlg *w = new ServicePassInputDlg(pParent);
+                    //w->exec();
+                    connect(dlg, SIGNAL(destroyed(QObject*)), w, SLOT(showFullScreen()));
+                 }
                 break;
             }
         default:
             break;
     }
-    if(errtype > error_type_clrsplit){
-        //에러 클리어 명령 송신
-       if(errtype == error_type_engclr){
-            //확인 후 송신
-            bNeedErrorClear = true;
-        }
-        else{
-            //에러클리어 메시지 즉시 송신
-            udp->set(TG_ERROR_CLEAR,0xCECE);
-        }
-    }
+//    if(errtype > error_type_clrsplit){
+//        //에러 클리어 명령 송신
+////       if(errtype == error_type_engclr){
+////            //확인 후 송신
+////            bNeedErrorClear = true;
+////        }
+////        else{
+////            //에러클리어 메시지 즉시 송신
+//           qDebug() << "send error clr";
+//            udp->set(TG_ERROR_CLEAR,0xCECE);
+////        }
+    //}
 }
@@ -617,25 +648,9 @@ type_temp OvenStatistics::getCurSensorValueByIdx(uint16_t idx){
     return curSensorValue[idx];
 }
-void OvenStatistics::onErrorPopupClosed(QWidget* parent){
-    qDebug() << "Error Popup Closed!";
-    if(bNeedErrorClear) {
-        qDebug() << "send error clear command";
-        bNeedErrorClear = false;
-        udp->set(TG_ERROR_CLEAR,0xCECE);
-    }
-    if(m_mapPopupList.isEmpty()==false){
-        popup_list_item item;
-        item = m_mapPopupList.first();
-        m_nLastPopupidx = m_mapPopupList.firstKey();
-        bNeedErrorClear = item.bNeedClear;
-        ErrorPopupDlg *dlg = new ErrorPopupDlg(parent,item.strDesc,item.strTitle);
-        m_mapPopupList.remove(m_nLastPopupidx);
-        connect(dlg,SIGNAL(closedPopup(QWidget*)),this, SLOT(onErrorPopupClosed(QWidget*)));
-        dlg->showFullScreen();
-    }
-    else{
-        m_bPopupShow = false;
-        m_nLastPopupidx = MAX_ERROR_TYPE_CNT;
+void OvenStatistics::onErrorPopupClosed(int erridx){
+    qDebug() << "error idx" << erridx;
+    if(m_mapPopupList.find(erridx)!= m_mapPopupList.end()){
+        m_mapPopupList.remove(erridx);
     }
 }
@@ -137,6 +137,7 @@ enum sensor_err_id{
 enum error_exe_type{
     error_type_allnone=0,
+    error_type_olnystopcmd,
     error_type_onlypop,
     error_type_onlyeng,
     error_type_onlychk,
@@ -146,6 +147,9 @@ enum error_exe_type{
     error_type_chkclr,
     error_type_popclr,
     error_type_engclr,
+    error_type_chkclrstopcmd,
+    error_type_popclrstopcmd,
+    error_type_engclrstopcmd,
 };
@@ -206,34 +210,34 @@ private:
     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,
-                                                        error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_OFF state
-                                                        {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_ON_COOK_ON state
+                                                        {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,
+                                                        error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_OFF state
+                                                        {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,
+                                                        error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_ON state
                                                         {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_ON state
                                                         };
     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_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_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_OFF
+                                                       {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //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] ={ //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_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_OFF
+                                                       {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //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]={ //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_popclr,error_type_allnone,error_type_popclr,error_type_onlychk,
+                                                        {error_type_engclrstopcmd,error_type_popclrstopcmd,error_type_allnone,error_type_popclrstopcmd,error_type_popclrstopcmd,
                                                         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_popclrstopcmd,error_type_popclrstopcmd,error_type_allnone,error_type_popclrstopcmd,error_type_popclrstopcmd,
                                                         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
@@ -253,7 +257,7 @@ private:
     oven_control_t control;
     oven_state_t state;
     error_item* m_pLastErrItem;
-    QMap<uint32_t, popup_list_item> m_mapPopupList;
+    QMap<uint32_t, QWidget *> m_mapPopupList;
     uint32_t m_nLastPopupidx;
     bool m_bPopupShow;
@@ -281,7 +285,7 @@ private:
 public slots:
     void onDataChanged();
     void oneSecTimerFired(void);
-    void onErrorPopupClosed(QWidget* parent);
+    void onErrorPopupClosed(int erridx);
 };
 #endif // OVENSTATICS_H
	@@ -246,7 +246,8 @@ void Config::applyConfig(){		@@ -246,7 +246,8 @@ void Config::applyConfig(){
246	ipdata.netmask = QString("%1.%2.%3.%4").arg(configlist.items.netmask.d8.d8_0).arg(configlist.items.netmask.d8.d8_1).arg(configlist.items.netmask.d8.d8_2).arg(configlist.items.netmask.d8.d8_3);	246	ipdata.netmask = QString("%1.%2.%3.%4").arg(configlist.items.netmask.d8.d8_0).arg(configlist.items.netmask.d8.d8_1).arg(configlist.items.netmask.d8.d8_2).arg(configlist.items.netmask.d8.d8_3);
247		247
248	System::setIP(ipdata);	248	System::setIP(ipdata);
249	-	249	+ //All Error Reset
		250	+ UdpHandler::getInstance()->set(TG_ERROR_CLEAR,0xCECE);
250	}	251	}
251		252
252	Define::config_item Config::getConfigValue(Define::ConfigType idx){	253	Define::config_item Config::getConfigValue(Define::ConfigType idx){
	@@ -22,7 +22,7 @@ public:		@@ -22,7 +22,7 @@ public:
22	static MainWindow *getInstance() { return instance; }	22	static MainWindow *getInstance() { return instance; }
23	static void jump(QMainWindow *newChild);	23	static void jump(QMainWindow *newChild);
24	static void killChild();	24	static void killChild();
25	- static void killChildCook();	25	+ static bool killChildCook();
26		26
27	protected:	27	protected:
28	void keyPressEvent(QKeyEvent *event);	28	void keyPressEvent(QKeyEvent *event);