diff --git a/docs/api.md b/docs/api.md index c7bb2ba..0a34cca 100644 --- a/docs/api.md +++ b/docs/api.md @@ -27,14 +27,21 @@ This document provides details on custom services designed for integration with - [Media Player Page Service (`page_media_player`)](#media-player-page-service-page_media_player): Updates the Media Player page with current state information. - [Screen Components](#screen-components) - [Home page - Chips](#home-page---chips) - - User-defined Chips - - Relays Chips - - Climate Chip + - [User-defined Chips](#user-defined-chips) + - [Relays Chips](#relays-chips) + - [Climate Chip](#climate-chip) - [Home page - Custom Buttons](#home-page---custom-buttons) + - [Home page - Values](#home-page---values) + - [Entities Pages - Values](#entities-pages---values) ## Service Documentation -### Table of contents +### General Guidance +In general, there's no validation on the content of the parameters in a service call. Please make sure to fulfill the validation from the service caller side, otherwise it can drive to a crash in the ESPHome side, it will most likely restart the panel. + +One example is with colors. In almost all cases, it is expected an array with 3 unsigned integers between 0 to 255. If you send anything different, the conversion to the RGB565 used by Nextion will crash. + +### Table of Contents | Service ID | Service Name | Description | |------------|--------------|-------------| @@ -770,3 +777,16 @@ automation: ### Home Page - Custom buttons ![Image](pics/Nextion_Components_Home_Custom_Buttons_EU.png) ![Image](pics/Nextion_Components_Home_Custom_Buttons_US.png) + +### Home Page - Values +![Image](pics/Nextion_Components_Home_Values_EU.png) +![Image](pics/Nextion_Components_Home_Values_US.png) +This is a multi-component system, with names `value01` to `value03` containing the state of the entity, +where `value01_icon` to `value03_icon` supports the icons. + +### Entities Pages - Values +Just like in "[Home Page - Values](#home-page---values)", this is a multi-component system, with names `value01` to `value08` containing the state of the entity, +where `value01_icon` to `value08_icon` supports the icons and, exclusivelly in the Entities pages, `value01_label` to `value08_label`, +which will contain the friendly name or some alternative label for the entities. + +Each to these sets are sent using the [Value Service (`value`)](#value-service-value), with up to 8 individual calls to this service for each page construction. diff --git a/docs/pics/Nextion_Components_Home_Values_EU.png b/docs/pics/Nextion_Components_Home_Values_EU.png new file mode 100644 index 0000000..919cd4c Binary files /dev/null and b/docs/pics/Nextion_Components_Home_Values_EU.png differ diff --git a/docs/pics/Nextion_Components_Home_Values_US.png b/docs/pics/Nextion_Components_Home_Values_US.png new file mode 100644 index 0000000..f3ab939 Binary files /dev/null and b/docs/pics/Nextion_Components_Home_Values_US.png differ diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 36593e8..7e4a1a5 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -414,13 +414,13 @@ api: # back_page: "home" # Or "buttonpage01" to "buttonpage04" as appropriate. # # NOTE: Tailor , entity_id, and back_page to match your specific setup. This approach ensures a seamless and intuitive navigation experience, facilitating easy access to and from detailed entity information. - - service: open_entity_settings_page + - service: entity_details_show variables: entity: string back_page: string then: - script.execute: - id: open_entity_settings_page + id: entity_details_show entity: !lambda "return entity;" back_page: !lambda "return back_page;" @@ -576,12 +576,12 @@ api: - lambda: |- if (not id(is_uploading_tft)) { static const char *const TAG = "service.page_home"; - ESP_LOGV(TAG, "date_color: %" PRIi32, date_color); + ESP_LOGV(TAG, "date_color: %i", date_color.size()); ESP_LOGV(TAG, "time_format: %s", time_format.c_str()); - ESP_LOGV(TAG, "time_color: %" PRIi32, time_color); + ESP_LOGV(TAG, "time_color: %i", time_color.size()); ESP_LOGV(TAG, "meridiem: %i", meridiem.size()); - ESP_LOGV(TAG, "chip_font_size: %" PRIi32, chip_font_size); - ESP_LOGV(TAG, "custom_buttons_font_size: %" PRIi32, custom_buttons_font_size); + ESP_LOGV(TAG, "chip_font: %" PRIi32, chip_font); + ESP_LOGV(TAG, "custom_buttons_font: %" PRIi32, custom_buttons_font); ESP_LOGV(TAG, "notification_icon: %s", notification_icon.c_str()); ESP_LOGV(TAG, "notification_icon_color_normal: %i", notification_icon_color_normal.size()); ESP_LOGV(TAG, "notification_icon_color_unread: %i", notification_icon_color_unread.size()); @@ -599,28 +599,28 @@ api: // Date/Time colors ESP_LOGV(TAG, "Load date/time colors"); - disp1->set_component_font_color("home.date", date_color); - disp1->set_component_font_color("home.time", time_color); - id(home_date_color) = date_color; - id(home_time_color) = time_color; + set_component_color->execute("home.date", date_color); + set_component_color->execute("home.time", time_color); + id(home_date_color) = esphome::display::ColorUtil::color_to_565(esphome::Color(date_color[0], date_color[1], date_color[2])); + id(home_time_color) = esphome::display::ColorUtil::color_to_565(esphome::Color(time_color[0], time_color[1], time_color[2])); // Chips icon size ESP_LOGV(TAG, "Chips size"); for (int i = 1; i <= 10; ++i) { - disp1->send_command_printf("home.icon_top_%02d.font=%" PRIu32, i, chip_font_size); + disp1->send_command_printf("home.icon_top_%02d.font=%" PRIu32, i, chip_font); } - disp1->send_command_printf("home.wifi_icon.font=%" PRIu32, chip_font_size); - id(home_chip_font_size) = chip_font_size; + disp1->send_command_printf("home.wifi_icon.font=%" PRIu32, chip_font); + id(home_chip_font_id) = chip_font; // Custom buttons icon size ESP_LOGV(TAG, "Custom buttons sizes"); - id(home_custom_buttons_font_size) = custom_buttons_font_size; + id(home_custom_buttons_font_id) = custom_buttons_font; for (int i = 1; i <= 7; ++i) { - disp1->send_command_printf("home.button%02d.font=%i", i, id(home_custom_buttons_font_size)); + disp1->send_command_printf("home.button%02d.font=%i", i, id(home_custom_buttons_font_id)); } - disp1->send_command_printf("home.bt_notific.font=%i", id(home_custom_buttons_font_size)); - disp1->send_command_printf("home.bt_qrcode.font=%i", id(home_custom_buttons_font_size)); - disp1->send_command_printf("home.bt_entities.font=%i", id(home_custom_buttons_font_size)); + disp1->send_command_printf("home.bt_notific.font=%i", id(home_custom_buttons_font_id)); + disp1->send_command_printf("home.bt_qrcode.font=%i", id(home_custom_buttons_font_id)); + disp1->send_command_printf("home.bt_entities.font=%i", id(home_custom_buttons_font_id)); // Notification button ESP_LOGV(TAG, "Set Notification button"); @@ -1420,13 +1420,13 @@ globals: initial_value: '"Unavailable"' ##### Chips ##### - - id: home_chip_font_size + - id: home_chip_font_id type: uint restore_value: true initial_value: '7' #### Custom buttons #### - - id: home_custom_buttons_font_size + - id: home_custom_buttons_font_id type: uint restore_value: true initial_value: '8' @@ -2624,34 +2624,37 @@ script: if (current_page->state == "notification") disp1->goto_page("home"); } - - id: open_entity_settings_page + - id: entity_details_show mode: restart parameters: - page: string - page_label: string - page_icon: string - page_icon_color: int32_t[] + #page: string + #page_label: string + #page_icon: string + #page_icon_color: int32_t[] entity: string back_page: string then: - lambda: |- - if (not id(is_uploading_tft)) { + size_t pos = entity.find("."); + if ((not id(is_uploading_tft)) and (pos != std::string::npos or entity == "embedded_climate")) { + std::string page = entity.substr(0, pos); + if (page == "alarm_control_panel") page = "alarm"; detailed_entity->publish_state(entity); if (page == "alarm_control_panel") page = "alarm"; std::string cmd_page = std::string("page ") + page.c_str(); disp1->send_command_printf(cmd_page.c_str()); - if (page_label.find("\\r") != std::string::npos) - page_label = page_label.replace(page_label.find("\\r"), 2, " "); - disp1->set_component_text_printf("page_label", "%s", page_label.c_str()); + //if (page_label.find("\\r") != std::string::npos) + // page_label = page_label.replace(page_label.find("\\r"), 2, " "); + //disp1->set_component_text_printf("page_label", "%s", page_label.c_str()); set_page_id->execute("back_page_id", back_page.c_str()); if (page == "climate") - disp1->set_component_value("embedded", (entity == "embedded_climate") ? 1 : 0); - else - { - if ((page_icon != std::string()) and (page_icon != "")) - disp1->set_component_text_printf("icon_state", "%s", page_icon.c_str()); - set_component_color->execute("icon_state", page_icon_color); - } + disp1->set_component_value("embedded", (entity == "embedded_climate") ? 1 : 0); + //else + // { + // if ((page_icon != std::string()) and (page_icon != "")) + // disp1->set_component_text_printf("icon_state", "%s", page_icon.c_str()); + // set_component_color->execute("icon_state", page_icon_color); + // } } - id: page_alarm @@ -3424,17 +3427,17 @@ script: // Chips icon size ESP_LOGV(TAG, "Adjusting icon's sizes"); for (int i = 1; i <= 10; ++i) { - disp1->send_command_printf("home.icon_top_%02d.font=%i", i, id(home_chip_font_size)); + disp1->send_command_printf("home.icon_top_%02d.font=%i", i, id(home_chip_font_id)); } // Custom buttons icon size ESP_LOGV(TAG, "Adjusting custom buttons sizes"); for (int i = 1; i <= 7; ++i) { - disp1->send_command_printf("home.button%02d.font=%i", i, id(home_custom_buttons_font_size)); + disp1->send_command_printf("home.button%02d.font=%i", i, id(home_custom_buttons_font_id)); } - disp1->send_command_printf("home.bt_notific.font=%i", id(home_custom_buttons_font_size)); - disp1->send_command_printf("home.bt_qrcode.font=%i", id(home_custom_buttons_font_size)); - disp1->send_command_printf("home.bt_entities.font=%i", id(home_custom_buttons_font_size)); - disp1->send_command_printf("home.wifi_icon.font=%i", id(home_chip_font_size)); + disp1->send_command_printf("home.bt_notific.font=%i", id(home_custom_buttons_font_id)); + disp1->send_command_printf("home.bt_qrcode.font=%i", id(home_custom_buttons_font_id)); + disp1->send_command_printf("home.bt_entities.font=%i", id(home_custom_buttons_font_id)); + disp1->send_command_printf("home.wifi_icon.font=%i", id(home_chip_font_id)); ESP_LOGV(TAG, "Restoring relay's icons"); disp1->set_component_text_printf("home.icon_top_01", "%s", id(home_relay1_icon).c_str()); disp1->set_component_text_printf("home.icon_top_02", "%s", id(home_relay2_icon).c_str()); @@ -3470,12 +3473,12 @@ script: check_versions->stop(); display_embedded_temp->stop(); display_wrapped_text->stop(); + entity_details_show->stop(); global_settings->stop(); ha_button->stop(); ha_call_service->stop(); nextion_status->stop(); notification_clear->stop(); - open_entity_settings_page->stop(); page_alarm->stop(); page_blank->stop(); page_boot->stop(); diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 0ed5885..4478254 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -3390,31 +3390,31 @@ variables: nspanel: service: - init: - global: 'esphome.{{ nspanel_name }}_global_settings' - page: - home: 'esphome.{{ nspanel_name }}_page_home' - settings: 'esphome.{{ nspanel_name }}_page_settings' - qrcode: 'esphome.{{ nspanel_name }}_qrcode' - relays: 'esphome.{{ nspanel_name }}_relay_settings' + button: 'esphome.{{ nspanel_name }}_set_button' command: 'esphome.{{ nspanel_name }}_command' - page: - alarm: 'esphome.{{ nspanel_name }}_alarm_settings' - button: 'esphome.{{ nspanel_name }}_set_button' - entities: 'esphome.{{ nspanel_name }}_set_entity' - media_player: 'esphome.{{ nspanel_name }}_media_player' - climate: 'esphome.{{ nspanel_name }}_set_climate' - detailed_entity: 'esphome.{{ nspanel_name }}_open_entity_settings_page' component: - show: 'esphome.{{ nspanel_name }}_send_command_show' - hide: 'esphome.{{ nspanel_name }}_send_command_hide' - text: 'esphome.{{ nspanel_name }}_send_command_text_printf' - color: 'esphome.{{ nspanel_name }}_set_component_color' - value: 'esphome.{{ nspanel_name }}_send_command_value' - wake_up: 'esphome.{{ nspanel_name }}_wake_up' - tft_upload: 'esphome.{{ nspanel_name }}_upload_tft_url' + color: 'esphome.{{ nspanel_name }}_component_color' + hide: 'esphome.{{ nspanel_name }}_component_hide' + show: 'esphome.{{ nspanel_name }}_component_show' + text: 'esphome.{{ nspanel_name }}_component_text' + value: 'esphome.{{ nspanel_name }}_component_value' + detailed_entity: 'esphome.{{ nspanel_name }}_entity_details_show' + init: + global: 'esphome.{{ nspanel_name }}_init_global' + page: + home: 'esphome.{{ nspanel_name }}_init_page_home' + settings: 'esphome.{{ nspanel_name }}init_page_settings' + relays: 'esphome.{{ nspanel_name }}_init_relays' notification: clear: 'esphome.{{ nspanel_name }}_notification_clear' + page: + alarm: 'esphome.{{ nspanel_name }}_page_alarm' + media_player: 'esphome.{{ nspanel_name }}_page_media_player' + climate: 'esphome.{{ nspanel_name }}_page_climate' + qrcode: 'esphome.{{ nspanel_name }}_qrcode' + tft_upload: 'esphome.{{ nspanel_name }}_upload_tft_url' + value: 'esphome.{{ nspanel_name }}_value' + wake_up: 'esphome.{{ nspanel_name }}_wake_up' ##### Nextion dict #### nextion: @@ -8084,7 +8084,7 @@ action: {{ current_temperature | round(0 if current_temperature >= 100 or temperature_units in ["F", "f", "°F", "°f", "K", "k"] else 1) }}{{ temperature_units}} {% else %} 0 {% endif %} - - service: '{{ nspanel.service.page.button }}' + - service: '{{ nspanel.service.button }}' data: page: '{{ repeat.item.page }}' id: '{{ repeat.item.component }}' @@ -8101,7 +8101,7 @@ action: then: - delay: milliseconds: 800 - - service: '{{ nspanel.service.page.button }}' + - service: '{{ nspanel.service.button }}' data: page: '{{ repeat.item.page }}' id: '{{ repeat.item.component }}' @@ -8930,7 +8930,7 @@ action: name: '{{ repeat.item.name if repeat.item.name is defined else None }}' unit_of_measurement: '{{ state_attr(entity_id, "unit_of_measurement") | default("") }}' - *variable_entity - - service: '{{ nspanel.service.page.entities }}' + - service: '{{ nspanel.service.value }}' data: ent_id: '{{ repeat.item.page }}.{{ repeat.item.component }}' ent_icon: '{{ entity.icon }}' @@ -9473,13 +9473,9 @@ action: sequence: - variables: back_page: '{{ page.home }}' - - &open_entity_settings_page - service: '{{ nspanel.service.page.detailed_entity }}' + - &entity_details_show + service: '{{ nspanel.service.page.entity_details_show }}' data: - page: '{{ entity_domain }}' - page_label: '{{ entity.name }}' - page_icon: '{{ entity.icon }}' - page_icon_color: '{{ entity.icon_color }}' entity: '{{ "embedded_climate" if entity_id == thermostat_embedded else entity_id }}' back_page: '{{ back_page }}' continue_on_error: true @@ -9561,7 +9557,7 @@ action: sequence: - variables: back_page: '{{ nspanel_event.page }}' - - *open_entity_settings_page + - *entity_details_show - alias: Short click conditions: - '{{ nspanel_event.command == "short_click" and entity_domain not in ["alarm_control_panel", "climate", "media_player"] }}' @@ -9624,7 +9620,7 @@ action: then: - variables: back_page: '{{ page.home }}' - - *open_entity_settings_page + - *entity_details_show else: - *short_press-service_call @@ -9709,7 +9705,7 @@ action: entity_id: '{{ climate }}' back_page: '{{ page.home }}' - *variable_entity - - *open_entity_settings_page + - *entity_details_show - alias: Show button - Notification clear conditions: diff --git a/tft/nspanel_eu.HMI b/tft/nspanel_eu.HMI index 2205373..29944e3 100644 Binary files a/tft/nspanel_eu.HMI and b/tft/nspanel_eu.HMI differ diff --git a/tft/nspanel_eu_code/entitypage01.txt b/tft/nspanel_eu_code/entitypage01.txt index 7e9a7ae..ceb8e33 100644 --- a/tft/nspanel_eu_code/entitypage01.txt +++ b/tft/nspanel_eu_code/entitypage01.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_eu_code/entitypage02.txt b/tft/nspanel_eu_code/entitypage02.txt index deb1259..1ba1ec3 100644 --- a/tft/nspanel_eu_code/entitypage02.txt +++ b/tft/nspanel_eu_code/entitypage02.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_eu_code/entitypage03.txt b/tft/nspanel_eu_code/entitypage03.txt index 3825618..7286e7d 100644 --- a/tft/nspanel_eu_code/entitypage03.txt +++ b/tft/nspanel_eu_code/entitypage03.txt @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_eu_code/entitypage04.txt b/tft/nspanel_eu_code/entitypage04.txt index b2b1238..e8e84f8 100644 --- a/tft/nspanel_eu_code/entitypage04.txt +++ b/tft/nspanel_eu_code/entitypage04.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_eu_code/home.txt b/tft/nspanel_eu_code/home.txt index 0d62259..f3c93ea 100644 --- a/tft/nspanel_eu_code/home.txt +++ b/tft/nspanel_eu_code/home.txt @@ -103,7 +103,7 @@ Text date Touch Release Event settings_timer.en=0 -Text value01_state +Text value01 Attributes ID : 8 Scope : global @@ -243,7 +243,7 @@ Text value01_icon Text : Max. Text Size : 3 -Text value03_state +Text value03 Attributes ID : 22 Scope : global @@ -273,7 +273,7 @@ Text value02_icon Text : Max. Text Size : 3 -Text value02_state +Text value02 Attributes ID : 25 Scope : global diff --git a/tft/nspanel_us.HMI b/tft/nspanel_us.HMI index 28fd700..c3d389d 100644 Binary files a/tft/nspanel_us.HMI and b/tft/nspanel_us.HMI differ diff --git a/tft/nspanel_us_code/entitypage01.txt b/tft/nspanel_us_code/entitypage01.txt index 7e9a7ae..ceb8e33 100644 --- a/tft/nspanel_us_code/entitypage01.txt +++ b/tft/nspanel_us_code/entitypage01.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_us_code/entitypage02.txt b/tft/nspanel_us_code/entitypage02.txt index deb1259..1ba1ec3 100644 --- a/tft/nspanel_us_code/entitypage02.txt +++ b/tft/nspanel_us_code/entitypage02.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_us_code/entitypage03.txt b/tft/nspanel_us_code/entitypage03.txt index 1a14754..b343d78 100644 --- a/tft/nspanel_us_code/entitypage03.txt +++ b/tft/nspanel_us_code/entitypage03.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_us_code/entitypage04.txt b/tft/nspanel_us_code/entitypage04.txt index b2b1238..e8e84f8 100644 --- a/tft/nspanel_us_code/entitypage04.txt +++ b/tft/nspanel_us_code/entitypage04.txt @@ -111,7 +111,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local @@ -121,7 +121,7 @@ Text value01_pic Text : Max. Text Size : 5 -Text value02_pic +Text value02_icon Attributes ID : 13 Scope : local @@ -131,7 +131,7 @@ Text value02_pic Text : Max. Text Size : 5 -Text value03_pic +Text value03_icon Attributes ID : 14 Scope : local @@ -141,7 +141,7 @@ Text value03_pic Text : Max. Text Size : 5 -Text value04_pic +Text value04_icon Attributes ID : 15 Scope : local @@ -151,7 +151,7 @@ Text value04_pic Text : Max. Text Size : 5 -Text value05_pic +Text value05_icon Attributes ID : 16 Scope : local @@ -161,7 +161,7 @@ Text value05_pic Text : Max. Text Size : 5 -Text value06_pic +Text value06_icon Attributes ID : 17 Scope : local @@ -171,7 +171,7 @@ Text value06_pic Text : Max. Text Size : 5 -Text value07_pic +Text value07_icon Attributes ID : 18 Scope : local @@ -181,7 +181,7 @@ Text value07_pic Text : Max. Text Size : 5 -Text value08_pic +Text value08_icon Attributes ID : 19 Scope : local diff --git a/tft/nspanel_us_code/home.txt b/tft/nspanel_us_code/home.txt index 0d62259..f3c93ea 100644 --- a/tft/nspanel_us_code/home.txt +++ b/tft/nspanel_us_code/home.txt @@ -103,7 +103,7 @@ Text date Touch Release Event settings_timer.en=0 -Text value01_state +Text value01 Attributes ID : 8 Scope : global @@ -243,7 +243,7 @@ Text value01_icon Text : Max. Text Size : 3 -Text value03_state +Text value03 Attributes ID : 22 Scope : global @@ -273,7 +273,7 @@ Text value02_icon Text : Max. Text Size : 3 -Text value02_state +Text value02 Attributes ID : 25 Scope : global