에프에이리눅스 / 1611_0007_prime_oven

Compare View

switch
from
...
to
 
Commits (2)
Showing 2 changed files   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @23647b3
@@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 6 7 #define MINOR_VER 6
8 -#define HOTFIX_VER 2 8 +#define HOTFIX_VER 3
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
12 -#define MODEL_GRADE 0 12 +#define MODEL_GRADE 1
13 13
14 namespace Define 14 namespace Define
15 { 15 {
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @23647b3
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 #include <QtDebug> 2 #include <QtDebug>
3 #include <QApplication> 3 #include <QApplication>
4 #include <QTimer> 4 #include <QTimer>
  5 +#include "config.h"
5 #include "mainwindow.h" 6 #include "mainwindow.h"
6 #include "ovencontroller.h" 7 #include "ovencontroller.h"
7 #include "engineermenuwindow.h" 8 #include "engineermenuwindow.h"
@@ -98,6 +99,7 @@ void OvenStatistics::onDataChanged() @@ -98,6 +99,7 @@ void OvenStatistics::onDataChanged()
98 } 99 }
99 curdoorstate = state.door_state; 100 curdoorstate = state.door_state;
100 } 101 }
  102 + if(cfg->getConfigValue(Define::config_demo_mode).d32 !=0 ) return;
101 103
102 qDebug() << "cooking state " << cookingstate << "model " << cfg->getConfigValue(Define::config_model).d32; 104 qDebug() << "cooking state " << cookingstate << "model " << cfg->getConfigValue(Define::config_model).d32;
103 qDebug() << state.system_error << "and sys mask " << sys_err_mask[cookingstate][cfg->getConfigValue(Define::config_model).d32]; 105 qDebug() << state.system_error << "and sys mask " << sys_err_mask[cookingstate][cfg->getConfigValue(Define::config_model).d32];
@@ -381,6 +383,7 @@ void OvenStatistics::clearNeedErrorClear(){ @@ -381,6 +383,7 @@ void OvenStatistics::clearNeedErrorClear(){
381 } 383 }
382 384
383 void OvenStatistics::oneSecTimerFired(void){ 385 void OvenStatistics::oneSecTimerFired(void){
  386 + if(cfg->getConfigValue(Define::config_demo_mode).d32 !=0 ) return;
384 static int nOneSecCnt=1; 387 static int nOneSecCnt=1;
385 time_t ltime; 388 time_t ltime;
386 389
@@ -746,6 +749,7 @@ void OvenStatistics::onErrorPopupClosed(int erridx){ @@ -746,6 +749,7 @@ void OvenStatistics::onErrorPopupClosed(int erridx){
746 749
747 void OvenStatistics::onCommTimeoutFired() 750 void OvenStatistics::onCommTimeoutFired()
748 { 751 {
  752 + if(cfg->getConfigValue(Define::config_demo_mode).d32 !=0 ) return;
749 QWidget* pParent; 753 QWidget* pParent;
750 int erridx = MAX_ERROR_TYPE_CNT; 754 int erridx = MAX_ERROR_TYPE_CNT;
751 HACCP::error(tr("제어보드 통신에러 발생")); 755 HACCP::error(tr("제어보드 통신에러 발생"));