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 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); } - 10단 + 6단 또는 10단 true 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); } - 10단 LPG + 6단 또는 10단 LPG true 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;iloadTotalCookingCount();} 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();