에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 596b06d692188cc724d48dd8ef9bee7444e3fbb3

Authored by 고영탁
1 parent 94c1b260b2
Exists in master and in 2 other branches fhd, fhd-demo

V1.3.01 고객사 요청 사항 반영

Showing 6 changed files with 15 additions and 3 deletions   Show diff stats
app/gui/oven_control/configinfodlg.cpp
  Diff comments   View file @596b06d
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 #include "config.h" 7 #include "config.h"
8 #include "define.h" 8 #include "define.h"
9 #include "fileprocessor.h" 9 #include "fileprocessor.h"
  10 +#include "ovenstatics.h"
10 11
11 12
12 13
@@ -60,6 +61,7 @@ void ConfigInfoDlg::loadSoftwareInfo(){ @@ -60,6 +61,7 @@ void ConfigInfoDlg::loadSoftwareInfo(){
60 QString strTemp; 61 QString strTemp;
61 QMap<QString , QString> mapInfos; 62 QMap<QString , QString> mapInfos;
62 QLabel* label; 63 QLabel* label;
  64 + float firmver = (float)(OvenStatistics::getInstance()->getFrimwareVersion())/100.0;
63 65
64 66
65 67
@@ -83,6 +85,14 @@ void ConfigInfoDlg::loadSoftwareInfo(){ @@ -83,6 +85,14 @@ void ConfigInfoDlg::loadSoftwareInfo(){
83 label->setText(strTemp); 85 label->setText(strTemp);
84 ui->gridLayout_info->addWidget(label,i,1); 86 ui->gridLayout_info->addWidget(label,i,1);
85 } 87 }
  88 + label = new QLabel(this);
  89 + label ->setText("Firmware Version");
  90 + ui->gridLayout_info->addWidget(label,MAX_SOFTWARE_INFO_CNT,0);
  91 + label = new QLabel(this);
  92 + strTemp.sprintf("%.2f",firmver);
  93 + label->setText(strTemp);
  94 + ui->gridLayout_info->addWidget(label,MAX_SOFTWARE_INFO_CNT,1);
  95 +
86 } 96 }
87 97
88 void ConfigInfoDlg::loadHotlineChefInfo(){ 98 void ConfigInfoDlg::loadHotlineChefInfo(){
app/gui/oven_control/define.h
  Diff comments   View file @596b06d
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 3 7 #define MINOR_VER 3
8 -#define HOTFIX_VER 00 8 +#define HOTFIX_VER 01
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
app/gui/oven_control/electricmodelsettingwindow.ui
  Diff comments   View file @596b06d
@@ -390,7 +390,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b @@ -390,7 +390,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
390 QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(:/images/button/379_ov.png); }</string> 390 QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(:/images/button/379_ov.png); }</string>
391 </property> 391 </property>
392 <property name="text"> 392 <property name="text">
393 - <string>10단</string> 393 + <string>6단 또는 10단</string>
394 </property> 394 </property>
395 <property name="checkable"> 395 <property name="checkable">
396 <bool>true</bool> 396 <bool>true</bool>
app/gui/oven_control/gasmodelsettingwindow.ui
  Diff comments   View file @596b06d
@@ -490,7 +490,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b @@ -490,7 +490,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
490 QPushButton:pressed, QPushButton::checked, QPushButton:focus{ border-image: url(:/images/button/379_ov.png); }</string> 490 QPushButton:pressed, QPushButton::checked, QPushButton:focus{ border-image: url(:/images/button/379_ov.png); }</string>
491 </property> 491 </property>
492 <property name="text"> 492 <property name="text">
493 - <string>10단 LPG</string> 493 + <string>6단 또는 10단 LPG</string>
494 </property> 494 </property>
495 <property name="checkable"> 495 <property name="checkable">
496 <bool>true</bool> 496 <bool>true</bool>
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @596b06d
@@ -48,6 +48,7 @@ OvenStatistics::OvenStatistics(QObject* parent) :QObject(parent) @@ -48,6 +48,7 @@ OvenStatistics::OvenStatistics(QObject* parent) :QObject(parent)
48 m_bPopupShow = false; 48 m_bPopupShow = false;
49 m_nLastPopupidx = MAX_ERROR_TYPE_CNT; 49 m_nLastPopupidx = MAX_ERROR_TYPE_CNT;
50 m_wndSrvpassdlg = NULL; 50 m_wndSrvpassdlg = NULL;
  51 + state.firmware_version = 150;
51 52
52 for(i=0;i<MAX_LOG_SENSOR;i++){ 53 for(i=0;i<MAX_LOG_SENSOR;i++){
53 curSensorValue[i].utemp = 0; 54 curSensorValue[i].utemp = 0;
app/gui/oven_control/ovenstatics.h
  Diff comments   View file @596b06d
@@ -514,6 +514,7 @@ public: @@ -514,6 +514,7 @@ public:
514 uint32_t loadTotalCookingCount(void){return srvdata->loadTotalCookingCount();} 514 uint32_t loadTotalCookingCount(void){return srvdata->loadTotalCookingCount();}
515 bool setTotalCookingCount(uint32_t val,bool save = true){return srvdata->setTotalCookingCount(val,save);} 515 bool setTotalCookingCount(uint32_t val,bool save = true){return srvdata->setTotalCookingCount(val,save);}
516 bool addTotalCookingCount(uint32_t val, bool save = true){return srvdata->addTotalCookingCount(val,save);} 516 bool addTotalCookingCount(uint32_t val, bool save = true){return srvdata->addTotalCookingCount(val,save);}
  517 + uint16_t getFrimwareVersion(void){return state.firmware_version;}
517 518
518 public slots: 519 public slots:
519 void onDataChanged(); 520 void onDataChanged();