diff --git a/advanced/esphome/nspanel_esphome_addon_climate_base.yaml b/advanced/esphome/nspanel_esphome_addon_climate_base.yaml index 9428419..d1eebc9 100644 --- a/advanced/esphome/nspanel_esphome_addon_climate_base.yaml +++ b/advanced/esphome/nspanel_esphome_addon_climate_base.yaml @@ -46,7 +46,9 @@ climate: internal: false on_state: - logger.log: Climate state changed - Start - - script.execute: addon_climate_update_page_climate + - script.execute: + id: page_climate + construct_page: false - script.execute: addon_climate_update_page_home - logger.log: Climate state changed - End @@ -100,7 +102,7 @@ script: - lambda: |- id(is_addon_climate_visible) = embedded_climate; - - id: !extend addon_climate_update_page_climate + - id: !extend page_climate then: - lambda: |- if (current_page->state == "climate" and id(is_addon_climate_visible)) diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index 2b9c2db..975a780 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -357,7 +357,7 @@ api: // Update home page ESP_LOGV(TAG, "Update home page"); - page_home->execute(false); + page_home->execute(); ESP_LOGV(TAG, "Current page: %s", current_page->state.c_str()); @@ -1555,7 +1555,7 @@ text_sensor: } else service_call_alarm_control_panel->execute(entity.c_str(), key.c_str(), code_format.c_str(), ""); } - else if (page == "blank") page_blank->execute(true); + else if (page == "blank") page_blank->execute(); else if (page == "boot") { // Detect display mode @@ -1577,7 +1577,7 @@ text_sensor: } // Contruct page boot - page_boot->execute(true); + page_boot->execute(); // Detect TFT version if (doc.containsKey("version")) @@ -2261,194 +2261,162 @@ script: addon_climate_set_climate->execute(page == "climate" and detailed_entity->state == "embedded_climate"); // Call page constructor - if (page == "alarm") page_alarm->execute(true); - else if (page == "blank") page_blank->execute(true); - else if (page == "boot") page_boot->execute(true); - else if (page == "buttonpage01") page_buttonpage->execute(true, 1); - else if (page == "buttonpage02") page_buttonpage->execute(true, 2); - else if (page == "buttonpage03") page_buttonpage->execute(true, 3); - else if (page == "buttonpage04") page_buttonpage->execute(true, 4); - else if (page == "climate") page_climate->execute(true); - else if (page == "confirm") page_confirm->execute(true); - else if (page == "cover") page_cover->execute(true); - else if (page == "entitypage01") page_entitypage->execute(true, 1); - else if (page == "entitypage02") page_entitypage->execute(true, 2); - else if (page == "entitypage03") page_entitypage->execute(true, 3); - else if (page == "entitypage04") page_entitypage->execute(true, 4); - else if (page == "fan") page_fan->execute(true); - else if (page == "home") page_home->execute(true); - else if (page == "keyb_num") page_keyb_num->execute(true); - else if (page == "light") page_light->execute(true); - else if (page == "media_player") page_media_player->execute(true); - else if (page == "notification") page_notification->execute(true); - else if (page == "qrcode") page_qrcode->execute(true); - else if (page == "screensaver") page_screensaver->execute(true); - else if (page == "settings") page_settings->execute(true); - else if (page == "weather01") page_weather->execute(true, 1); - else if (page == "weather02") page_weather->execute(true, 2); - else if (page == "weather03") page_weather->execute(true, 3); - else if (page == "weather04") page_weather->execute(true, 4); - else if (page == "weather05") page_weather->execute(true, 5); + if (page == "alarm") page_alarm->execute(); + else if (page == "blank") page_blank->execute(); + else if (page == "boot") page_boot->execute(); + else if (page == "buttonpage01") page_buttonpage01->execute(); + else if (page == "buttonpage02") page_buttonpage02->execute(); + else if (page == "buttonpage03") page_buttonpage03->execute(); + else if (page == "buttonpage04") page_buttonpage04->execute(); + else if (page == "climate") page_climate->execute(); + else if (page == "confirm") page_confirm->execute(); + else if (page == "cover") page_cover->execute(); + else if (page == "entitypage01") page_entitypage01->execute(); + else if (page == "entitypage02") page_entitypage02->execute(); + else if (page == "entitypage03") page_entitypage03->execute(); + else if (page == "entitypage04") page_entitypage04->execute(); + else if (page == "fan") page_fan->execute(); + else if (page == "home") page_home->execute(); + else if (page == "keyb_num") page_keyb_num->execute(); + else if (page == "light") page_light->execute(); + else if (page == "media_player") page_media_player->execute(); + else if (page == "notification") page_notification->execute(); + else if (page == "qrcode") page_qrcode->execute(); + else if (page == "screensaver") page_screensaver->execute(); + else if (page == "settings") page_settings->execute(); + else if (page == "weather01") page_weather01->execute(); + else if (page == "weather02") page_weather02->execute(); + else if (page == "weather03") page_weather03->execute(); + else if (page == "weather04") page_weather04->execute(); + else if (page == "weather05") page_weather05->execute(); - id: page_alarm mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_alarm"; - if (construct_page) { - ESP_LOGV(TAG, "Construct alarm page"); - if (current_page->state == "alarm") { - // Alarm page - Button's icons - disp1->set_component_text_printf("bt_home_icon", "\uE689"); //mdi:shield-home - disp1->set_component_text_printf("bt_away_icon", "\uE99C"); //mdi:shield-lock - disp1->set_component_text_printf("bt_night_icon", "\uF827"); //mdi:shield-moon - disp1->set_component_text_printf("bt_vacat_icon", "\uE6BA"); //mdi:shield-airplane - disp1->set_component_text_printf("bt_bypass_icon", "\uE77F"); //mdi:shield-half-full - disp1->set_component_text_printf("bt_disarm_icon", "\uE99D"); //mdi:shield-off - } - } + # There's nothing to do here so far - id: page_blank mode: restart - parameters: - construct_page: bool then: - lambda: |- static const char *const TAG = "script.page_blank"; - if (construct_page) { - ESP_LOGV(TAG, "Construct blank page"); - std::string framework = "unknown"; - #ifdef ARDUINO - framework = "arduino"; - #elif defined(USE_ESP_IDF) - framework = "esp-idf"; - #endif - disp1->set_component_text_printf("esp_version", "ESP: ${version}"); // ESPHome version - disp1->set_component_text_printf("framework", framework.c_str()); // ESPHome framework - disp1->send_command_printf("tm_esphome.en=0"); - disp1->send_command_printf("tm_pageid.en=0"); - } + ESP_LOGV(TAG, "Construct blank page"); + std::string framework = "unknown"; + #ifdef ARDUINO + framework = "arduino"; + #elif defined(USE_ESP_IDF) + framework = "esp-idf"; + #endif + disp1->set_component_text_printf("esp_version", "ESP: ${version}"); // ESPHome version + disp1->set_component_text_printf("framework", framework.c_str()); // ESPHome framework + disp1->send_command_printf("tm_esphome.en=0"); + disp1->send_command_printf("tm_pageid.en=0"); - id: page_boot mode: restart - parameters: - construct_page: bool then: - lambda: |- static const char *const TAG = "script.page_boot"; - if (construct_page) { - ESP_LOGV(TAG, "Construct boot page"); - set_brightness->execute(100); + ESP_LOGV(TAG, "Construct boot page"); + set_brightness->execute(100); - std::string framework = "unknown"; - #ifdef ARDUINO - framework = "arduino"; - #elif defined(USE_ESP_IDF) - framework = "esp-idf"; - #endif - disp1->set_component_text_printf("esph_version", "${version}"); // ESPHome version - disp1->set_component_text_printf("framework", framework.c_str()); // ESPHome framework - disp1->show_component("bt_reboot"); - } + std::string framework = "unknown"; + #ifdef ARDUINO + framework = "arduino"; + #elif defined(USE_ESP_IDF) + framework = "esp-idf"; + #endif + disp1->set_component_text_printf("esph_version", "${version}"); // ESPHome version + disp1->set_component_text_printf("framework", framework.c_str()); // ESPHome framework + disp1->show_component("bt_reboot"); - id: page_buttonpage mode: restart parameters: - construct_page: bool page_number: uint then: - - lambda: |- - static const char *const TAG = "script.page_buttonpage"; - if (construct_page) { - ESP_LOGV(TAG, "Construct button page"); - page_index_indicator->execute(page_number, 4); - } + # There's nothing to do here so far + - id: page_buttonpage01 + mode: restart + then: + - script.execute: + id: page_buttonpage + page_number: 1 + - id: page_buttonpage02 + mode: restart + then: + - script.execute: + id: page_buttonpage + page_number: 2 + - id: page_buttonpage03 + mode: restart + then: + - script.execute: + id: page_buttonpage + page_number: 3 + - id: page_buttonpage04 + mode: restart + then: + - script.execute: + id: page_buttonpage + page_number: 4 - id: page_climate mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_climate"; - if (construct_page) { - ESP_LOGV(TAG, "Construct climate page"); - disp1->set_component_text_printf("climate.button01", "%s", "\uEE8D"); //mdi:calendar-sync - disp1->set_component_text_printf("climate.button02", "%s", "\uE069"); //mdi:autorenew - disp1->set_component_text_printf("climate.button03", "%s", "\uE237"); //mdi:fire - disp1->set_component_text_printf("climate.button04", "%s", "\uE716"); //mdi:snowflake - disp1->set_component_text_printf("climate.button05", "%s", "\uE58D"); //mdi:water-percent - disp1->set_component_text_printf("climate.button06", "%s", "\uE20F"); //mdi:fan - disp1->set_component_text_printf("climate.button07", "%s", "\uE424"); //mdi:power - } - addon_climate_update_page_climate->execute(); + # There's nothing to do here so far - id: page_confirm mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_confirm"; - if (construct_page) { - ESP_LOGV(TAG, "Construct confirm page"); - } + # There's nothing to do here so far - id: page_cover mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_cover"; - if (construct_page) { - ESP_LOGV(TAG, "Construct cover page"); - disp1->set_component_text_printf("cover.cover_stop", "%s", "\uE666"); //mdi:stop-circle-outline - // In the future this will be dynamically contructed based on the device_class - disp1->set_component_text_printf("cover.cover_open", "%s", "\uF11D"); //mdi:window-shutter-open - disp1->set_component_text_printf("cover.cover_close", "%s", "\uF11B"); //mdi:window-shutter - } + # There's nothing to do here so far - id: page_entitypage mode: restart parameters: - construct_page: bool page_number: uint then: - - lambda: |- - static const char *const TAG = "script.page_entitypage"; - if (construct_page) { - ESP_LOGV(TAG, "Construct entity page"); - page_index_indicator->execute(page_number, 4); - } + # There's nothing to do here so far + - id: page_entitypage01 + mode: restart + then: + - script.execute: + id: page_entitypage + page_number: 1 + - id: page_entitypage02 + mode: restart + then: + - script.execute: + id: page_entitypage + page_number: 2 + - id: page_entitypage03 + mode: restart + then: + - script.execute: + id: page_entitypage + page_number: 3 + - id: page_entitypage04 + mode: restart + then: + - script.execute: + id: page_entitypage + page_number: 4 - id: page_fan mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_fan"; - if (construct_page) { - ESP_LOGV(TAG, "Construct fan page"); - disp1->set_component_text_printf("fan.button_on", "%s", "\uE20F"); //mdi:fan - disp1->set_component_text_printf("fan.button_off", "%s", "\uE81C"); //mdi:fan-off - disp1->set_component_text_printf("fan.button_up", "%s", "\uF46D"); //mdi:fan-chevron-up - disp1->set_component_text_printf("fan.button_down", "%s", "\uF46C"); //mdi:fan-chevron-down - } + # There's nothing to do here so far - id: page_home mode: restart - parameters: - construct_page: bool then: - lambda: |- static const char *const TAG = "script.page_home"; - if (construct_page) { - ESP_LOGV(TAG, "Construct home page"); - } if (current_page->state == "home") { // Is home page visible? ESP_LOGV(TAG, "Update home page"); refresh_relays->execute(); @@ -2461,78 +2429,35 @@ script: - id: page_keyb_num mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_keyb_num"; - if (construct_page) { - ESP_LOGV(TAG, "Construct keyb_num page"); - disp1->set_component_text_printf("keyb_num.bview", "%s", "\uE207"); //mdi:eye - disp1->set_component_text_printf("keyb_num.bclose", "%s", "\uE158"); //mdi:close-circle - disp1->set_component_text_printf("keyb_num.bclear", "%s", "\uE641"); //mdi:eraser-variant - disp1->set_component_text_printf("keyb_num.benter", "%s", "\uE12B"); //mdi:check - } + # There's nothing to do here so far - id: page_light mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_light"; - if (construct_page) { - ESP_LOGV(TAG, "Construct light page"); - } + # There's nothing to do here so far - id: page_media_player mode: restart - parameters: - construct_page: bool then: - - logger.log: Page media_player - - lambda: |- - static const char *const TAG = "script.page_media_player"; - if (construct_page) { - ESP_LOGV(TAG, "Construct media_player page"); - disp1->set_component_text_printf("bt_on_off", "%s", "\uE424"); //mdi:power - disp1->set_component_text_printf("bt_prev", "%s", "\uE4AD"); //mdi:skip-previous - disp1->set_component_text_printf("bt_next", "%s", "\uE4AC"); //mdi:skip-next - disp1->set_component_text_printf("bt_play_pause", "%s", "\uE40D"); //mdi:play-pause - //disp1->set_component_text_printf("bt_stop", "%s", "\uE4DA"); //mdi:stop - disp1->set_component_text_printf("bt_mute", "%s", "\uE75E"); //mdi:volume-mute - disp1->set_component_text_printf("bt_vol_down", "%s", "\uE75D"); //mdi:volume-minus - disp1->set_component_text_printf("bt_vol_up", "%s", "\uE75C"); //mdi:volume-plus - } + # There's nothing to do here so far - id: page_notification mode: restart - parameters: - construct_page: bool then: - lambda: |- static const char *const TAG = "script.page_notification"; - if (construct_page) { - ESP_LOGV(TAG, "Construct notification page"); - disp1->set_component_text_printf("notification.notifi_label", "%s", notification_label->state.c_str()); - display_wrapped_text->execute("notification.notifi_text01", notification_text->state.c_str(), id(display_mode) == 2 ? 23 : 32); - } + ESP_LOGV(TAG, "Updating notification page"); + disp1->set_component_text_printf("notification.notifi_label", "%s", notification_label->state.c_str()); + display_wrapped_text->execute("notification.notifi_text01", notification_text->state.c_str(), id(display_mode) == 2 ? 23 : 32); - id: page_qrcode mode: restart - parameters: - construct_page: bool then: - - lambda: |- - static const char *const TAG = "script.page_qrcode"; - if (construct_page) { - ESP_LOGV(TAG, "Construct qrcode page"); - } + # There's nothing to do here so far - id: page_screensaver mode: restart - parameters: - construct_page: bool then: - lambda: |- static const char *const TAG = "script.page_screensaver"; @@ -2546,9 +2471,6 @@ script: return 0u; // Return 0 (home page) if not found }; - if (construct_page) { - ESP_LOGV(TAG, "Construct screensaver page"); - } if (current_page->state == "screensaver") { // Is screensaver page visible? ESP_LOGV(TAG, "Update screensaver page"); disp1->set_component_value("orign", pageIndex(wakeup_page_name->state)); @@ -2556,49 +2478,50 @@ script: - id: page_settings mode: restart - parameters: - construct_page: bool then: - lambda: |- static const char *const TAG = "script.page_settings"; - if (construct_page) { - ESP_LOGV(TAG, "Construct settings page"); - //disp1->set_component_text_printf("bt_sleep", "%s", (id(sleep_mode).state) ? "\uEA19" : "\uEA18"); //mdi:toggle-switch-outline or mdi:toggle-switch-off-outline - disp1->hide_component("lbl_sleep"); - disp1->hide_component("bt_sleep"); - } + ESP_LOGV(TAG, "Construct settings page"); + //disp1->set_component_text_printf("bt_sleep", "%s", (id(sleep_mode).state) ? "\uEA19" : "\uEA18"); //mdi:toggle-switch-outline or mdi:toggle-switch-off-outline + disp1->hide_component("lbl_sleep"); + disp1->hide_component("bt_sleep"); - id: page_weather mode: restart parameters: - construct_page: bool page_number: uint then: - - lambda: |- - static const char *const TAG = "script.page_weather"; - if (construct_page) { - ESP_LOGV(TAG, "Construct weather page"); - page_index_indicator->execute(page_number, 5); - } - - - id: page_index_indicator + # There's nothing to do here so far + - id: page_weather01 mode: restart - parameters: - page_number: uint - page_total: uint then: - - lambda: |- - static const char *const TAG = "script.page_index_indicator"; - ESP_LOGV(TAG, "Show page number indicator"); - std::string indicator = ""; - for (int i = 0; i < page_total; ++i) { - if (i == page_number - 1) { - indicator += "●"; - } else { - indicator += "○"; - } - } - disp1->set_component_text_printf("page_index", "%s", indicator.c_str()); + - script.execute: + id: page_weather + page_number: 1 + - id: page_weather02 + mode: restart + then: + - script.execute: + id: page_weather + page_number: 2 + - id: page_weather03 + mode: restart + then: + - script.execute: + id: page_weather + page_number: 3 + - id: page_weather04 + mode: restart + then: + - script.execute: + id: page_weather + page_number: 4 + - id: page_weather05 + mode: restart + then: + - script.execute: + id: page_weather + page_number: 5 - id: exit_reparse mode: restart @@ -2626,7 +2549,7 @@ script: if (current_page->state == "boot") { disp1->send_command_printf("tm_esphome.en=0"); disp1->send_command_printf("tm_pageid.en=0"); - page_boot->execute(true); + page_boot->execute(); } timer_reset_all->execute("boot"); - lambda: |- @@ -2724,12 +2647,6 @@ script: - lambda: |- ESP_LOGV("script.addon_climate_set_climate", "Check for addon_climate"); ESP_LOGV("script.addon_climate_set_climate", "embedded_climate: %s", embedded_climate ? "True" : "False"); - - id: addon_climate_update_page_climate - mode: restart - then: - # Reserved for Add-on Climate - - lambda: |- - ESP_LOGV("script.addon_climate_update_page_climate", "Check for addon_climate"); - id: addon_climate_set_climate_friendly_name mode: restart parameters: @@ -2771,10 +2688,18 @@ script: page_alarm->stop(); page_blank->stop(); page_boot->stop(); + page_buttonpage01->stop(); + page_buttonpage02->stop(); + page_buttonpage03->stop(); + page_buttonpage04->stop(); page_buttonpage->stop(); page_climate->stop(); page_confirm->stop(); page_cover->stop(); + page_entitypage01->stop(); + page_entitypage02->stop(); + page_entitypage03->stop(); + page_entitypage04->stop(); page_entitypage->stop(); page_fan->stop(); page_home->stop(); @@ -2785,8 +2710,12 @@ script: page_qrcode->stop(); page_screensaver->stop(); page_settings->stop(); + page_weather01->stop(); + page_weather02->stop(); + page_weather03->stop(); + page_weather04->stop(); + page_weather05->stop(); page_weather->stop(); - page_index_indicator->stop(); exit_reparse->stop(); boot_sequence->stop(); notification_clear->stop(); @@ -2794,6 +2723,5 @@ script: addon_climate_service_call->stop(); addon_climate_update_page_home->stop(); addon_climate_set_climate->stop(); - addon_climate_update_page_climate->stop(); addon_climate_set_climate_friendly_name->stop(); ESP_LOGD(TAG, "Finished"); diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index 135e393..23fa4ca 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 4e19fcb..349dc13 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ diff --git a/advanced/hmi/nspanel_CJK_eu_code/alarm.txt b/advanced/hmi/nspanel_CJK_eu_code/alarm.txt index da0427b..a38a016 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/alarm.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/alarm.txt @@ -140,8 +140,8 @@ Text bt_home_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_away_icon Attributes @@ -150,8 +150,8 @@ Text bt_away_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_night_icon Attributes @@ -160,8 +160,8 @@ Text bt_night_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : ï § + Max. Text Size : 3 Text bt_vacat_icon Attributes @@ -170,8 +170,8 @@ Text bt_vacat_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_bypass_icon Attributes @@ -180,8 +180,8 @@ Text bt_bypass_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_disarm_icon Attributes @@ -190,8 +190,8 @@ Text bt_disarm_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Picture bt_home_pic Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt index e752ee9..90c84e9 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt index f770b1b..932bc71 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt index 3e32375..3f8d73c 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt index 9899fb9..4ae9d31 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/climate.txt b/advanced/hmi/nspanel_CJK_eu_code/climate.txt index df3e5d3..c2f8507 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/climate.txt @@ -259,8 +259,8 @@ Text button01 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -280,8 +280,8 @@ Text button02 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -301,8 +301,8 @@ Text button03 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -322,8 +322,8 @@ Text button04 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -343,8 +343,8 @@ Text button05 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -364,8 +364,8 @@ Text button06 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -385,8 +385,8 @@ Text button07 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_CJK_eu_code/cover.txt b/advanced/hmi/nspanel_CJK_eu_code/cover.txt index efd0a33..76933eb 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/cover.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/cover.txt @@ -120,7 +120,7 @@ Button cover_open Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events @@ -139,7 +139,7 @@ Button cover_close Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text : ï„› Max. Text Size : 3 Events @@ -158,7 +158,7 @@ Button cover_stop Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_CJK_eu_code/entitypage01.txt b/advanced/hmi/nspanel_CJK_eu_code/entitypage01.txt index a4fbaf2..1de4dc5 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/entitypage01.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/entitypage01.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/entitypage02.txt b/advanced/hmi/nspanel_CJK_eu_code/entitypage02.txt index dea52e9..3799dd6 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/entitypage02.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/entitypage02.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/entitypage03.txt b/advanced/hmi/nspanel_CJK_eu_code/entitypage03.txt index ce50678..c3a19d0 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/entitypage03.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/entitypage03.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/entitypage04.txt b/advanced/hmi/nspanel_CJK_eu_code/entitypage04.txt index 6b443d8..fce97b5 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/entitypage04.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/entitypage04.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/fan.txt b/advanced/hmi/nspanel_CJK_eu_code/fan.txt index 502de32..22b6eb3 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/fan.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/fan.txt @@ -111,8 +111,8 @@ Button button_up Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : ï‘­ + Max. Text Size : 3 Events Touch Press Event @@ -150,8 +150,8 @@ Button button_on Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -192,8 +192,8 @@ Button button_down Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -231,8 +231,8 @@ Button button_off Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : î œ + Max. Text Size : 3 Events Touch Press Event diff --git a/advanced/hmi/nspanel_CJK_eu_code/keyb_num.txt b/advanced/hmi/nspanel_CJK_eu_code/keyb_num.txt index 7fa710e..d9a1329 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/keyb_num.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/keyb_num.txt @@ -106,7 +106,7 @@ Button bclose Send Component ID: on press and release State : unpressed Text : î…˜ - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Release Event @@ -231,8 +231,8 @@ Button bclear Dragging : 0 Send Component ID: on press State : unpressed - Text : < - Max. Text Size : 5 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -259,7 +259,7 @@ Button benter Dragging : 0 Send Component ID: on press State : unpressed - Text : OK + Text : î„« Max. Text Size : 3 Events @@ -279,7 +279,7 @@ Button bview Dragging : 0 Send Component ID: on press and release State : unpressed - Text : O + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_CJK_eu_code/media_player.txt b/advanced/hmi/nspanel_CJK_eu_code/media_player.txt index 04cd684..ef30119 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/media_player.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/media_player.txt @@ -96,7 +96,7 @@ Text bt_vol_down Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -122,7 +122,7 @@ Text bt_vol_up Dragging : 0 Send Component ID : on press Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -148,7 +148,7 @@ Text bt_mute Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -215,8 +215,8 @@ Text bt_prev Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’­ + Max. Text Size : 3 Events Touch Release Event @@ -235,8 +235,8 @@ Text bt_play_pause Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -254,8 +254,8 @@ Text bt_next Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’¬ + Max. Text Size : 3 Events Touch Release Event @@ -273,8 +273,8 @@ Text bt_on_off Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_CJK_eu_code/weather01.txt b/advanced/hmi/nspanel_CJK_eu_code/weather01.txt index dccaf8e..31bea1a 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/weather01.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/weather01.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/weather02.txt b/advanced/hmi/nspanel_CJK_eu_code/weather02.txt index faef826..30b44ed 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/weather02.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/weather02.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/weather03.txt b/advanced/hmi/nspanel_CJK_eu_code/weather03.txt index 580496d..bb0949d 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/weather03.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/weather03.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/weather04.txt b/advanced/hmi/nspanel_CJK_eu_code/weather04.txt index 5baa256..8d2d15d 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/weather04.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/weather04.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○●○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_eu_code/weather05.txt b/advanced/hmi/nspanel_CJK_eu_code/weather05.txt index e925e03..22dce2b 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/weather05.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/weather05.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○○● + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index 561b1b3..4933ca9 100644 Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index 36241e9..2c023f3 100644 Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_code/alarm.txt b/advanced/hmi/nspanel_CJK_us_code/alarm.txt index 71da1d4..b0597d3 100644 --- a/advanced/hmi/nspanel_CJK_us_code/alarm.txt +++ b/advanced/hmi/nspanel_CJK_us_code/alarm.txt @@ -147,8 +147,8 @@ Text bt_home_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_away_icon Attributes @@ -157,8 +157,8 @@ Text bt_away_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_night_icon Attributes @@ -167,8 +167,8 @@ Text bt_night_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : ï § + Max. Text Size : 3 Text bt_vacat_icon Attributes @@ -177,8 +177,8 @@ Text bt_vacat_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_bypass_icon Attributes @@ -187,8 +187,8 @@ Text bt_bypass_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_disarm_icon Attributes @@ -197,8 +197,8 @@ Text bt_disarm_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Picture bt_home_pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt index e752ee9..90c84e9 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt index f770b1b..932bc71 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt index 3e32375..3f8d73c 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt index 9899fb9..4ae9d31 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/climate.txt b/advanced/hmi/nspanel_CJK_us_code/climate.txt index f207ba5..84c5d2d 100644 --- a/advanced/hmi/nspanel_CJK_us_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_code/climate.txt @@ -259,8 +259,8 @@ Text button01 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -280,8 +280,8 @@ Text button02 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -301,8 +301,8 @@ Text button03 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -322,8 +322,8 @@ Text button04 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -343,8 +343,8 @@ Text button05 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -364,8 +364,8 @@ Text button06 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -385,8 +385,8 @@ Text button07 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_CJK_us_code/cover.txt b/advanced/hmi/nspanel_CJK_us_code/cover.txt index 401c0f4..f146380 100644 --- a/advanced/hmi/nspanel_CJK_us_code/cover.txt +++ b/advanced/hmi/nspanel_CJK_us_code/cover.txt @@ -120,7 +120,7 @@ Button cover_open Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events @@ -139,7 +139,7 @@ Button cover_close Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text : ï„› Max. Text Size : 3 Events @@ -158,7 +158,7 @@ Button cover_stop Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_CJK_us_code/entitypage01.txt b/advanced/hmi/nspanel_CJK_us_code/entitypage01.txt index a4fbaf2..1de4dc5 100644 --- a/advanced/hmi/nspanel_CJK_us_code/entitypage01.txt +++ b/advanced/hmi/nspanel_CJK_us_code/entitypage01.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/entitypage02.txt b/advanced/hmi/nspanel_CJK_us_code/entitypage02.txt index dea52e9..3799dd6 100644 --- a/advanced/hmi/nspanel_CJK_us_code/entitypage02.txt +++ b/advanced/hmi/nspanel_CJK_us_code/entitypage02.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/entitypage03.txt b/advanced/hmi/nspanel_CJK_us_code/entitypage03.txt index e0492c0..36eec24 100644 --- a/advanced/hmi/nspanel_CJK_us_code/entitypage03.txt +++ b/advanced/hmi/nspanel_CJK_us_code/entitypage03.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/entitypage04.txt b/advanced/hmi/nspanel_CJK_us_code/entitypage04.txt index 6b443d8..fce97b5 100644 --- a/advanced/hmi/nspanel_CJK_us_code/entitypage04.txt +++ b/advanced/hmi/nspanel_CJK_us_code/entitypage04.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/fan.txt b/advanced/hmi/nspanel_CJK_us_code/fan.txt index 502de32..22b6eb3 100644 --- a/advanced/hmi/nspanel_CJK_us_code/fan.txt +++ b/advanced/hmi/nspanel_CJK_us_code/fan.txt @@ -111,8 +111,8 @@ Button button_up Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : ï‘­ + Max. Text Size : 3 Events Touch Press Event @@ -150,8 +150,8 @@ Button button_on Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -192,8 +192,8 @@ Button button_down Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -231,8 +231,8 @@ Button button_off Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : î œ + Max. Text Size : 3 Events Touch Press Event diff --git a/advanced/hmi/nspanel_CJK_us_code/keyb_num.txt b/advanced/hmi/nspanel_CJK_us_code/keyb_num.txt index 88c67c1..3f63493 100644 --- a/advanced/hmi/nspanel_CJK_us_code/keyb_num.txt +++ b/advanced/hmi/nspanel_CJK_us_code/keyb_num.txt @@ -231,8 +231,8 @@ Button bclear Dragging : 0 Send Component ID: on press and release State : unpressed - Text : < - Max. Text Size : 5 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -259,7 +259,7 @@ Button benter Dragging : 0 Send Component ID: on press and release State : unpressed - Text : OK + Text : î„« Max. Text Size : 3 Events @@ -273,7 +273,7 @@ Button bview Dragging : 0 Send Component ID: on press and release State : unpressed - Text : O + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_CJK_us_code/media_player.txt b/advanced/hmi/nspanel_CJK_us_code/media_player.txt index a162997..b3248ab 100644 --- a/advanced/hmi/nspanel_CJK_us_code/media_player.txt +++ b/advanced/hmi/nspanel_CJK_us_code/media_player.txt @@ -96,7 +96,7 @@ Text bt_vol_down Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -122,7 +122,7 @@ Text bt_vol_up Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -148,7 +148,7 @@ Text bt_mute Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -215,8 +215,8 @@ Text bt_prev Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’­ + Max. Text Size : 3 Events Touch Release Event @@ -234,8 +234,8 @@ Text bt_play_pause Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -253,8 +253,8 @@ Text bt_next Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’¬ + Max. Text Size : 3 Events Touch Release Event @@ -272,8 +272,8 @@ Text bt_on_off Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_CJK_us_code/weather01.txt b/advanced/hmi/nspanel_CJK_us_code/weather01.txt index dccaf8e..31bea1a 100644 --- a/advanced/hmi/nspanel_CJK_us_code/weather01.txt +++ b/advanced/hmi/nspanel_CJK_us_code/weather01.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/weather02.txt b/advanced/hmi/nspanel_CJK_us_code/weather02.txt index faef826..30b44ed 100644 --- a/advanced/hmi/nspanel_CJK_us_code/weather02.txt +++ b/advanced/hmi/nspanel_CJK_us_code/weather02.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/weather03.txt b/advanced/hmi/nspanel_CJK_us_code/weather03.txt index 580496d..bb0949d 100644 --- a/advanced/hmi/nspanel_CJK_us_code/weather03.txt +++ b/advanced/hmi/nspanel_CJK_us_code/weather03.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/weather04.txt b/advanced/hmi/nspanel_CJK_us_code/weather04.txt index 5baa256..8d2d15d 100644 --- a/advanced/hmi/nspanel_CJK_us_code/weather04.txt +++ b/advanced/hmi/nspanel_CJK_us_code/weather04.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○●○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_code/weather05.txt b/advanced/hmi/nspanel_CJK_us_code/weather05.txt index e925e03..22dce2b 100644 --- a/advanced/hmi/nspanel_CJK_us_code/weather05.txt +++ b/advanced/hmi/nspanel_CJK_us_code/weather05.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○○● + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index 5d0560e..6fd7090 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft index fbbed55..76234c4 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/alarm.txt b/advanced/hmi/nspanel_CJK_us_land_code/alarm.txt index da0427b..a38a016 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/alarm.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/alarm.txt @@ -140,8 +140,8 @@ Text bt_home_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_away_icon Attributes @@ -150,8 +150,8 @@ Text bt_away_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_night_icon Attributes @@ -160,8 +160,8 @@ Text bt_night_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : ï § + Max. Text Size : 3 Text bt_vacat_icon Attributes @@ -170,8 +170,8 @@ Text bt_vacat_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_bypass_icon Attributes @@ -180,8 +180,8 @@ Text bt_bypass_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_disarm_icon Attributes @@ -190,8 +190,8 @@ Text bt_disarm_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Picture bt_home_pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt index e752ee9..90c84e9 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt index f770b1b..932bc71 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt index 3e32375..3f8d73c 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt index 9899fb9..4ae9d31 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/climate.txt b/advanced/hmi/nspanel_CJK_us_land_code/climate.txt index df3e5d3..c2f8507 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/climate.txt @@ -259,8 +259,8 @@ Text button01 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -280,8 +280,8 @@ Text button02 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -301,8 +301,8 @@ Text button03 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -322,8 +322,8 @@ Text button04 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -343,8 +343,8 @@ Text button05 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -364,8 +364,8 @@ Text button06 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -385,8 +385,8 @@ Text button07 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_CJK_us_land_code/cover.txt b/advanced/hmi/nspanel_CJK_us_land_code/cover.txt index efd0a33..76933eb 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/cover.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/cover.txt @@ -120,7 +120,7 @@ Button cover_open Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events @@ -139,7 +139,7 @@ Button cover_close Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text : ï„› Max. Text Size : 3 Events @@ -158,7 +158,7 @@ Button cover_stop Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_CJK_us_land_code/entitypage01.txt b/advanced/hmi/nspanel_CJK_us_land_code/entitypage01.txt index a4fbaf2..1de4dc5 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/entitypage01.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/entitypage01.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/entitypage02.txt b/advanced/hmi/nspanel_CJK_us_land_code/entitypage02.txt index dea52e9..3799dd6 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/entitypage02.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/entitypage02.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/entitypage03.txt b/advanced/hmi/nspanel_CJK_us_land_code/entitypage03.txt index ce50678..c3a19d0 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/entitypage03.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/entitypage03.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/entitypage04.txt b/advanced/hmi/nspanel_CJK_us_land_code/entitypage04.txt index 6b443d8..fce97b5 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/entitypage04.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/entitypage04.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/fan.txt b/advanced/hmi/nspanel_CJK_us_land_code/fan.txt index 502de32..22b6eb3 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/fan.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/fan.txt @@ -111,8 +111,8 @@ Button button_up Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : ï‘­ + Max. Text Size : 3 Events Touch Press Event @@ -150,8 +150,8 @@ Button button_on Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -192,8 +192,8 @@ Button button_down Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -231,8 +231,8 @@ Button button_off Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : î œ + Max. Text Size : 3 Events Touch Press Event diff --git a/advanced/hmi/nspanel_CJK_us_land_code/keyb_num.txt b/advanced/hmi/nspanel_CJK_us_land_code/keyb_num.txt index 7fa710e..d9a1329 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/keyb_num.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/keyb_num.txt @@ -106,7 +106,7 @@ Button bclose Send Component ID: on press and release State : unpressed Text : î…˜ - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Release Event @@ -231,8 +231,8 @@ Button bclear Dragging : 0 Send Component ID: on press State : unpressed - Text : < - Max. Text Size : 5 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -259,7 +259,7 @@ Button benter Dragging : 0 Send Component ID: on press State : unpressed - Text : OK + Text : î„« Max. Text Size : 3 Events @@ -279,7 +279,7 @@ Button bview Dragging : 0 Send Component ID: on press and release State : unpressed - Text : O + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_CJK_us_land_code/media_player.txt b/advanced/hmi/nspanel_CJK_us_land_code/media_player.txt index 04cd684..ef30119 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/media_player.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/media_player.txt @@ -96,7 +96,7 @@ Text bt_vol_down Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -122,7 +122,7 @@ Text bt_vol_up Dragging : 0 Send Component ID : on press Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -148,7 +148,7 @@ Text bt_mute Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -215,8 +215,8 @@ Text bt_prev Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’­ + Max. Text Size : 3 Events Touch Release Event @@ -235,8 +235,8 @@ Text bt_play_pause Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -254,8 +254,8 @@ Text bt_next Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’¬ + Max. Text Size : 3 Events Touch Release Event @@ -273,8 +273,8 @@ Text bt_on_off Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_CJK_us_land_code/weather01.txt b/advanced/hmi/nspanel_CJK_us_land_code/weather01.txt index dccaf8e..31bea1a 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/weather01.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/weather01.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/weather02.txt b/advanced/hmi/nspanel_CJK_us_land_code/weather02.txt index faef826..30b44ed 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/weather02.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/weather02.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/weather03.txt b/advanced/hmi/nspanel_CJK_us_land_code/weather03.txt index 580496d..bb0949d 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/weather03.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/weather03.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/weather04.txt b/advanced/hmi/nspanel_CJK_us_land_code/weather04.txt index 5baa256..8d2d15d 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/weather04.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/weather04.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○●○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land_code/weather05.txt b/advanced/hmi/nspanel_CJK_us_land_code/weather05.txt index e925e03..22dce2b 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/weather05.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/weather05.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○○● + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index 3c3f14f..fd985c0 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/alarm.txt b/advanced/hmi/nspanel_eu_code/alarm.txt index da0427b..a38a016 100644 --- a/advanced/hmi/nspanel_eu_code/alarm.txt +++ b/advanced/hmi/nspanel_eu_code/alarm.txt @@ -140,8 +140,8 @@ Text bt_home_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_away_icon Attributes @@ -150,8 +150,8 @@ Text bt_away_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_night_icon Attributes @@ -160,8 +160,8 @@ Text bt_night_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : ï § + Max. Text Size : 3 Text bt_vacat_icon Attributes @@ -170,8 +170,8 @@ Text bt_vacat_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_bypass_icon Attributes @@ -180,8 +180,8 @@ Text bt_bypass_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_disarm_icon Attributes @@ -190,8 +190,8 @@ Text bt_disarm_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Picture bt_home_pic Attributes diff --git a/advanced/hmi/nspanel_eu_code/buttonpage01.txt b/advanced/hmi/nspanel_eu_code/buttonpage01.txt index e752ee9..90c84e9 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage01.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_eu_code/buttonpage02.txt b/advanced/hmi/nspanel_eu_code/buttonpage02.txt index f770b1b..932bc71 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage02.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_eu_code/buttonpage03.txt b/advanced/hmi/nspanel_eu_code/buttonpage03.txt index 3e32375..3f8d73c 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage03.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_eu_code/buttonpage04.txt b/advanced/hmi/nspanel_eu_code/buttonpage04.txt index 9899fb9..4ae9d31 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage04.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_eu_code/climate.txt b/advanced/hmi/nspanel_eu_code/climate.txt index df3e5d3..c2f8507 100644 --- a/advanced/hmi/nspanel_eu_code/climate.txt +++ b/advanced/hmi/nspanel_eu_code/climate.txt @@ -259,8 +259,8 @@ Text button01 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -280,8 +280,8 @@ Text button02 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -301,8 +301,8 @@ Text button03 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -322,8 +322,8 @@ Text button04 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -343,8 +343,8 @@ Text button05 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -364,8 +364,8 @@ Text button06 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -385,8 +385,8 @@ Text button07 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_eu_code/cover.txt b/advanced/hmi/nspanel_eu_code/cover.txt index efd0a33..76933eb 100644 --- a/advanced/hmi/nspanel_eu_code/cover.txt +++ b/advanced/hmi/nspanel_eu_code/cover.txt @@ -120,7 +120,7 @@ Button cover_open Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events @@ -139,7 +139,7 @@ Button cover_close Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text : ï„› Max. Text Size : 3 Events @@ -158,7 +158,7 @@ Button cover_stop Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_eu_code/entitypage01.txt b/advanced/hmi/nspanel_eu_code/entitypage01.txt index a4fbaf2..1de4dc5 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage01.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage01.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_eu_code/entitypage02.txt b/advanced/hmi/nspanel_eu_code/entitypage02.txt index dea52e9..3799dd6 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage02.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage02.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_eu_code/entitypage03.txt b/advanced/hmi/nspanel_eu_code/entitypage03.txt index ce50678..c3a19d0 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage03.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage03.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_eu_code/entitypage04.txt b/advanced/hmi/nspanel_eu_code/entitypage04.txt index 6b443d8..fce97b5 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage04.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage04.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_eu_code/keyb_num.txt b/advanced/hmi/nspanel_eu_code/keyb_num.txt index 7fa710e..d9a1329 100644 --- a/advanced/hmi/nspanel_eu_code/keyb_num.txt +++ b/advanced/hmi/nspanel_eu_code/keyb_num.txt @@ -106,7 +106,7 @@ Button bclose Send Component ID: on press and release State : unpressed Text : î…˜ - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Release Event @@ -231,8 +231,8 @@ Button bclear Dragging : 0 Send Component ID: on press State : unpressed - Text : < - Max. Text Size : 5 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -259,7 +259,7 @@ Button benter Dragging : 0 Send Component ID: on press State : unpressed - Text : OK + Text : î„« Max. Text Size : 3 Events @@ -279,7 +279,7 @@ Button bview Dragging : 0 Send Component ID: on press and release State : unpressed - Text : O + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_eu_code/media_player.txt b/advanced/hmi/nspanel_eu_code/media_player.txt index 04cd684..ef30119 100644 --- a/advanced/hmi/nspanel_eu_code/media_player.txt +++ b/advanced/hmi/nspanel_eu_code/media_player.txt @@ -96,7 +96,7 @@ Text bt_vol_down Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -122,7 +122,7 @@ Text bt_vol_up Dragging : 0 Send Component ID : on press Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -148,7 +148,7 @@ Text bt_mute Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -215,8 +215,8 @@ Text bt_prev Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’­ + Max. Text Size : 3 Events Touch Release Event @@ -235,8 +235,8 @@ Text bt_play_pause Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -254,8 +254,8 @@ Text bt_next Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’¬ + Max. Text Size : 3 Events Touch Release Event @@ -273,8 +273,8 @@ Text bt_on_off Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_eu_code/weather01.txt b/advanced/hmi/nspanel_eu_code/weather01.txt index dccaf8e..31bea1a 100644 --- a/advanced/hmi/nspanel_eu_code/weather01.txt +++ b/advanced/hmi/nspanel_eu_code/weather01.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_eu_code/weather02.txt b/advanced/hmi/nspanel_eu_code/weather02.txt index faef826..30b44ed 100644 --- a/advanced/hmi/nspanel_eu_code/weather02.txt +++ b/advanced/hmi/nspanel_eu_code/weather02.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_eu_code/weather03.txt b/advanced/hmi/nspanel_eu_code/weather03.txt index 580496d..bb0949d 100644 --- a/advanced/hmi/nspanel_eu_code/weather03.txt +++ b/advanced/hmi/nspanel_eu_code/weather03.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_eu_code/weather04.txt b/advanced/hmi/nspanel_eu_code/weather04.txt index 5baa256..8d2d15d 100644 --- a/advanced/hmi/nspanel_eu_code/weather04.txt +++ b/advanced/hmi/nspanel_eu_code/weather04.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○●○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_eu_code/weather05.txt b/advanced/hmi/nspanel_eu_code/weather05.txt index e925e03..22dce2b 100644 --- a/advanced/hmi/nspanel_eu_code/weather05.txt +++ b/advanced/hmi/nspanel_eu_code/weather05.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○○● + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 3fe8bcf..390754a 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/Program.s.txt b/advanced/hmi/nspanel_us_code/Program.s.txt index c36033c..a9e675d 100644 --- a/advanced/hmi/nspanel_us_code/Program.s.txt +++ b/advanced/hmi/nspanel_us_code/Program.s.txt @@ -9,7 +9,7 @@ Program.s int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0 int brightness=100,brightness_dim=40 int display_mode=2 // 1 = EU, 2 = US, 3 = US landscape - int charset=1 // 1 = International (original), 2 = CJK + int charset=2 // 1 = International (original), 2 = CJK //bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port diff --git a/advanced/hmi/nspanel_us_code/alarm.txt b/advanced/hmi/nspanel_us_code/alarm.txt index 71da1d4..b0597d3 100644 --- a/advanced/hmi/nspanel_us_code/alarm.txt +++ b/advanced/hmi/nspanel_us_code/alarm.txt @@ -147,8 +147,8 @@ Text bt_home_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_away_icon Attributes @@ -157,8 +157,8 @@ Text bt_away_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_night_icon Attributes @@ -167,8 +167,8 @@ Text bt_night_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : ï § + Max. Text Size : 3 Text bt_vacat_icon Attributes @@ -177,8 +177,8 @@ Text bt_vacat_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_bypass_icon Attributes @@ -187,8 +187,8 @@ Text bt_bypass_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_disarm_icon Attributes @@ -197,8 +197,8 @@ Text bt_disarm_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Picture bt_home_pic Attributes diff --git a/advanced/hmi/nspanel_us_code/buttonpage01.txt b/advanced/hmi/nspanel_us_code/buttonpage01.txt index e752ee9..90c84e9 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage01.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_code/buttonpage02.txt b/advanced/hmi/nspanel_us_code/buttonpage02.txt index f770b1b..932bc71 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage02.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_code/buttonpage03.txt b/advanced/hmi/nspanel_us_code/buttonpage03.txt index 3e32375..3f8d73c 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage03.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_code/buttonpage04.txt b/advanced/hmi/nspanel_us_code/buttonpage04.txt index 9899fb9..4ae9d31 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage04.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_code/climate.txt b/advanced/hmi/nspanel_us_code/climate.txt index f207ba5..84c5d2d 100644 --- a/advanced/hmi/nspanel_us_code/climate.txt +++ b/advanced/hmi/nspanel_us_code/climate.txt @@ -259,8 +259,8 @@ Text button01 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -280,8 +280,8 @@ Text button02 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -301,8 +301,8 @@ Text button03 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -322,8 +322,8 @@ Text button04 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -343,8 +343,8 @@ Text button05 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -364,8 +364,8 @@ Text button06 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -385,8 +385,8 @@ Text button07 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_us_code/cover.txt b/advanced/hmi/nspanel_us_code/cover.txt index 401c0f4..f146380 100644 --- a/advanced/hmi/nspanel_us_code/cover.txt +++ b/advanced/hmi/nspanel_us_code/cover.txt @@ -120,7 +120,7 @@ Button cover_open Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events @@ -139,7 +139,7 @@ Button cover_close Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text : ï„› Max. Text Size : 3 Events @@ -158,7 +158,7 @@ Button cover_stop Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_us_code/entitypage01.txt b/advanced/hmi/nspanel_us_code/entitypage01.txt index a4fbaf2..1de4dc5 100644 --- a/advanced/hmi/nspanel_us_code/entitypage01.txt +++ b/advanced/hmi/nspanel_us_code/entitypage01.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_code/entitypage02.txt b/advanced/hmi/nspanel_us_code/entitypage02.txt index dea52e9..3799dd6 100644 --- a/advanced/hmi/nspanel_us_code/entitypage02.txt +++ b/advanced/hmi/nspanel_us_code/entitypage02.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_code/entitypage03.txt b/advanced/hmi/nspanel_us_code/entitypage03.txt index e0492c0..36eec24 100644 --- a/advanced/hmi/nspanel_us_code/entitypage03.txt +++ b/advanced/hmi/nspanel_us_code/entitypage03.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_code/entitypage04.txt b/advanced/hmi/nspanel_us_code/entitypage04.txt index 6b443d8..fce97b5 100644 --- a/advanced/hmi/nspanel_us_code/entitypage04.txt +++ b/advanced/hmi/nspanel_us_code/entitypage04.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_code/fan.txt b/advanced/hmi/nspanel_us_code/fan.txt index 502de32..22b6eb3 100644 --- a/advanced/hmi/nspanel_us_code/fan.txt +++ b/advanced/hmi/nspanel_us_code/fan.txt @@ -111,8 +111,8 @@ Button button_up Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : ï‘­ + Max. Text Size : 3 Events Touch Press Event @@ -150,8 +150,8 @@ Button button_on Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -192,8 +192,8 @@ Button button_down Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -231,8 +231,8 @@ Button button_off Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : î œ + Max. Text Size : 3 Events Touch Press Event diff --git a/advanced/hmi/nspanel_us_code/keyb_num.txt b/advanced/hmi/nspanel_us_code/keyb_num.txt index 88c67c1..3f63493 100644 --- a/advanced/hmi/nspanel_us_code/keyb_num.txt +++ b/advanced/hmi/nspanel_us_code/keyb_num.txt @@ -231,8 +231,8 @@ Button bclear Dragging : 0 Send Component ID: on press and release State : unpressed - Text : < - Max. Text Size : 5 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -259,7 +259,7 @@ Button benter Dragging : 0 Send Component ID: on press and release State : unpressed - Text : OK + Text : î„« Max. Text Size : 3 Events @@ -273,7 +273,7 @@ Button bview Dragging : 0 Send Component ID: on press and release State : unpressed - Text : O + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_us_code/media_player.txt b/advanced/hmi/nspanel_us_code/media_player.txt index a162997..b3248ab 100644 --- a/advanced/hmi/nspanel_us_code/media_player.txt +++ b/advanced/hmi/nspanel_us_code/media_player.txt @@ -96,7 +96,7 @@ Text bt_vol_down Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -122,7 +122,7 @@ Text bt_vol_up Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -148,7 +148,7 @@ Text bt_mute Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -215,8 +215,8 @@ Text bt_prev Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’­ + Max. Text Size : 3 Events Touch Release Event @@ -234,8 +234,8 @@ Text bt_play_pause Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -253,8 +253,8 @@ Text bt_next Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’¬ + Max. Text Size : 3 Events Touch Release Event @@ -272,8 +272,8 @@ Text bt_on_off Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_us_code/weather01.txt b/advanced/hmi/nspanel_us_code/weather01.txt index dccaf8e..31bea1a 100644 --- a/advanced/hmi/nspanel_us_code/weather01.txt +++ b/advanced/hmi/nspanel_us_code/weather01.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_code/weather02.txt b/advanced/hmi/nspanel_us_code/weather02.txt index faef826..30b44ed 100644 --- a/advanced/hmi/nspanel_us_code/weather02.txt +++ b/advanced/hmi/nspanel_us_code/weather02.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_code/weather03.txt b/advanced/hmi/nspanel_us_code/weather03.txt index 580496d..bb0949d 100644 --- a/advanced/hmi/nspanel_us_code/weather03.txt +++ b/advanced/hmi/nspanel_us_code/weather03.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_code/weather04.txt b/advanced/hmi/nspanel_us_code/weather04.txt index 5baa256..8d2d15d 100644 --- a/advanced/hmi/nspanel_us_code/weather04.txt +++ b/advanced/hmi/nspanel_us_code/weather04.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○●○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_code/weather05.txt b/advanced/hmi/nspanel_us_code/weather05.txt index e925e03..22dce2b 100644 --- a/advanced/hmi/nspanel_us_code/weather05.txt +++ b/advanced/hmi/nspanel_us_code/weather05.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○○● + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 4dda878..b230d13 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/alarm.txt b/advanced/hmi/nspanel_us_land_code/alarm.txt index da0427b..a38a016 100644 --- a/advanced/hmi/nspanel_us_land_code/alarm.txt +++ b/advanced/hmi/nspanel_us_land_code/alarm.txt @@ -140,8 +140,8 @@ Text bt_home_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_away_icon Attributes @@ -150,8 +150,8 @@ Text bt_away_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_night_icon Attributes @@ -160,8 +160,8 @@ Text bt_night_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : ï § + Max. Text Size : 3 Text bt_vacat_icon Attributes @@ -170,8 +170,8 @@ Text bt_vacat_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_bypass_icon Attributes @@ -180,8 +180,8 @@ Text bt_bypass_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Text bt_disarm_icon Attributes @@ -190,8 +190,8 @@ Text bt_disarm_icon Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Picture bt_home_pic Attributes diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt index e752ee9..90c84e9 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt index f770b1b..932bc71 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt index 3e32375..3f8d73c 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt index 9899fb9..4ae9d31 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt @@ -67,8 +67,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Text button01pic Attributes diff --git a/advanced/hmi/nspanel_us_land_code/climate.txt b/advanced/hmi/nspanel_us_land_code/climate.txt index df3e5d3..c2f8507 100644 --- a/advanced/hmi/nspanel_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_us_land_code/climate.txt @@ -259,8 +259,8 @@ Text button01 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -280,8 +280,8 @@ Text button02 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -301,8 +301,8 @@ Text button03 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -322,8 +322,8 @@ Text button04 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -343,8 +343,8 @@ Text button05 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -364,8 +364,8 @@ Text button06 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -385,8 +385,8 @@ Text button07 Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_us_land_code/cover.txt b/advanced/hmi/nspanel_us_land_code/cover.txt index efd0a33..76933eb 100644 --- a/advanced/hmi/nspanel_us_land_code/cover.txt +++ b/advanced/hmi/nspanel_us_land_code/cover.txt @@ -120,7 +120,7 @@ Button cover_open Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events @@ -139,7 +139,7 @@ Button cover_close Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text : ï„› Max. Text Size : 3 Events @@ -158,7 +158,7 @@ Button cover_stop Dragging : 0 Send Component ID: on press and release State : unpressed - Text : + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_us_land_code/entitypage01.txt b/advanced/hmi/nspanel_us_land_code/entitypage01.txt index a4fbaf2..1de4dc5 100644 --- a/advanced/hmi/nspanel_us_land_code/entitypage01.txt +++ b/advanced/hmi/nspanel_us_land_code/entitypage01.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_land_code/entitypage02.txt b/advanced/hmi/nspanel_us_land_code/entitypage02.txt index dea52e9..3799dd6 100644 --- a/advanced/hmi/nspanel_us_land_code/entitypage02.txt +++ b/advanced/hmi/nspanel_us_land_code/entitypage02.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_land_code/entitypage03.txt b/advanced/hmi/nspanel_us_land_code/entitypage03.txt index ce50678..c3a19d0 100644 --- a/advanced/hmi/nspanel_us_land_code/entitypage03.txt +++ b/advanced/hmi/nspanel_us_land_code/entitypage03.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○ + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_land_code/entitypage04.txt b/advanced/hmi/nspanel_us_land_code/entitypage04.txt index 6b443d8..fce97b5 100644 --- a/advanced/hmi/nspanel_us_land_code/entitypage04.txt +++ b/advanced/hmi/nspanel_us_land_code/entitypage04.txt @@ -277,8 +277,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○● + Max. Text Size : 12 Button button_back Attributes diff --git a/advanced/hmi/nspanel_us_land_code/fan.txt b/advanced/hmi/nspanel_us_land_code/fan.txt index 502de32..22b6eb3 100644 --- a/advanced/hmi/nspanel_us_land_code/fan.txt +++ b/advanced/hmi/nspanel_us_land_code/fan.txt @@ -111,8 +111,8 @@ Button button_up Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : ï‘­ + Max. Text Size : 3 Events Touch Press Event @@ -150,8 +150,8 @@ Button button_on Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -192,8 +192,8 @@ Button button_down Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Press Event @@ -231,8 +231,8 @@ Button button_off Dragging : 0 Send Component ID: on press and release State : unpressed - Text : - Max. Text Size : 10 + Text : î œ + Max. Text Size : 3 Events Touch Press Event diff --git a/advanced/hmi/nspanel_us_land_code/keyb_num.txt b/advanced/hmi/nspanel_us_land_code/keyb_num.txt index 7fa710e..d9a1329 100644 --- a/advanced/hmi/nspanel_us_land_code/keyb_num.txt +++ b/advanced/hmi/nspanel_us_land_code/keyb_num.txt @@ -106,7 +106,7 @@ Button bclose Send Component ID: on press and release State : unpressed Text : î…˜ - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Release Event @@ -231,8 +231,8 @@ Button bclear Dragging : 0 Send Component ID: on press State : unpressed - Text : < - Max. Text Size : 5 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -259,7 +259,7 @@ Button benter Dragging : 0 Send Component ID: on press State : unpressed - Text : OK + Text : î„« Max. Text Size : 3 Events @@ -279,7 +279,7 @@ Button bview Dragging : 0 Send Component ID: on press and release State : unpressed - Text : O + Text :  Max. Text Size : 3 Events diff --git a/advanced/hmi/nspanel_us_land_code/media_player.txt b/advanced/hmi/nspanel_us_land_code/media_player.txt index 04cd684..ef30119 100644 --- a/advanced/hmi/nspanel_us_land_code/media_player.txt +++ b/advanced/hmi/nspanel_us_land_code/media_player.txt @@ -96,7 +96,7 @@ Text bt_vol_down Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -122,7 +122,7 @@ Text bt_vol_up Dragging : 0 Send Component ID : on press Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -148,7 +148,7 @@ Text bt_mute Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : + Text :  Max. Text Size : 3 Events @@ -215,8 +215,8 @@ Text bt_prev Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’­ + Max. Text Size : 3 Events Touch Release Event @@ -235,8 +235,8 @@ Text bt_play_pause Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -254,8 +254,8 @@ Text bt_next Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text : î’¬ + Max. Text Size : 3 Events Touch Release Event @@ -273,8 +273,8 @@ Text bt_on_off Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/advanced/hmi/nspanel_us_land_code/weather01.txt b/advanced/hmi/nspanel_us_land_code/weather01.txt index dccaf8e..31bea1a 100644 --- a/advanced/hmi/nspanel_us_land_code/weather01.txt +++ b/advanced/hmi/nspanel_us_land_code/weather01.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ●○○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_land_code/weather02.txt b/advanced/hmi/nspanel_us_land_code/weather02.txt index faef826..30b44ed 100644 --- a/advanced/hmi/nspanel_us_land_code/weather02.txt +++ b/advanced/hmi/nspanel_us_land_code/weather02.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○●○○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_land_code/weather03.txt b/advanced/hmi/nspanel_us_land_code/weather03.txt index 580496d..bb0949d 100644 --- a/advanced/hmi/nspanel_us_land_code/weather03.txt +++ b/advanced/hmi/nspanel_us_land_code/weather03.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○●○○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_land_code/weather04.txt b/advanced/hmi/nspanel_us_land_code/weather04.txt index 5baa256..8d2d15d 100644 --- a/advanced/hmi/nspanel_us_land_code/weather04.txt +++ b/advanced/hmi/nspanel_us_land_code/weather04.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○●○ + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/advanced/hmi/nspanel_us_land_code/weather05.txt b/advanced/hmi/nspanel_us_land_code/weather05.txt index e925e03..22dce2b 100644 --- a/advanced/hmi/nspanel_us_land_code/weather05.txt +++ b/advanced/hmi/nspanel_us_land_code/weather05.txt @@ -157,8 +157,8 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 20 + Text : ○○○○● + Max. Text Size : 15 Picture weather_icon Attributes diff --git a/dev/ui/us_land/instructions.md b/dev/create_us_land_and_CJK_hmi_from_original.md similarity index 56% rename from dev/ui/us_land/instructions.md rename to dev/create_us_land_and_CJK_hmi_from_original.md index 932d017..9566626 100644 --- a/dev/ui/us_land/instructions.md +++ b/dev/create_us_land_and_CJK_hmi_from_original.md @@ -7,3 +7,13 @@ Change to `display_mode=3` 1. Change left_bt_pic (x,y,w,h) from ( 47,307,120,3) to (467,173,3,120) 2. Change right_bt_pic(x,y,w,h) from (288,307,120,3) to (467, 27,3,120) 3. Rotate pictures 30 & 31 by 90degrees - You will find the rotated pics under pics folder where this instruction file is. + +# Creating `nspanel_CJK_xxx.HMI` from `nspanel_xxx.HMI`: + +## Program.s: +Change to `charset=2` + +## Fonts: +1. Replace `ubuntuXX` fonts by the ones available under this folder +* Note that not all fonts are available. +* Note that CJK font names might not match it's size. This should be ignored. diff --git a/dev/instructions_for_developers.md b/dev/instructions_for_developers.md new file mode 100644 index 0000000..eda0d51 --- /dev/null +++ b/dev/instructions_for_developers.md @@ -0,0 +1,24 @@ +# ESPHome + +When a new page is opened, a script name `page_changed` (whith a parameter `page` containing a string with the page name) is called and that one will call a page specific script named `page_`. In addition, pages with multiple pages (entitypageXX, buttonpageXX and weatherXX) will also call a generic page named `page_entitypage`, `page_buttonpage` or `page_weather` with a parameter `page_number` containing the number of the page called. + +If you want to execute expecific code when a page is opened, you can extend the functionality of that specific page: + +```yaml +script: + - id: !extend page_changed + then: + # Code to run when any page is opened + - lambda: |- + static const char *const TAG = "script.page_changed (custom)"; + ESP_LOGD(TAG, "Custom code for page changed"); + ESP_LOGD(TAG, "This is the new page: %s", page.c_str()); + + - id: !extend page_buttonpage + then: + # Code to run when any buttonpage is openend + +- id: !extend page_buttonpage02 + then: + # Code to run when buttonpage02 is opened +``` \ No newline at end of file diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 9c4c12d..c88fc20 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 1f7b91a..0ba17ac 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 1b789bf..c9c78e7 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ