diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index a6aafab..c60486c 100644 --- a/app/gui/oven_control/config.h +++ b/app/gui/oven_control/config.h @@ -8,7 +8,7 @@ #define STRUCT_PACK __attribute__ ((packed)) -#define MAX_CONFIG_COUNT 45 +#define MAX_CONFIG_COUNT 46 #define MAX_SOFTWARE_INFO_CNT 3 #define MAX_HOTLINE_CHEF_CNT 3 #define MAX_HOTLINE_SERVICE_CNT 2 @@ -62,6 +62,7 @@ namespace Define config_steam_wash, config_demo_mode, config_enter_engineer_mode, + config_model, config_invalid = MAX_CONFIG_COUNT }; @@ -69,6 +70,9 @@ namespace Define uint32_t d32; float f32; struct{ + uint16_t d16[2]; + }d16; + struct{ uint8_t d8_0; uint8_t d8_1; uint8_t d8_2; @@ -125,6 +129,7 @@ namespace Define config_item steam_wash; config_item demo_mode; config_item enter_engineer_mode; + config_item model; }items; }STRUCT_PACK config_lists; @@ -139,6 +144,28 @@ namespace Define time_type_12h }; + enum model_type{ + model_electric_10 = 0, + model_electric_20, + model_electric_24, + model_electric_40, + + model_gas_lpg_10, + model_gas_lpg_20, + model_gas_lpg_24, + model_gas_lpg_40, + + model_gas_lng_10, + model_gas_lng_20, + model_gas_lng_24, + model_gas_lng_40 + }; + + enum rest_time_type{ + rest_time_rest=0, + rest_time_target + }; + const char language_menu[3][20]{ "한국어\0", "中國語\0", @@ -164,10 +191,7 @@ namespace Define "1100g" }; - enum rest_time_type{ - rest_time_rest=0, - rest_time_target - }; + const char rest_time_type_menu[2][16] = { "잔여시간\0", @@ -175,8 +199,8 @@ namespace Define }; const char on_off_menu[2][16]={ - "설정\0", - "설정취소\0" + "설정취소\0", + "설정\0" }; const char active_on_off_menu[2][16]={ @@ -362,6 +386,7 @@ class Config : public QObject public: static Config *getInstance(QObject *parent=0); //static void init(); + bool initConfig(void); bool loadConfig(void); bool saveConfig(void); Define::config_item getConfigValue(Define::ConfigType idx); @@ -378,6 +403,7 @@ public: static QString getDateTimeString(uint32_t sec); static QString getTempString(int cel_temp); + void execConfigWindow(QWidget *parent, Define::ConfigType idx);