From 43b3aef60c36caf01a629e07ad6353867f99b5dc Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Thu, 18 May 2017 10:41:09 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 타이머 삭제 루틴 제거
---
 app/gui/oven_control/config.cpp               | 2 ++
 app/gui/oven_control/config.h                 | 3 ++-
 app/gui/oven_control/realtimepartswindow.cpp  | 3 ---
 app/gui/oven_control/realtimesensorwindow.cpp | 3 ---
 app/gui/oven_control/usbcheckpopupdlg.cpp     | 5 ++++-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp
index d605fe0..9b47427 100644
--- a/app/gui/oven_control/config.cpp
+++ b/app/gui/oven_control/config.cpp
@@ -84,6 +84,8 @@ QString Config::getValueString(Define::ConfigType idx){
         case 3:
             qstrTemp.sprintf(config_format[(uint32_t)idx], configlist.values[(uint32_t)idx].d32+1);
             break;
+        case 0x7f:
+            qstrTemp = "";
         }
         return qstrTemp;
     }
diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h
index 0c189d3..a6aafab 100644
--- a/app/gui/oven_control/config.h
+++ b/app/gui/oven_control/config.h
@@ -246,6 +246,7 @@ class Config : public QObject
     * 1 = float
     * 2 = only String,
     * 3 = int +1
+    * 7f = none value
     */
    const uint8_t config_data_type[MAX_CONFIG_COUNT] = {
         0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80,  //Settings
@@ -253,7 +254,7 @@ class Config : public QObject
         0x02, 0x02, 0x02,0x02, 0x02,0x02, 0x80, 0x80, 0x80, 0x02, 0x02,
         0x80, 0x00, 0x00,0x00,
         0x80, 0x00, 0x00,
-        0x80, 0x80, 0x80,0x80,0x80,0x80
+        0x7F,0x7F,0x7F,0x7F,0x7F,0x7F
     };
 
     const char config_format_kr[MAX_CONFIG_COUNT][64]={
diff --git a/app/gui/oven_control/realtimepartswindow.cpp b/app/gui/oven_control/realtimepartswindow.cpp
index 76367fc..05188cd 100644
--- a/app/gui/oven_control/realtimepartswindow.cpp
+++ b/app/gui/oven_control/realtimepartswindow.cpp
@@ -57,9 +57,6 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) :
 
 RealtimePartsWindow::~RealtimePartsWindow()
 {
-    timer->stop();
-    delete timer;
-    delete ui;
 }
 
 void RealtimePartsWindow::on_backButton_clicked()
diff --git a/app/gui/oven_control/realtimesensorwindow.cpp b/app/gui/oven_control/realtimesensorwindow.cpp
index b982cd1..6a7ef9c 100644
--- a/app/gui/oven_control/realtimesensorwindow.cpp
+++ b/app/gui/oven_control/realtimesensorwindow.cpp
@@ -65,9 +65,6 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) :
 
 RealtimeSensorWindow::~RealtimeSensorWindow()
 {
-    timer->stop();
-    delete timer;
-    delete ui;
 }
 
 void RealtimeSensorWindow::on_backButton_clicked()
diff --git a/app/gui/oven_control/usbcheckpopupdlg.cpp b/app/gui/oven_control/usbcheckpopupdlg.cpp
index 4f0bbf9..4331e7a 100644
--- a/app/gui/oven_control/usbcheckpopupdlg.cpp
+++ b/app/gui/oven_control/usbcheckpopupdlg.cpp
@@ -29,5 +29,8 @@ void UsbCheckPopupDlg::on_ctrBtnYes_clicked()
 }
 
 void UsbCheckPopupDlg::usbCheckTimerFired(){
-
+    bool usbDetect = false;
+    if(usbDetect){
+        accept();
+    }
 }
-- 
2.1.4