diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index 34911b4..ec12451 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 32 +#define MAX_CONFIG_COUNT 39 namespace Define { @@ -45,7 +45,14 @@ namespace Define config_netmask, config_set_download, config_set_upload, - config_invalid = 65535 + config_set_half_energy, + config_set_auto_darkness, + config_set_ilc_cook_temphumi_ready, + config_set_load_ready, + config_duty_wash, + config_loading_door_monitoring, + config_cooking_door_monitoring, + config_invalid = MAX_CONFIG_COUNT }; typedef union _config_item{ @@ -95,9 +102,28 @@ namespace Define config_item netmask; config_item set_download; config_item set_upload; + config_item set_half_energy; + config_item set_auto_darkness; + config_item set_ilc_cook_temphumi_ready; + config_item set_load_ready; + config_item duty_wash; + config_item loading_door_monitoring; + config_item cooking_door_monitoring; + }items; }STRUCT_PACK config_lists; + + enum temp_type{ + temp_type_c=0, + temp_type_f, + }; + + enum time_type{ + time_type_24h = 0; + time_type_12h + }; + const char language_menu[3][20]{ "한국어\0", "中國語\0", @@ -109,10 +135,7 @@ namespace Define "am/pm\0" }; - enum temp_type{ - temp_type_c=0, - temp_type_f, - }; + const char temptype_menu[2][16]{ "섭씨(℃)\0", @@ -135,6 +158,37 @@ namespace Define "잔여시간\0", "타겟시간\0" }; + + const char on_off_menu[2][16]={ + "설정\0", + "설정취소\0" + }; + + const char active_on_off_menu[2][16]={ + "비활성\0", + "활성화\0" + }; + + typedef struct _config_1digit_set{ + char str_unit[8]; + int maxlen; + int min; + int max; + }config_1digit_set; + + const config_1digit_set auto_darkness_dlgset = { + "min\0", + 2, + 1, + 30, + }; + + const config_1digit_set load_ready_dlgset ={ + "min\0", + 2, + 2, + 10, + }; } @@ -164,7 +218,9 @@ class Config : public QObject const uint8_t config_data_type[MAX_CONFIG_COUNT] = { 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, //Settings 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, - 0x02, 0x02, 0x02,0x02, 0x02,0x02, 0x80, 0x80, 0x80, 0x02, 0x02 + 0x02, 0x02, 0x02,0x02, 0x02,0x02, 0x80, 0x80, 0x80, 0x02, 0x02, + 0x80, 0x00, 0x00,0x00, + 0x80, 0x00, 0x00 }; const char config_format_kr[MAX_CONFIG_COUNT][64]={ @@ -200,6 +256,13 @@ class Config : public QObject "%d.%d.%d.%d", //config_netmask, "USB 삽입", //config_set_download, "USB 삽입", //config_set_upload, + "%s", //config_set_half_energy, + "%d", //config_set_auto_darkness, + "%d", //config_set_ilc_cook_temphumi_ready, + "%d", //config_set_load_ready, + "%s", //config_duty_wash, + "%d단계", //config_loading_door_monitoring, + "%d단계" //config_cooking_door_monitoring }; @@ -238,6 +301,13 @@ class Config : public QObject "IP 넷마스크", //config_netmask, "기본설정 다운로드", //30 config_set_download, "기본설정 업로드", //31 end of system config config_set_upload, + "하프에너지", //config_set_half_energy, + "화면 밝기 자동 감소", //config_set_auto_darkness, + "ILC 조리 온습도 대기시간", //config_set_ilc_cook_temphumi_ready, + "적재중 대기 시간", //config_set_load_ready, + "의무 세척과정", //config_duty_wash, + "적재 중 문열림 시간 모니터링",//config_loading_door_monitoring, + "조리 중 문열림 시간 모니터링"//config_cooking_door_monitoring }; QSet m_setFavorite;