diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp index 64aa4d9..4ec7180 100644 --- a/app/gui/oven_control/config.cpp +++ b/app/gui/oven_control/config.cpp @@ -449,6 +449,13 @@ QString Config::getTempString(int cel_temp){ return strTemp; } +QString Config::getProductSerial() +{ + QString strProductSerial; + strProductSerial = DEFAULT_PRODUCT_SERIAL; + return strProductSerial; +} + void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ QDialog *dlg; QString usbPath = ""; diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index 7586a6b..3b236cb 100644 --- a/app/gui/oven_control/config.h +++ b/app/gui/oven_control/config.h @@ -23,6 +23,7 @@ #define SERVICE_INFO_FILE_NAME "/prime/config/service_info.csv" #define RPM_INFO_FILE_NAME "/prime/config/rpm_info.csv" +#define DEFAULT_PRODUCT_SERIAL "0123" static const char rest_time_type_menu[2][16] = { QT_TRANSLATE_NOOP("Config","ėž”ė—Žė‹œę°„\0"), @@ -293,6 +294,7 @@ class Config : public QObject static Config *instance; InputOverwatcher watcher; + QString m_strProductSerial; @@ -438,6 +440,7 @@ public: void removeFavorite(Define::ConfigType idx); static QString getDateTimeString(uint32_t sec); static QString getTempString(int cel_temp); + QString getProductSerial(); diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index 53e81ea..fc78035 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -16,7 +16,7 @@ #define SYS_ERROR_MASK 0x03ff #define COMM_ERROR_MASK 0x001f -#define SENSOR_ERROR_MASK 0x03f3 +#define SENSOR_ERROR_MASK 0x0213 #define STATE_ERROR_MASK 0x0018 #define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff