From 596b06d692188cc724d48dd8ef9bee7444e3fbb3 Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Wed, 27 Feb 2019 10:47:52 +0900
Subject: [PATCH] =?UTF-8?q?V1.3.01=20=EA=B3=A0=EA=B0=9D=EC=82=AC=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gui/oven_control/configinfodlg.cpp             | 10 ++++++++++
 app/gui/oven_control/define.h                      |  2 +-
 app/gui/oven_control/electricmodelsettingwindow.ui |  2 +-
 app/gui/oven_control/gasmodelsettingwindow.ui      |  2 +-
 app/gui/oven_control/ovenstatics.cpp               |  1 +
 app/gui/oven_control/ovenstatics.h                 |  1 +
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/gui/oven_control/configinfodlg.cpp b/app/gui/oven_control/configinfodlg.cpp
index a4bc6bf..14a0dea 100644
--- a/app/gui/oven_control/configinfodlg.cpp
+++ b/app/gui/oven_control/configinfodlg.cpp
@@ -7,6 +7,7 @@
 #include "config.h"
 #include "define.h"
 #include "fileprocessor.h"
+#include "ovenstatics.h"
 
 
 
@@ -60,6 +61,7 @@ void ConfigInfoDlg::loadSoftwareInfo(){
     QString strTemp;
     QMap<QString , QString> mapInfos;
     QLabel* label;
+    float firmver =  (float)(OvenStatistics::getInstance()->getFrimwareVersion())/100.0;
 
 
 
@@ -83,6 +85,14 @@ void ConfigInfoDlg::loadSoftwareInfo(){
         label->setText(strTemp);
         ui->gridLayout_info->addWidget(label,i,1);
     }
+    label = new QLabel(this);
+    label ->setText("Firmware Version");
+    ui->gridLayout_info->addWidget(label,MAX_SOFTWARE_INFO_CNT,0);
+    label = new QLabel(this);
+    strTemp.sprintf("%.2f",firmver);
+    label->setText(strTemp);
+    ui->gridLayout_info->addWidget(label,MAX_SOFTWARE_INFO_CNT,1);
+
 }
 
 void ConfigInfoDlg::loadHotlineChefInfo(){
diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h
index 8dfa1fa..caaa11f 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   3
-#define HOTFIX_VER  00
+#define HOTFIX_VER  01
 
 // 0 for normal
 // 1 for premium
diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui
index 96c3b53..3d30329 100644
--- a/app/gui/oven_control/electricmodelsettingwindow.ui
+++ b/app/gui/oven_control/electricmodelsettingwindow.ui
@@ -390,7 +390,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
 QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
-     <string>10단</string>
+     <string>6단 또는 10단</string>
     </property>
     <property name="checkable">
      <bool>true</bool>
diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui
index 7c7a534..dec0293 100644
--- a/app/gui/oven_control/gasmodelsettingwindow.ui
+++ b/app/gui/oven_control/gasmodelsettingwindow.ui
@@ -490,7 +490,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
 QPushButton:pressed, QPushButton::checked, QPushButton:focus{ border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
-     <string>10단 LPG</string>
+     <string>6단 또는 10단 LPG</string>
     </property>
     <property name="checkable">
      <bool>true</bool>
diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp
index cd34a83..3e8a836 100644
--- a/app/gui/oven_control/ovenstatics.cpp
+++ b/app/gui/oven_control/ovenstatics.cpp
@@ -48,6 +48,7 @@ OvenStatistics::OvenStatistics(QObject* parent) :QObject(parent)
     m_bPopupShow = false;
     m_nLastPopupidx = MAX_ERROR_TYPE_CNT;
     m_wndSrvpassdlg = NULL;
+    state.firmware_version = 150;
 
     for(i=0;i<MAX_LOG_SENSOR;i++){
         curSensorValue[i].utemp = 0;
diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h
index 9e8a04c..d9336ae 100644
--- a/app/gui/oven_control/ovenstatics.h
+++ b/app/gui/oven_control/ovenstatics.h
@@ -514,6 +514,7 @@ public:
     uint32_t loadTotalCookingCount(void){return srvdata->loadTotalCookingCount();}
     bool setTotalCookingCount(uint32_t val,bool save = true){return srvdata->setTotalCookingCount(val,save);}
     bool addTotalCookingCount(uint32_t val, bool save = true){return srvdata->addTotalCookingCount(val,save);}
+    uint16_t    getFrimwareVersion(void){return state.firmware_version;}
 
 public slots:
     void onDataChanged();
-- 
2.1.4