Merge pull request #1935 from Blackymas/dev

v4.3.1b1
2024-03-19 15:02:58 +01:00
parent 0e8c98e798 e0415c35cd
commit 7a18b75204
213 changed files with 3336 additions and 1991 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -28,7 +28,7 @@ body:
    attributes:
      label: TFT Version
      description: Enter the TFT version number.
-      placeholder: e.g., 4.1.4
+      placeholder: e.g., 4.3.1
    validations:
      required: false

@@ -36,7 +36,7 @@ body:
    attributes:
      label: ESPHome Version
      description: Enter the ESPHome version number.
-      placeholder: e.g., 4.1.4
+      placeholder: e.g., 4.3.1
    validations:
      required: false

@@ -44,7 +44,7 @@ body:
    attributes:
      label: Blueprint Version
      description: Enter the Blueprint version number.
-      placeholder: e.g., 4.1.4
+      placeholder: e.g., 4.3.1
    validations:
      required: false

@@ -100,15 +100,20 @@ body:
        Access these logs via the **Logs** button on the ESPHome Dashboard.
        These logs are crucial for diagnosing issues with your device.

+
        Please follow the guidelines below to ensure the logs are comprehensive:
+
        - **Boot Issues**: If the problem occurs during boot, capture the logs from the start of your device to a minute or two after the boot completes.
        Look for errors or unusual messages during this period.
+
        - **TFT File Update Issues**: For problems related to TFT file updates,
        include logs from the moment you press the **Update TFT Display** button until a few seconds after the device restarts.
        Pay attention to any error messages or warnings during the update process.
+
        - **Other Issues**: For other types of problems, include logs that encompass the issue's onset and continue for a short duration thereafter.
        This will help in pinpointing the exact moment and nature of the issue.

+
        Remember, the more detailed the logs, the easier it is to identify and resolve the problem.

  - type: textarea
@@ -117,9 +122,15 @@ body:
      description: >
        To access Home Assistant logs, navigate to **Settings** > **System** > [**Logs**](https://my.home-assistant.io/redirect/logs/).

+
        When reporting an issue, please focus on providing logs specifically relevant to the problem:
+
        - **NSPanel Blueprint Automation**: If your issue is related to automation using the NSPanel blueprint, include only those logs that directly pertain to this process.
+
        - **Panel and ESPHome**: For issues involving your panel and ESPHome, carefully select and share logs that show interactions or errors between these components.
+
        - **Relevancy is Key**: To expedite troubleshooting, avoid including logs that are not related to the issue at hand. This helps in focusing on the pertinent information.
+
+
        Your attention to sharing targeted and relevant log data is greatly appreciated and aids in efficient problem resolution.
 ...
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -191,48 +191,48 @@ jobs:
        with:
          yaml_file: "./.test/esphome_advanced_climate_heat_customizations.yaml"

-  build_prebuilt_firmware:
-    name: Prebuilt Firmware
-    runs-on: ubuntu-latest
-    needs: build_core  # Ensure this job runs after the core build job
-    if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: '0'
+  # build_prebuilt_firmware:
+  #   name: Prebuilt Firmware
+  #   runs-on: ubuntu-latest
+  #   needs: build_core  # Ensure this job runs after the core build job
+  #   if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
+  #   steps:
+  #     - uses: actions/checkout@main
+  #       with:
+  #         fetch-depth: '0'

-      - name: Build ESPHome Prebuilt Firmware
-        uses: barndawgie/build-action@v1.9.0
-        with:
-          yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml
+  #     - name: Build ESPHome Prebuilt Firmware
+  #       uses: barndawgie/build-action@v1.9.0
+  #       with:
+  #         yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml

-      - name: Move and Rename Firmware File
-        run: |
-          mkdir -p prebuilt
-          cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware.bin prebuilt/nspanel_esphome_prebuilt.bin || true
-          cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware-factory.bin prebuilt/nspanel_esphome_prebuilt-factory.bin || true
+  #     - name: Move and Rename Firmware File
+  #       run: |
+  #         mkdir -p prebuilt
+  #         cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware.bin prebuilt/nspanel_esphome_prebuilt.bin || true
+  #         cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware-factory.bin prebuilt/nspanel_esphome_prebuilt-factory.bin || true

-      - name: Set Commit Message
-        id: set_commit_message
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - ${{ github.event.pull_request.title }}" >> $GITHUB_ENV
-          elif [[ "${{ github.event_name }}" == "push" ]]; then
-            commit_message=$(git log -1 --pretty=format:'%s')
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - $commit_message" >> $GITHUB_ENV
-          else
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel" >> $GITHUB_ENV
-          fi
+  #     - name: Set Commit Message
+  #       id: set_commit_message
+  #       run: |
+  #         if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+  #           echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - ${{ github.event.pull_request.title }}" >> $GITHUB_ENV
+  #         elif [[ "${{ github.event_name }}" == "push" ]]; then
+  #           commit_message=$(git log -1 --pretty=format:'%s')
+  #           echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - $commit_message" >> $GITHUB_ENV
+  #         else
+  #           echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel" >> $GITHUB_ENV
+  #         fi

-      - name: Commit and Push Firmware Files
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add prebuilt/*.bin
-          git commit -m "${{ env.COMMIT_MESSAGE }}"
-          git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Commit and Push Firmware Files
+  #       run: |
+  #         git config --global user.name 'GitHub Actions'
+  #         git config --global user.email 'actions@github.com'
+  #         git add prebuilt/*.bin
+  #         git commit -m "${{ env.COMMIT_MESSAGE }}"
+  #         git push
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  build_climate_cool_bluetooth_proxy:
    name: Climate cool & BLE proxy
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -180,49 +180,21 @@ jobs:
          yaml_file: "./.test/esphome_advanced_climate_heat_customizations.yaml"
          version: beta

-  build_prebuilt_firmware:
-    name: Prebuilt Firmware
-    runs-on: ubuntu-latest
-    needs: build_core  # Ensure this job runs after the core build job
-    if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: '0'
+  # build_prebuilt_firmware:
+  #   name: Prebuilt Firmware
+  #   runs-on: ubuntu-latest
+  #   needs: build_core  # Ensure this job runs after the core build job
+  #   if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
+  #   steps:
+  #     - uses: actions/checkout@main
+  #       with:
+  #         fetch-depth: '0'

-      - name: Build ESPHome Prebuilt Firmware
-        uses: barndawgie/build-action@v1.9.0
-        with:
-          yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml
-          version: beta
-
-      - name: Move and Rename Firmware File
-        run: |
-          mkdir -p prebuilt
-          cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware.bin prebuilt/nspanel_esphome_prebuilt.bin || true
-          cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware-factory.bin prebuilt/nspanel_esphome_prebuilt-factory.bin || true
-
-      - name: Set Commit Message
-        id: set_commit_message
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - ${{ github.event.pull_request.title }}" >> $GITHUB_ENV
-          elif [[ "${{ github.event_name }}" == "push" ]]; then
-            commit_message=$(git log -1 --pretty=format:'%s')
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - $commit_message" >> $GITHUB_ENV
-          else
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel" >> $GITHUB_ENV
-          fi
-
-      - name: Commit and Push Firmware Files
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add prebuilt/*.bin
-          git commit -m "${{ env.COMMIT_MESSAGE }}"
-          git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Build ESPHome Prebuilt Firmware
+  #       uses: barndawgie/build-action@v1.9.0
+  #       with:
+  #         yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml
+  #         version: beta

  build_climate_cool_bluetooth_proxy:
    name: Climate cool & BLE proxy
--- a/.test/esphome_advanced_climate_heat_customizations.yaml
+++ b/.test/esphome_advanced_climate_heat_customizations.yaml
@@ -26,10 +26,7 @@ binary_sensor:
    id: display_state
    platform: template
    lambda: |-
-      return (id(current_page).state != "screensaver");
-
-# Enable Bluetooth proxy
-bluetooth_proxy:
+      return (current_page->state != "screensaver");

 button:
  # Adds a button to put the panel to sleep
@@ -41,7 +38,7 @@ button:
      then:
        - logger.log: Button Sleep pressed
        - lambda: |-
-            if (id(current_page).state != "screensaver") id(disp1).goto_page("screensaver");
+            goto_page->execute("screensaver");

  # Adds a button to wake-up the panel (similar to the existing service)
  - name: ${device_name} Wake-up
@@ -52,10 +49,10 @@ button:
      then:
        - logger.log: Button Wake-up pressed
        - lambda: |-
-            if (id(current_page).state == "screensaver") id(disp1).goto_page(id(wakeup_page_name).state.c_str());
-            // id(timer_page).execute(id(wakeup_page_name).state.c_str()); // enable this if you want page timeout to be reset
-            id(timer_sleep).execute(id(wakeup_page_name).state.c_str(), int(id(timeout_sleep).state));
-            id(timer_dim).execute(id(wakeup_page_name).state.c_str(), int(id(timeout_dim).state));
+            if (current_page->state == "screensaver") id(disp1).goto_page(id(wakeup_page_name).state.c_str());
+            // timer_page->execute(); // enable this if you want page timeout to be reset
+            timer_sleep->execute();
+            timer_dim->execute();

 # Add custom presets to your climate (heat in this example)
 climate:
@@ -100,12 +97,12 @@ light:
        - lambda: |-
            ESP_LOGD("light.display_light", "Turn-on");
            if (current_page->state == "screensaver") disp1->goto_page(wakeup_page_name->state.c_str());
-            timer_reset_all->execute(wakeup_page_name->state.c_str());
+            timer_reset_all->execute();
    on_turn_off:
      then:
        - lambda: |-
            ESP_LOGD("light.display_light", "Turn-off");
-            disp1->goto_page("screensaver");
+            goto_page->execute("screensaver");

 logger:
  # Enable hardware UART serial logging
@@ -133,12 +130,12 @@ script:
  - id: !extend page_changed
    then:
      - lambda: |-
-          ESP_LOGD("script.page_changed(custom)", "page: %s", page.c_str());
+          ESP_LOGD("script.page_changed(custom)", "page: %s", current_page->state.c_str());
          ESP_LOGV("script.page_changed(custom)", "is_on(): %s", display_light->current_values.is_on() ? "True" : "False");
-          if (page == "screensaver" and display_light->current_values.is_on()) {
+          if (current_page->state == "screensaver" and display_light->current_values.is_on()) {
            auto call = display_light->turn_off();
            call.perform();
-          } else if (page != "screensaver" and (not display_light->current_values.is_on())) {
+          } else if (current_page->state != "screensaver" and (not display_light->current_values.is_on())) {
            auto call = display_light->turn_on();
            call.perform();
          }
@@ -238,6 +235,4 @@ wifi:
    - ssid: !secret wifi_ssid_backup
      password: !secret wifi_password_backup
      priority: 0
-  # Set Wi-Fi power save mode to "LIGHT" as required for Bluetooth on ESP32
-  power_save_mode: LIGHT
 ...
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -218,7 +218,146 @@ This addition allows for a more comprehensive at-a-glance view of your essential
 ### Automatic Font Size Adjustment for Entity Page Values
 We've enhanced the entities pages with an automatic font size adjustment feature to improve the display of values, especially for longer strings or values with lengthy units.
 This smart adjustment reduces the occurrence of truncated values by dynamically resizing the font based on the string length.
-While the selection of fonts for the panel remains limited, this automatic resizing significantly enhances readability, ensuring that all displayed information is clear and fully visible at a glance.
+While the selection of fonts for the panel remains limited, this automatic resizing significantly enhances readability,
+ensuring that all displayed information is clear and fully visible at a glance.
+
+## v4.3.1 - Ensuring Compatibility with ESPHome v2024.3.0 and Enhancing Stability
+Patch v4.3.1 focuses primarily on ensuring full compatibility with the latest ESPHome v2024.3.0 IP address format changes, crucial for the smooth compilation and operation of the NSPanel project.
+This timely update addresses critical compatibility issues, alongside implementing key bug fixes and optimizations.
+It underscores our ongoing commitment to enhancing stability and ensuring a reliable experience for all NSPanel users, keeping pace with the evolving ESPHome ecosystem.
+
+### Support for ESPHome v2024.3.0 IP Address Format
+- **Criticality:** Critical (required for compiling with ESPHome 2024.3.0)
+- **Affected Components:** ESPHome
+- **Description:** This update introduces necessary adjustments to accommodate the new IP address format introduced by ESPHome v2024.3.0,
+ensuring uninterrupted project compilation and enhancing compatibility.
+This critical update is the cornerstone of patch v4.3.1, deployed simultaneously with ESPHome to ensure NSPanel users experience no disruption in service.
+This adaptation ensures that NSPanel firmware remains fully functional and up-to-date with ESPHome's latest advancements,
+reaffirming our commitment to providing a seamless and stable user experience.
+
+### Button Bars Visibility Enhancement and Configuration Change
+- **Criticality:** Breaking Change (with Enhancement)
+- **Affected Components:** Blueprint
+- **Description:** The visibility of button bars, indicating the status of entities linked to hardware buttons,
+has been updated to be visible across all pages by default, including the screensaver.
+This enhancement improves the accessibility of crucial status information.
+Users who previously customized the visibility settings for button bars will need to review and adjust their configurations to align with the new default behavior.
+This change enables users to selectively exclude button bars from specific pages if desired, providing greater flexibility and control over the interface's appearance.
+
+### Service `hw_button_state` Update
+- **Criticality:** Breaking Change (with Enhancement)
+- **Affected Components:** Blueprint and ESPHome
+- **Description:** The method for controlling the state of hardware buttons has been refined with the introduction of a `button_mask` parameter.
+This update simplifies the process of simultaneously updating the visual state of multiple hardware buttons,
+enhancing user interaction by providing a more intuitive interface for managing button states.
+Users can now specify the buttons they wish to control using a single `button_mask` parameter,
+offering a streamlined approach for activating or deactivating the on-screen indication bars of the hardware buttons.
+This change fosters a more flexible and efficient user experience in configuring the visual feedback for button states.
+
+### Celsius Display Issue for Embedded Temperature Sensor Resolved (#1834)
+- **Criticality:** Medium
+- **Affected Components:** ESPHome
+- **Description:** Addressed an issue where the NSPanel's built-in temperature sensor incorrectly displayed temperature readings in Celsius, even when Fahrenheit was expected.
+This fix ensures temperature readings are accurately represented according to the user's settings, improving usability and consistency across the system.
+
+### Resolution for Panel Naming When `device_name` Is Not Provided (#1907)
+- **Criticality:** Medium
+- **Affected Components:** ESPHome
+- **Description:** Corrected a bug that caused the new "Device Name" sensor to report "nspanel"
+and therefore fail on defining services names when a `device_name` substitution was not specified by the user.
+
+### External Temperature Sensor Selection Now Correctly Overrides Embedded Sensor Value (#1911)
+- **Criticality:** Medium
+- **Affected Components:** Blueprint and ESPHome
+- **Description:** Fixed a display issue where the built-in sensor's temperature reading persisted despite configuration for an external sensor.
+
+### Utilities Dashboard Now Correctly Omits Default Labels When Customized (#1899)
+- **Criticality:** Minor
+- **Affected Components:** Blueprint
+- **Description:** Enhanced the utilities dashboard by ensuring custom labels properly replace or remove default ones for a personalized display.
+
+### Clarification and Improvements to `rtttl_play` Service Documentation (#1901 and #1912)
+- **Criticality:** Minor
+- **Affected Components:** Documentation
+- **Description:** Updated documentation for clearer guidance on using the `rtttl_play` service for custom sounds and alerts.
+
+### Correction of Missing Icon Display Issue on Entities Page 3 (#1902)
+- **Criticality:** Minor
+- **Affected Components:** TFT
+- **Description:** Addressed a bug preventing certain icons from displaying on the third Entities page, ensuring a consistent user interface.
+
+### Icons No Longer Appear "Disabled" for Sensor Values of 0.0 (#1902)
+- **Criticality:** Minor
+- **Affected Components:** Blueprint
+- **Description:** Resolved an incorrect icon color display issue where they appeared disabled at a sensor value of exactly 0.0.
+
+### Vertical Alignment Improvements on Entities Pages for Enhanced Readability (#1903)
+- **Criticality:** Minor
+- **Affected Components:** TFT
+- **Description:** Adjusted the vertical alignment of text and icons on Entities pages for a more visually appealing presentation.
+
+### Enhanced Guidance on Handling Duplicated Entities on the Device's Page (#1905)
+- **Criticality:** Minor
+- **Affected Components:** Documentation
+- **Description:** Updated documentation to better address and resolve issues related to entity duplication on the device's page on Home Assistant.
+
+### Compilation Guidance Updated for Customizations with the Latest Version (#1914)
+- **Criticality:** Minor
+- **Affected Components:** Documentation
+- **Description:** Resolved documentation issues leading to compilation errors during customization, facilitating smoother custom feature implementation.
+
+### Elimination of Transient Icon Flashes on the Home Page During Page Transitions (#1915)
+- **Criticality:** Minor
+- **Affected Components:** Blueprint,  ESPHome and TFT
+- **Description:** Fixed a visual glitch where icons briefly flashed during transitions, streamlining the visual experience.
+
+### Real-Time Brightness Adjustment Now Effective Even During Sleep Mode (#1919)
+- **Criticality:** Minor
+- **Affected Components:** ESPHome
+- **Description:** Ensured brightness settings changes are immediately applied, even when the panel is in sleep mode.
+
+### Smooth Cursor Movement on Utilities Page Near Zero Sensor Readings (#1926)
+- **Criticality:** Minor
+- **Affected Components:** Blueprint
+- **Description:** Ensured cursor movement on the Utilities page is smooth and accurate, even with sensor readings defining the cursor direction is between 0 and 1.
+
+### Notification Screen Clearing Now Functional with `notification_clear` Service Call (#1931)
+- **Criticality:** Minor
+- **Affected Components:** ESPHome
+- **Description:** Enabled clear display of notifications from the screen upon invoking the `notification_clear` service, enhancing display control.
+
+### Page Indicator Removed for Single-Page Views (#1883)
+- **Criticality:** Enhancement
+- **Affected Components:** TFT
+- **Description:** Improved UI by removing unnecessary page indicators when only one page is present, simplifying navigation.
+
+### Entities Page Font Adjustment for CJK Fonts Improved (#1884)
+- **Criticality:** Enhancement
+- **Affected Components:** ESPHome
+- **Description:** Optimized font sizing and display on Entities pages for CJK fonts, addressing readability issues.
+
+### User Option Added to Disable Entities Page Icons for a Text-Focused View (#1885)
+- **Criticality:** Enhancement
+- **Affected Components:** Blueprint
+- **Description:** Introduced an option to disable icons on Entities pages, allowing for a simplified, text-only display.
+
+### Utilities Page Line Cursor Size Customization Option Added (#1910)
+- **Criticality:** Enhancement
+- **Affected Components:** Blueprint
+- **Description:** Provided customization options for cursor size on the Utilities dashboard, enhancing data visualization.
+
+### Temperature Measurement Sampling Enhancement (#1918)
+- **Criticality:** Enhancement
+- **Affected Components:** ESPHome
+- **Description:** Enhanced the temperature reporting mechanism of the NSPanel's built-in temperature sensor by implementing a sampling method.
+Now, the sensor collects 12 intermediate measurements and calculates their average before reporting the temperature.
+This enhancement, which does not alter the 1-minute measurement interval, aims to provide smoother and more stable temperature readings,
+improving accuracy and reliability for users monitoring their environment.
+
+### Boot Page Visual Feedback Enhancements for Clearer System Status Display (#1923)
+- **Criticality:** Enhancement
+- **Affected Components:** ESPHome and TFT
+- **Description:** Updated the Boot page to offer clearer visual feedback on version information and system status, with a new progress bar.

 ## Support
 For support or more information about this update,
@@ -236,6 +375,7 @@ Your efforts have significantly improved its functionality and reliability (#183
 Your contributions have made our guides more informative and accessible, enriching the user experience for everyone (#1865).

 ## Previous releases
+- [v4.3 - Welcome to Framework ESP-IDF, an Utilities Dashboard and Enhanced Localization](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.0)
 - [v4.2.6 - Enhancing Stability and User Experience](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.2.6)
 - [v4.2.5 - Celebrating 1000 Stars with Enhanced Functionality and UI Improvements](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.2.5)
 - [v4.2.4 - Critical bug fixes](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.2.4)
--- a/components/nspanel_ha_blueprint/pages.h
+++ b/components/nspanel_ha_blueprint/pages.h
@@ -12,7 +12,7 @@ namespace nspanel_ha_blueprint {

    /**
    * @file pages.h
-    * Defines constants and functions related to page names for "NSPanel HA Blueprint" project..
+    * Defines constants and functions related to page names for "NSPanel HA Blueprint" project.
    */

    // Constants
@@ -22,6 +22,7 @@ namespace nspanel_ha_blueprint {
    * such as settings, home, weather information, and more.
    */
    constexpr std::array<const char*, 28> page_names = {
+        "boot",
        "home",
        "weather01",
        "weather02",
@@ -30,7 +31,6 @@ namespace nspanel_ha_blueprint {
        "weather05",
        "climate",
        "settings",
-        "boot",
        "screensaver",
        "light",
        "cover",
--- a/docs/README.md
+++ b/docs/README.md
@@ -6,9 +6,9 @@
 - [Version compatibility matrix](version_compatibility.md)

 ## Common issues
- [TFT Upload](tft_upload.md)
- [Stuck on Initializing](error_initializing.md)
+- [Panel startup issues](error_initializing.md)
 - [Compiling Errors](error_compiling.md)
+- [TFT Upload](tft_upload.md)

 ## Advanced settings
 - [Customization](customization.md)
--- a/docs/api.md
+++ b/docs/api.md
@@ -254,26 +254,27 @@ data:
 > This setup provides a direct and user-friendly way to access and return from detailed entity information, enhancing the interface's usability.

 ### Hardware Button State Indication Service: `hw_button_state`
-Updates the on-screen indication bars for the hardware buttons, reflecting the current state of the entities they control.
+This service dynamically updates the on-screen indication bars for the hardware buttons, reflecting the current state of the entities they control.
+It's designed to provide immediate visual feedback, enhancing the user interface by showing the active/inactive state of the left and right hardware button indicators on the panel.

-**Usage:**
-This service updates the visual state (on/off) of the left and right hardware button indicators on the panel.
-It's used to provide visual feedback corresponding to the state of the entities controlled by these hardware buttons.
+**Usage:**  
+Utilize this service to modify the visual state (on/off) of hardware button indicators on the panel, corresponding to the state of entities controlled by these buttons.
+This allows for visual feedback that matches the operational state of the buttons.

-**Parameters:**
- `left` (bool): The state to set for the left button's indication bar.
- `right` (bool): The state to set for the right button's indication bar.
+**Parameters:**  
+- `button_mask` (int): A bitwise identifier for buttons. Use `1` for the left button, `2` for the right button, and `3` for both buttons.
+- `state` (bool): The state to apply to the button(s) indicated by `button_mask`. True for on (active), false for off (inactive).

 **Home Assistant Example:**
 ```yaml
 service: esphome.<your_panel_name>_hw_button_state
 data:
-  left: true   # Turns the left button's indication bar on
-  right: false # Turns the right button's indication bar off
+  button_mask: 3  # Targets both the left (1) and right (2) buttons
+  state: true     # Turns the indication bars on for both buttons
 ```
 > [!NOTE]
 > Replace `<your_panel_name>` with your specific panel name as configured in Home Assistant.
-> This service dynamically updates the hardware button state indications, enhancing the user interface by providing immediate visual feedback.
+> This service leverages a bitmask (`button_mask`) for flexible control over multiple hardware buttons simultaneously, offering a streamlined method for updating their visual states.

 ### Icon Service: `icon`
 Updates a chip or custom button's icon, color, and visibility within Home Assistant.
@@ -693,7 +694,7 @@ For example tones and further inspiration, you can visit examples of RTTTL songs
 ```yaml
 service: esphome.<your_panel_name>_rtttl_play
 data:
-  tone: "d=4,o=5,b=140:c,e,g,8p,c6,e6,g6,8p,c7,p"
+  tone: "The Simpsons:d=4,o=5,b=160:c.6,e6,f#6,8a6,g.6,e6,c6,8a,8f#,8f#,8f#,2g,8p,8p,8f#,8f#,8f#,8g,a#.,8c6,8c6,8c6,c6"
 ```
 > [!NOTE]
 > Replace `<your_panel_name>` with your specific panel name as configured in Home Assistant to ensure correct service execution.
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -288,7 +288,7 @@ binary_sensor:
    id: display_state
    platform: template
    lambda: |-
-      return (id(current_page).state != "screensaver");
+      return (current_page->state != "screensaver");
 ```

 You can easily invert the meaning to have a sensor for display sleeping:
@@ -300,7 +300,7 @@ binary_sensor:
    id: display_sleeping
    platform: template
    lambda: |-
-      return (id(current_page).state == "screensaver");
+      return (current_page->state == "screensaver");
 ```

 ### Deep sleep
@@ -373,7 +373,7 @@ button:
      then:
        - logger.log: Button Sleep pressed
        - lambda: |-
-            if (id(current_page).state != "screensaver") id(disp1).goto_page("screensaver");
+            goto_page->execute("screensaver");
  
  # Adds a button to wake-up the panel (similar to the existing service)
  - name: Wake-up
@@ -384,10 +384,10 @@ button:
      then:
        - logger.log: Button Wake-up pressed
        - lambda: |-
-            if (id(current_page).state == "screensaver") id(disp1).goto_page(id(wakeup_page_name).state.c_str());
-            // id(timer_page).execute(id(wakeup_page_name).state.c_str()); // enable this if you want page timeout to be reset
-            id(timer_sleep).execute(id(wakeup_page_name).state.c_str(), int(id(timeout_sleep).state));
-            id(timer_dim).execute(id(wakeup_page_name).state.c_str(), int(id(timeout_dim).state));
+            if (current_page->state == "screensaver") id(disp1).goto_page(id(wakeup_page_name).state.c_str());
+            // timer_page->execute(); // enable this if you want page timeout to be reset
+            timer_sleep->execute();
+            timer_dim->execute();
 ```

 ### Set display as a light
@@ -408,12 +408,12 @@ light:
        - lambda: |-
            ESP_LOGD("light.display_light", "Turn-on");
            if (current_page->state == "screensaver") disp1->goto_page(wakeup_page_name->state.c_str());
-            timer_reset_all->execute(wakeup_page_name->state.c_str());
+            timer_reset_all->execute();
    on_turn_off:
      then:
        - lambda: |-
            ESP_LOGD("light.display_light", "Turn-off");
-            disp1->goto_page("screensaver");
+            goto_page->execute("screensaver");

 output:
  # Output required by `display_light` to send the commands to Nextion
@@ -432,12 +432,12 @@ script:
  - id: !extend page_changed
    then:
      - lambda: |-
-          ESP_LOGD("script.page_changed(custom)", "page: %s", page.c_str());
+          ESP_LOGD("script.page_changed(custom)", "page: %s", current_page->state.c_str());
          ESP_LOGV("script.page_changed(custom)", "is_on(): %s", display_light->current_values.is_on() ? "True" : "False");
-          if (page == "screensaver" and display_light->current_values.is_on()) {
+          if (current_page->state == "screensaver" and display_light->current_values.is_on()) {
            auto call = display_light->turn_off();
            call.perform();
-          } else if (page != "screensaver" and (not display_light->current_values.is_on())) {
+          } else if (current_page->state != "screensaver" and (not display_light->current_values.is_on())) {
            auto call = display_light->turn_on();
            call.perform();
          }
@@ -737,11 +737,11 @@ switch:
    lambda: |-
      return (id(relay_settings) & nspanel_ha_blueprint::RelaySettings::Relay1_Local);
    turn_on_action:
-      - lambda: nspanel_ha_blueprint::update_relay_setting(id(relay_settings), true, RelaySettings::Relay1_Local);
+      - lambda: nspanel_ha_blueprint::update_bitwise_setting(id(relay_settings), true, RelaySettings::Relay1_Local);
    on_turn_on:
      - logger.log: "Relay 1 Local turned On!"
    turn_off_action:
-      - lambda: nspanel_ha_blueprint::update_relay_setting(id(relay_settings), false, RelaySettings::Relay1_Local);
+      - lambda: nspanel_ha_blueprint::update_bitwise_setting(id(relay_settings), false, RelaySettings::Relay1_Local);
    on_turn_off:
      - logger.log: "Relay 1 Local turned Off!"
  - name: Relay 2 Local
@@ -751,11 +751,11 @@ switch:
    internal: false
    lambda: return (id(relay_settings) & nspanel_ha_blueprint::RelaySettings::Relay2_Local);
    turn_on_action:
-      - lambda: nspanel_ha_blueprint::update_relay_setting(id(relay_settings), true, RelaySettings::Relay2_Local);
+      - lambda: nspanel_ha_blueprint::update_bitwise_setting(id(relay_settings), true, RelaySettings::Relay2_Local);
    on_turn_on:
      - logger.log: "Relay 2 Local turned On!"
    turn_off_action:
-      - lambda: nspanel_ha_blueprint::update_relay_setting(id(relay_settings), false, RelaySettings::Relay2_Local);
+      - lambda: nspanel_ha_blueprint::update_bitwise_setting(id(relay_settings), false, RelaySettings::Relay2_Local);
    on_turn_off:
      - logger.log: "Relay 2 Local turned Off!"
 ```
--- a/docs/error_initializing.md
+++ b/docs/error_initializing.md
@@ -76,6 +76,9 @@ You can use this button to force a reboot of your panel. This button is availabl

 ![Blueprint icon on red](pics/us_home_blueprint_icon_red.png)

+In some cases you can also see duplicate entities on the device's page in Home Assistant, and some of these entities may have the `entity_id` ending with `_2`, `_3`, etc.
+![image](https://github.com/Blackymas/NSPanel_HA_Blueprint/assets/9100568/51a5fce4-89cc-43e8-9d92-1f83d7ea2ee5)
+
 <!-- markdownlint-disable MD013 MD033 -->
 | Possible causes | Suggestions |
 | :-- | :-- |
--- a/docs/howto.md
+++ b/docs/howto.md
@@ -292,7 +292,7 @@ By repeatedly calling this service whenever motion is detected, the panel can be

 HA can send a RTTTL to the NSPanel, custom melodies are possible.

-The use this function, the following service is called: ***nspanel_play_rtttl*** 
+The use this function, the following service is called: `rtttl_play`

 You can find many RTTTL strings on the web, the important thing is that they must start with the name and then a colon.

@@ -302,7 +302,7 @@ Here is an example:
 The Simpsons:d=4,o=5,b=160:c.6,e6,f#6,8a6,g.6,e6,c6,8a,8f#,8f#,8f#,2g,8p,8p,8f#,8f#,8f#,8g,a#.,8c6,8c6,8c6,c6
 ```

-![image-20230320222454441](pics/image-20230320222454441.png)
+![HA - Developer Tools - Services - RTTTL Play](pics/ha_developer_tools_services_rtttl_play.png)

 More information: https://esphome.io/components/rtttl.html#common-beeps

--- a/docs/pics/ha_developer_tools_services_rtttl_play.png
+++ b/docs/pics/ha_developer_tools_services_rtttl_play.png
--- a/docs/pics/image-20230320222454441.png
+++ b/docs/pics/image-20230320222454441.png
--- a/docs/version_compatibility.md
+++ b/docs/version_compatibility.md
@@ -3,7 +3,8 @@
 <!-- markdownlint-disable MD013 MD033 -->
 | NSPanel_HA_Blueprint<br><sub><sup>Version</sup></sub> | Home Assistant<br><sub><sup>Min version</sup></sub> | ESPHome<br><sub><sup>Min version</sup></sub> |
 | :--: | :--: | :--: |
-| v4.3 | 2024.3.0 | 2023.12.0 |
+| v4.3.1 | 2024.3.0 | 2024.3.0 |
+| v4.3.0 | 2024.3.0 | 2023.12.0 |
 | v4.2.2+ | 2023.12.0 | 2023.12.0 |
 | v4.2.1<br>v4.2 | 2023.9.0 | 2023.12.0 |
 | v4.1 | 2023.9.0 | 2023.5.0 |
--- a/esphome/nspanel_esphome_addon_climate_base.yaml
+++ b/esphome/nspanel_esphome_addon_climate_base.yaml
@@ -125,7 +125,7 @@ script:
            bool temp_unit_fahrenheit = (temp_units == "°F" || temp_units == "F" || temp_units == "°f" || temp_units == "f");
            ClimateTraits traits = thermostat_embedded->get_traits();

-            disp1->set_component_text_printf("page_label", id(addon_climate_friendly_name).c_str());
+            disp1->set_component_text("page_label", id(addon_climate_friendly_name).c_str());
            float temp_step = traits.get_visual_target_temperature_step();
            float temp_offset = traits.get_visual_min_temperature();
            float temp_max = traits.get_visual_max_temperature();
--- a/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -136,23 +136,21 @@ script:
      - lambda: |-
          ESP_LOGD("addon_upload_tft.script.open_upload_dialog", "Showing upload dialog page");
          disp1->goto_page("confirm");
-          page_id->update();
      - wait_until:
          condition:
-            - lambda: return (page_id->state == 26);
+            - lambda: return (current_page->state == "confirm");
          timeout: 2s
      - lambda: |-
-          if (page_id->state == 26) {
+          if (current_page->state == "confirm") {
            disp1->hide_component("bclose");
            disp1->hide_component("bt_accept");
            disp1->hide_component("bt_clear");
          }
          #ifdef ARDUINO
-          disp1->set_component_text_printf("confirm.title", "Upload TFT\\rArduino");
+          disp1->set_component_text("confirm.title", "Upload TFT\\rArduino");
          #elif defined(USE_ESP_IDF)
-          disp1->set_component_text_printf("confirm.title", "Upload TFT\\rESP-IDF");
+          disp1->set_component_text("confirm.title", "Upload TFT\\rESP-IDF");
          #endif
-          page_id->update();

  - id: report_upload_progress
    mode: restart
@@ -160,11 +158,9 @@ script:
      message: string
    then:
      - lambda: |-
-          ESP_LOGD("addon_upload_tft.script.report_upload_progress", "%s", message.c_str());
+          ESP_LOGD("addon_upload_tft.script.report_upload_progress", message.c_str());
          if (id(tft_is_valid)) {
-            if (page_id->state != 26) {
-              open_upload_dialog->execute();
-            }
+            if (current_page->state != "confirm") open_upload_dialog->execute();
            display_wrapped_text->execute("confirm.body", message.c_str(), 18);
            disp1->set_backlight_brightness(1);
            App.feed_wdt();
@@ -207,10 +203,9 @@ script:
      - delay: 2s
      - script.execute: open_upload_dialog
      - script.wait: open_upload_dialog
-      - lambda: page_id->update();
      - wait_until:
          condition:
-            - lambda: return (page_id->state == 26);
+            - lambda: return (current_page->state == "confirm");
          timeout: 2s
      - script.execute:
          id: report_upload_progress
--- a/esphome/nspanel_esphome_advanced.yaml
+++ b/esphome/nspanel_esphome_advanced.yaml
@@ -11,6 +11,7 @@ substitutions:
  ##############################
  ## Change only in your      ##
  ## local yaml substitutions ##
+  ap_password: ${wifi_password}
  web_password: ${wifi_password}
  ##############################

@@ -102,4 +103,9 @@ web_server:
  auth:
    username: admin
    password: ${web_password}
+
+wifi:
+  ap:
+    ssid: "${name}"
+    password: ${ap_password}
 ...
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
--- a/hmi/dev/create_us_land_and_CJK_hmi_from_original.md
+++ b/hmi/dev/create_us_land_and_CJK_hmi_from_original.md
@@ -5,6 +5,9 @@
 - **Program.s:**
    - Change to `display_mode=3`

+- **Page boot:**
+    - Change component `progress` (the progress bar in the very bottom) width to 480.
+
 ## Creating `nspanel_CJK_xxx.HMI` from `nspanel_xxx.HMI`

 - **Program.s:**
--- a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
    int p=0,q=0,t=0,f=0
    int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
    int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
-    int back_page_id=0
+    int back_page_id=1
    int dimdelta=0
    int api=0 // 0 = disconnected from HA, 1 = connected to HA
    int is_utilities=0
@@ -20,4 +20,4 @@ Program.s
    {
      lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version
    }
-    page 8//Power on start page boot
+    page 0//Power on start page boot
--- a/hmi/dev/nspanel_CJK_eu_code/alarm.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/alarm.txt
@@ -24,7 +24,12 @@ Page alarm
                vis bt_bypass,0
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "alarm",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/boot.txt
@@ -12,11 +12,16 @@ Page boot
    
    Events
        Preinitialize Event
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "boot",0
+            printh 00
+            printh FF FF FF
            dim=100
            covx baud,baud_rate.txt,0,0
            baud_rate.txt+=" bps"
            vis unavailable,0
-            sendme
        
        Page Exit Event
            dim=0
@@ -27,13 +32,6 @@ Variable (int32) counter
        Scope: local
        Value: 0
    
-Variable (string) aux1
-    Attributes
-        ID            : 12
-        Scope         : local
-        Text          : 
-        Max. Text Size: 10
-    
 Text ip_addr
    Attributes
        ID                 : 1
@@ -101,7 +99,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0
+        Text               : 4.3.1b1
        Max. Text Size     : 9
    
 Text esph_version
@@ -111,8 +109,8 @@ Text esph_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 
-        Max. Text Size     : 9
+        Text               : Waiting...
+        Max. Text Size     : 10
    
 Text bluep_version
    Attributes
@@ -121,12 +119,12 @@ Text bluep_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 
-        Max. Text Size     : 9
+        Text               : Waiting...
+        Max. Text Size     : 10
    
 Text baud_rate
    Attributes
-        ID                 : 14
+        ID                 : 13
        Scope              : local
        Dragging           : 0
        Send Component ID  : on press and release
@@ -136,7 +134,7 @@ Text baud_rate
    
 Text framework
    Attributes
-        ID                 : 15
+        ID                 : 14
        Scope              : local
        Dragging           : 0
        Send Component ID  : on press and release
@@ -146,7 +144,7 @@ Text framework
    
 Text unavailable
    Attributes
-        ID                 : 16
+        ID                 : 15
        Scope              : local
        Dragging           : 0
        Send Component ID  : disabled
@@ -154,6 +152,14 @@ Text unavailable
        Text               : 
        Max. Text Size     : 1
    
+Progress Bar progress
+    Attributes
+        ID               : 16
+        Scope            : global
+        Dragging         : 0
+        Send Component ID: disabled
+        Value            : 0
+    
 Dual-state Button bt_reboot
    Attributes
        ID               : 4
@@ -173,19 +179,28 @@ Dual-state Button bt_reboot
        
 Timer tm_esphome
    Attributes
-        ID         : 13
+        ID         : 12
        Scope      : local
-        Period (ms): 10000
+        Period (ms): 1000
        Enabled    : yes
    
    Events
        Timer Event
+            if(tm_esphome.tim!=10000)
+            {
+                tm_esphome.tim=10000
+            }
            counter.val++
            if(counter.val>30)
            {
                rest
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "boot",0
+            printh 00
+            printh FF FF FF
            printh 91
            prints "display_mode",0
            printh 00
@@ -197,13 +212,11 @@ Timer tm_esphome
            prints charset,0
            printh FF FF FF
            printh 92
-            prints "tft_version",0
+            prints "boot.tft_version",0
            printh 00
            prints tft_version.txt,0
            printh 00
            printh FF FF FF
-            covx counter.val,aux1.txt,0,0
-            esph_version.txt="Retry #"+aux1.txt
            sys0=counter.val%10
            if(sys0==0)
            {
--- a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt
@@ -20,22 +20,31 @@ Page buttonpage01
                vis 255,0
                vis button_back,1
                vis page_label,1
-                page_index.txt+="â—"
-                if(is_buttonpage02==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    page_index.txt+="â—"
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage01",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt
@@ -20,22 +20,31 @@ Page buttonpage02
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                page_index.txt+="â—"
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage02",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt
@@ -20,22 +20,31 @@ Page buttonpage03
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                if(is_buttonpage02==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                page_index.txt+="â—"
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage03",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt
@@ -20,22 +20,31 @@ Page buttonpage04
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    vis page_index,1
                }
-                if(is_buttonpage02==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                page_index.txt+="â—"
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage04",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/climate.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/climate.txt
@@ -33,7 +33,12 @@ Page climate
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "climate",0
+            printh 00
+            printh FF FF FF
        
        Page Exit Event
            covx embedded.val,va2.txt,0,0
--- a/hmi/dev/nspanel_CJK_eu_code/confirm.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/confirm.txt
@@ -17,7 +17,12 @@ Page confirm
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "confirm",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) page_id
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/cover.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/cover.txt
@@ -17,7 +17,12 @@ Page cover
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "cover",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) va1
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt
@@ -17,20 +17,32 @@ Page entitypage01
                page home
            }
            vis unavailable,0
-            page_index.txt+="â—"
-            if(is_entitypage02==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage03==1)
+                page_index.txt+="â—"
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage01",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt
@@ -17,20 +17,32 @@ Page entitypage02
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            page_index.txt+="â—"
-            if(is_entitypage03==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage02",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt
@@ -17,20 +17,32 @@ Page entitypage03
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage02==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            page_index.txt+="â—"
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage03",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
@@ -122,7 +134,7 @@ Text value08_label
        Text               : 
        Max. Text Size     : 60
    
-Text value01_pic
+Text value01_icon
    Attributes
        ID                 : 12
        Scope              : local
--- a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt
@@ -17,20 +17,32 @@ Page entitypage04
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage02==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage03==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            page_index.txt+="â—"
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage04",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/fan.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/fan.txt
@@ -18,7 +18,12 @@ Page fan
            }
            vis unavailable,0
            vis bt_oscillate,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "fan",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) fansetting
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/home.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/home.txt
@@ -12,6 +12,16 @@ Page home
    
    Events
        Preinitialize Event
+            if(boot.progress.val<100)
+            {
+                page boot
+            }
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "home",0
+            printh 00
+            printh FF FF FF
            back_page_id=0
            if(qrcode.qrcode_value.txt=="")
            {
@@ -31,7 +41,6 @@ Page home
                vis right_bt_text,0
            }
            vis unavailable,0
-            sendme
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt
@@ -17,7 +17,12 @@ Page keyb_num
                page page_id.val
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "keyb_num",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) page_id
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/light.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/light.txt
@@ -37,7 +37,12 @@ Page light
                vis color_button,0
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "light",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) rgb565
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/media_player.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/media_player.txt
@@ -17,7 +17,12 @@ Page media_player
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "media_player",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/notification.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/notification.txt
@@ -17,7 +17,12 @@ Page notification
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "notification",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/qrcode.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/qrcode.txt
@@ -13,7 +13,12 @@ Page qrcode
    Events
        Preinitialize Event
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "qrcode",0
+            printh 00
+            printh FF FF FF
        
 Text qrcode_label
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/screensaver.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/screensaver.txt
@@ -15,7 +15,12 @@ Page screensaver
            vis text,0
            dim=brightness_sleep
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "screensaver",0
+            printh 00
+            printh FF FF FF
        
        Touch Release Event
            page back_page_id
--- a/hmi/dev/nspanel_CJK_eu_code/settings.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/settings.txt
@@ -19,7 +19,12 @@ Page settings
            vis lbl_sleep,0
            vis bt_sleep,0
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "settings",0
+            printh 00
+            printh FF FF FF
        
 Text bright_text
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/utilities.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/utilities.txt
@@ -20,7 +20,12 @@ Page utilities
            vis title_icon,1
            vis title,1
            vis button_back,1
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "utilities",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) line_main_d
    Attributes
@@ -111,7 +116,7 @@ Text home_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Home
+        Text               : 
        Max. Text Size     : 10
    
 Text home
@@ -151,7 +156,7 @@ Text grid_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Grid
+        Text               : 
        Max. Text Size     : 10
    
 Text grid
@@ -191,7 +196,7 @@ Text group01_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group01
@@ -231,7 +236,7 @@ Text group02_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group02
@@ -271,7 +276,7 @@ Text group03_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group03
@@ -311,7 +316,7 @@ Text group04_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group04
@@ -351,7 +356,7 @@ Text group05_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group05
@@ -391,7 +396,7 @@ Text group06_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group06
--- a/hmi/dev/nspanel_CJK_eu_code/weather01.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/weather01.txt
@@ -17,7 +17,12 @@ Page weather01
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather01",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/weather02.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/weather02.txt
@@ -17,7 +17,12 @@ Page weather02
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather02",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/weather03.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/weather03.txt
@@ -17,7 +17,12 @@ Page weather03
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather03",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/weather04.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/weather04.txt
@@ -17,7 +17,12 @@ Page weather04
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather04",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_eu_code/weather05.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/weather05.txt
@@ -17,7 +17,12 @@ Page weather05
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather05",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/Program.s.txt
+++ b/hmi/dev/nspanel_CJK_us_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
    int p=0,q=0,t=0,f=0
    int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
    int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
-    int back_page_id=0
+    int back_page_id=1
    int dimdelta=0
    int api=0 // 0 = disconnected from HA, 1 = connected to HA
    int is_utilities=0
@@ -20,4 +20,4 @@ Program.s
    {
      lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version
    }
-    page 8//Power on start page boot
+    page 0//Power on start page boot
--- a/hmi/dev/nspanel_CJK_us_code/alarm.txt
+++ b/hmi/dev/nspanel_CJK_us_code/alarm.txt
@@ -24,7 +24,12 @@ Page alarm
                vis bt_bypass,0
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "alarm",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_us_code/boot.txt
@@ -12,11 +12,16 @@ Page boot
    
    Events
        Preinitialize Event
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "boot",0
+            printh 00
+            printh FF FF FF
            dim=100
            covx baud,baud_rate.txt,0,0
            baud_rate.txt+=" bps"
            vis unavailable,0
-            sendme
        
        Page Exit Event
            dim=0
@@ -27,13 +32,6 @@ Variable (int32) counter
        Scope: local
        Value: 0
    
-Variable (string) aux1
-    Attributes
-        ID            : 12
-        Scope         : local
-        Text          : 
-        Max. Text Size: 10
-    
 Text ip_addr
    Attributes
        ID                 : 1
@@ -101,7 +99,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0
+        Text               : 4.3.1b1
        Max. Text Size     : 9
    
    Events
@@ -118,8 +116,8 @@ Text esph_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 
-        Max. Text Size     : 9
+        Text               : Waiting...
+        Max. Text Size     : 10
    
 Text bluep_version
    Attributes
@@ -128,12 +126,12 @@ Text bluep_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 
-        Max. Text Size     : 9
+        Text               : Waiting...
+        Max. Text Size     : 10
    
 Text baud_rate
    Attributes
-        ID                 : 14
+        ID                 : 13
        Scope              : local
        Dragging           : 0
        Send Component ID  : on press and release
@@ -143,7 +141,7 @@ Text baud_rate
    
 Text framework
    Attributes
-        ID                 : 15
+        ID                 : 14
        Scope              : local
        Dragging           : 0
        Send Component ID  : on press and release
@@ -153,7 +151,7 @@ Text framework
    
 Text unavailable
    Attributes
-        ID                 : 16
+        ID                 : 15
        Scope              : local
        Dragging           : 0
        Send Component ID  : disabled
@@ -161,6 +159,14 @@ Text unavailable
        Text               : 
        Max. Text Size     : 1
    
+Progress Bar progress
+    Attributes
+        ID               : 16
+        Scope            : global
+        Dragging         : 0
+        Send Component ID: disabled
+        Value            : 0
+    
 Dual-state Button bt_reboot
    Attributes
        ID               : 4
@@ -180,19 +186,28 @@ Dual-state Button bt_reboot
        
 Timer tm_esphome
    Attributes
-        ID         : 13
+        ID         : 12
        Scope      : local
-        Period (ms): 10000
+        Period (ms): 1000
        Enabled    : yes
    
    Events
        Timer Event
+            if(tm_esphome.tim!=10000)
+            {
+                tm_esphome.tim=10000
+            }
            counter.val++
            if(counter.val>30)
            {
                rest
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "boot",0
+            printh 00
+            printh FF FF FF
            printh 91
            prints "display_mode",0
            printh 00
@@ -204,13 +219,11 @@ Timer tm_esphome
            prints charset,0
            printh FF FF FF
            printh 92
-            prints "tft_version",0
+            prints "boot.tft_version",0
            printh 00
            prints tft_version.txt,0
            printh 00
            printh FF FF FF
-            covx counter.val,aux1.txt,0,0
-            esph_version.txt="Retry #"+aux1.txt
            sys0=counter.val%10
            if(sys0==0)
            {
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt
@@ -20,22 +20,31 @@ Page buttonpage01
                vis 255,0
                vis button_back,1
                vis page_label,1
-                page_index.txt+="â—"
-                if(is_buttonpage02==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    page_index.txt+="â—"
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage01",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt
@@ -20,22 +20,31 @@ Page buttonpage02
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                page_index.txt+="â—"
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage02",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt
@@ -20,22 +20,31 @@ Page buttonpage03
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                if(is_buttonpage02==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                page_index.txt+="â—"
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage03",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt
@@ -19,10 +19,32 @@ Page buttonpage04
            {
                vis 255,0
                vis button_back,1
-                vis page_index,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    vis page_index,1
+                }
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage04",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/climate.txt
+++ b/hmi/dev/nspanel_CJK_us_code/climate.txt
@@ -33,7 +33,12 @@ Page climate
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "climate",0
+            printh 00
+            printh FF FF FF
        
        Page Exit Event
            covx embedded.val,va2.txt,0,0
--- a/hmi/dev/nspanel_CJK_us_code/confirm.txt
+++ b/hmi/dev/nspanel_CJK_us_code/confirm.txt
@@ -17,7 +17,12 @@ Page confirm
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "confirm",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) page_id
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/cover.txt
+++ b/hmi/dev/nspanel_CJK_us_code/cover.txt
@@ -17,7 +17,12 @@ Page cover
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "cover",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) va1
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt
@@ -17,20 +17,32 @@ Page entitypage01
                page home
            }
            vis unavailable,0
-            page_index.txt+="â—"
-            if(is_entitypage02==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage03==1)
+                page_index.txt+="â—"
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage01",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt
@@ -17,20 +17,32 @@ Page entitypage02
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            page_index.txt+="â—"
-            if(is_entitypage03==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage02",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt
@@ -17,20 +17,32 @@ Page entitypage03
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage02==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            page_index.txt+="â—"
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage03",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt
@@ -17,20 +17,32 @@ Page entitypage04
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage02==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage03==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            page_index.txt+="â—"
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage04",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/fan.txt
+++ b/hmi/dev/nspanel_CJK_us_code/fan.txt
@@ -18,7 +18,12 @@ Page fan
            }
            vis unavailable,0
            vis bt_oscillate,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "fan",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) fansetting
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/home.txt
+++ b/hmi/dev/nspanel_CJK_us_code/home.txt
@@ -12,6 +12,16 @@ Page home
    
    Events
        Preinitialize Event
+            if(boot.progress.val<100)
+            {
+                page boot
+            }
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "home",0
+            printh 00
+            printh FF FF FF
            back_page_id=0
            if(qrcode.qrcode_value.txt=="")
            {
@@ -31,7 +41,6 @@ Page home
                vis right_bt_text,0
            }
            vis unavailable,0
-            sendme
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/keyb_num.txt
+++ b/hmi/dev/nspanel_CJK_us_code/keyb_num.txt
@@ -17,7 +17,12 @@ Page keyb_num
                page page_id.val
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "keyb_num",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) page_id
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/light.txt
+++ b/hmi/dev/nspanel_CJK_us_code/light.txt
@@ -37,7 +37,12 @@ Page light
                vis color_button,0
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "light",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) rgb565
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/media_player.txt
+++ b/hmi/dev/nspanel_CJK_us_code/media_player.txt
@@ -17,7 +17,12 @@ Page media_player
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "media_player",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/notification.txt
+++ b/hmi/dev/nspanel_CJK_us_code/notification.txt
@@ -17,7 +17,12 @@ Page notification
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "notification",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/qrcode.txt
+++ b/hmi/dev/nspanel_CJK_us_code/qrcode.txt
@@ -13,7 +13,12 @@ Page qrcode
    Events
        Preinitialize Event
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "qrcode",0
+            printh 00
+            printh FF FF FF
        
 Text qrcode_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/screensaver.txt
+++ b/hmi/dev/nspanel_CJK_us_code/screensaver.txt
@@ -15,7 +15,12 @@ Page screensaver
            vis text,0
            dim=brightness_sleep
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "screensaver",0
+            printh 00
+            printh FF FF FF
        
        Touch Release Event
            page back_page_id
--- a/hmi/dev/nspanel_CJK_us_code/settings.txt
+++ b/hmi/dev/nspanel_CJK_us_code/settings.txt
@@ -19,7 +19,12 @@ Page settings
            vis lbl_sleep,0
            vis bt_sleep,0
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "settings",0
+            printh 00
+            printh FF FF FF
        
 Text bright_text
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/utilities.txt
+++ b/hmi/dev/nspanel_CJK_us_code/utilities.txt
@@ -20,7 +20,12 @@ Page utilities
            vis title_icon,1
            vis title,1
            vis button_back,1
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "utilities",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) line_main_d
    Attributes
@@ -111,7 +116,7 @@ Text home_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Home
+        Text               : 
        Max. Text Size     : 10
    
 Text home
@@ -151,7 +156,7 @@ Text grid_label
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : Grid
+        Text               : 
        Max. Text Size     : 10
    
 Text grid
@@ -191,7 +196,7 @@ Text group01_label
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group01
@@ -231,7 +236,7 @@ Text group02_label
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group02
@@ -271,7 +276,7 @@ Text group03_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group03
@@ -311,7 +316,7 @@ Text group04_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group04
@@ -351,7 +356,7 @@ Text group05_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group05
@@ -391,7 +396,7 @@ Text group06_label
        Dragging           : 0
        Send Component ID  : disabled
        Associated Keyboard: none
-        Text               : Label
+        Text               : 
        Max. Text Size     : 10
    
 Text group06
--- a/hmi/dev/nspanel_CJK_us_code/weather01.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather01.txt
@@ -17,7 +17,12 @@ Page weather01
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather01",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/weather02.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather02.txt
@@ -17,7 +17,12 @@ Page weather02
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather02",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/weather03.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather03.txt
@@ -17,7 +17,12 @@ Page weather03
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather03",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/weather04.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather04.txt
@@ -17,7 +17,12 @@ Page weather04
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather04",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_us_code/weather05.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather05.txt
@@ -17,7 +17,12 @@ Page weather05
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "weather05",0
+            printh 00
+            printh FF FF FF
        
 Text day
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
    int p=0,q=0,t=0,f=0
    int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
    int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
-    int back_page_id=0
+    int back_page_id=1
    int dimdelta=0
    int api=0 // 0 = disconnected from HA, 1 = connected to HA
    int is_utilities=0
@@ -20,4 +20,4 @@ Program.s
    {
      lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version
    }
-    page 8//Power on start page boot
+    page 0//Power on start page boot
--- a/hmi/dev/nspanel_CJK_us_land_code/alarm.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/alarm.txt
@@ -24,7 +24,12 @@ Page alarm
                vis bt_bypass,0
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "alarm",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/boot.txt
@@ -12,11 +12,16 @@ Page boot
    
    Events
        Preinitialize Event
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "boot",0
+            printh 00
+            printh FF FF FF
            dim=100
            covx baud,baud_rate.txt,0,0
            baud_rate.txt+=" bps"
            vis unavailable,0
-            sendme
        
        Page Exit Event
            dim=0
@@ -27,13 +32,6 @@ Variable (int32) counter
        Scope: local
        Value: 0
    
-Variable (string) aux1
-    Attributes
-        ID            : 12
-        Scope         : local
-        Text          : 
-        Max. Text Size: 10
-    
 Text ip_addr
    Attributes
        ID                 : 1
@@ -101,7 +99,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0
+        Text               : 4.3.1b1
        Max. Text Size     : 9
    
 Text esph_version
@@ -111,8 +109,8 @@ Text esph_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 
-        Max. Text Size     : 9
+        Text               : Waiting...
+        Max. Text Size     : 10
    
 Text bluep_version
    Attributes
@@ -121,12 +119,12 @@ Text bluep_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 
-        Max. Text Size     : 9
+        Text               : Waiting...
+        Max. Text Size     : 10
    
 Text baud_rate
    Attributes
-        ID                 : 14
+        ID                 : 13
        Scope              : local
        Dragging           : 0
        Send Component ID  : on press and release
@@ -136,7 +134,7 @@ Text baud_rate
    
 Text framework
    Attributes
-        ID                 : 15
+        ID                 : 14
        Scope              : local
        Dragging           : 0
        Send Component ID  : on press and release
@@ -146,7 +144,7 @@ Text framework
    
 Text unavailable
    Attributes
-        ID                 : 16
+        ID                 : 15
        Scope              : local
        Dragging           : 0
        Send Component ID  : disabled
@@ -154,6 +152,14 @@ Text unavailable
        Text               : 
        Max. Text Size     : 1
    
+Progress Bar progress
+    Attributes
+        ID               : 16
+        Scope            : global
+        Dragging         : 0
+        Send Component ID: disabled
+        Value            : 0
+    
 Dual-state Button bt_reboot
    Attributes
        ID               : 4
@@ -173,19 +179,28 @@ Dual-state Button bt_reboot
        
 Timer tm_esphome
    Attributes
-        ID         : 13
+        ID         : 12
        Scope      : local
-        Period (ms): 10000
+        Period (ms): 1000
        Enabled    : yes
    
    Events
        Timer Event
+            if(tm_esphome.tim!=10000)
+            {
+                tm_esphome.tim=10000
+            }
            counter.val++
            if(counter.val>30)
            {
                rest
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "boot",0
+            printh 00
+            printh FF FF FF
            printh 91
            prints "display_mode",0
            printh 00
@@ -197,13 +212,11 @@ Timer tm_esphome
            prints charset,0
            printh FF FF FF
            printh 92
-            prints "tft_version",0
+            prints "boot.tft_version",0
            printh 00
            prints tft_version.txt,0
            printh 00
            printh FF FF FF
-            covx counter.val,aux1.txt,0,0
-            esph_version.txt="Retry #"+aux1.txt
            sys0=counter.val%10
            if(sys0==0)
            {
--- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt
@@ -20,22 +20,31 @@ Page buttonpage01
                vis 255,0
                vis button_back,1
                vis page_label,1
-                page_index.txt+="â—"
-                if(is_buttonpage02==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    page_index.txt+="â—"
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage01",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt
@@ -20,22 +20,31 @@ Page buttonpage02
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                page_index.txt+="â—"
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage02",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt
@@ -20,22 +20,31 @@ Page buttonpage03
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    if(is_buttonpage04==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    vis page_index,1
                }
-                if(is_buttonpage02==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                page_index.txt+="â—"
-                if(is_buttonpage04==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage03",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt
@@ -20,22 +20,31 @@ Page buttonpage04
                vis 255,0
                vis button_back,1
                vis page_label,1
-                if(is_buttonpage01==1)
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
                {
-                    page_index.txt+="â—‹"
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    vis page_index,1
                }
-                if(is_buttonpage02==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                if(is_buttonpage03==1)
-                {
-                    page_index.txt+="â—‹"
-                }
-                page_index.txt+="â—"
-                vis page_index,1
            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "buttonpage04",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/climate.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/climate.txt
@@ -33,7 +33,12 @@ Page climate
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "climate",0
+            printh 00
+            printh FF FF FF
        
        Page Exit Event
            covx embedded.val,va2.txt,0,0
--- a/hmi/dev/nspanel_CJK_us_land_code/confirm.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/confirm.txt
@@ -17,7 +17,12 @@ Page confirm
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "confirm",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) page_id
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/cover.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/cover.txt
@@ -17,7 +17,12 @@ Page cover
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "cover",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) va1
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt
@@ -17,20 +17,32 @@ Page entitypage01
                page home
            }
            vis unavailable,0
-            page_index.txt+="â—"
-            if(is_entitypage02==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage03==1)
+                page_index.txt+="â—"
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage01",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt
@@ -17,20 +17,32 @@ Page entitypage02
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            page_index.txt+="â—"
-            if(is_entitypage03==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage02",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt
@@ -17,20 +17,32 @@ Page entitypage03
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage02==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+                if(is_entitypage04==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            page_index.txt+="â—"
-            if(is_entitypage04==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage03",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
@@ -122,7 +134,7 @@ Text value08_label
        Text               : 
        Max. Text Size     : 60
    
-Text value01_pic
+Text value01_icon
    Attributes
        ID                 : 12
        Scope              : local
--- a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt
@@ -17,20 +17,32 @@ Page entitypage04
                page home
            }
            vis unavailable,0
-            if(is_entitypage01==1)
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
            {
-                page_index.txt+="â—‹"
-            }
-            if(is_entitypage02==1)
+                if(is_entitypage01==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage02==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                if(is_entitypage03==1)
+                {
+                    page_index.txt+="â—‹"
+                }
+                page_index.txt+="â—"
+            }else
            {
-                page_index.txt+="â—‹"
+                vis page_index,0
            }
-            if(is_entitypage03==1)
-            {
-                page_index.txt+="â—‹"
-            }
-            page_index.txt+="â—"
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "entitypage04",0
+            printh 00
+            printh FF FF FF
        
 Text value01_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/fan.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/fan.txt
@@ -18,7 +18,12 @@ Page fan
            }
            vis unavailable,0
            vis bt_oscillate,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "fan",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) fansetting
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/home.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/home.txt
@@ -12,6 +12,16 @@ Page home
    
    Events
        Preinitialize Event
+            if(boot.progress.val<100)
+            {
+                page boot
+            }
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "home",0
+            printh 00
+            printh FF FF FF
            back_page_id=0
            if(qrcode.qrcode_value.txt=="")
            {
@@ -31,7 +41,6 @@ Page home
                vis right_bt_text,0
            }
            vis unavailable,0
-            sendme
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt
@@ -17,7 +17,12 @@ Page keyb_num
                page page_id.val
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "keyb_num",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) page_id
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/light.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/light.txt
@@ -37,7 +37,12 @@ Page light
                vis color_button,0
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "light",0
+            printh 00
+            printh FF FF FF
        
 Variable (int32) rgb565
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/media_player.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/media_player.txt
@@ -17,7 +17,12 @@ Page media_player
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "media_player",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/notification.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/notification.txt
@@ -17,7 +17,12 @@ Page notification
                page home
            }
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "notification",0
+            printh 00
+            printh FF FF FF
        
 Variable (string) lastclick
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt
@@ -13,7 +13,12 @@ Page qrcode
    Events
        Preinitialize Event
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "qrcode",0
+            printh 00
+            printh FF FF FF
        
 Text qrcode_label
    Attributes
--- a/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt
@@ -15,7 +15,12 @@ Page screensaver
            vis text,0
            dim=brightness_sleep
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "screensaver",0
+            printh 00
+            printh FF FF FF
        
        Touch Release Event
            page back_page_id
--- a/hmi/dev/nspanel_CJK_us_land_code/settings.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/settings.txt
@@ -19,7 +19,12 @@ Page settings
            vis lbl_sleep,0
            vis bt_sleep,0
            vis unavailable,0
-            sendme
+            printh 92
+            prints "current_page",0
+            printh 00
+            prints "settings",0
+            printh 00
+            printh FF FF FF
        
 Text bright_text
    Attributes
--- a/Show More
+++ b/Show More