Merge pull request #2368 from Blackymas/beta

v4.3.12 - Hotfix for Incorrect Timezone Calculation Issues
Blackymas · Nov 4, 2024 · 0c0be2d · 0c0be2d
2 parents e146b1f + 2f016d1
commit 0c0be2d
Show file tree

Hide file tree

Showing 40 changed files with 119 additions and 94 deletions.
diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
@@ -355,20 +355,30 @@ jobs:
     name: Prebuilt Firmware
     runs-on: ubuntu-latest
     needs: code_scan
-    if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
+    if: contains(github.ref, 'dev') || contains(github.base_ref, 'dev')
     steps:
       - uses: actions/checkout@main
 
-      - name: Read NSPanel ESPHome version
-        uses: CumulusDS/get-yaml-paths-action@master
-        id: read_nspanel_esphome_version
-        with:
-          file: esphome/nspanel_esphome_version.yaml
-          version: substitutions.version
-
-      - name: Display NSPanel ESPHome version
+      - name: Extract Version Number
+        id: extract_version
+        run: |
+          VERSION=$(yq eval '.substitutions.version' esphome/nspanel_esphome_version.yaml)
+          if [ -z "$VERSION" ]; then
+            echo "Error: No version found in esphome/nspanel_esphome_version.yaml"
+            exit 1
+          fi
+          echo "Extracted Version: ${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
+
+      - name: Debug Version Output
         run: |
-          echo NSPanel ESPHome version: ${{ steps.read_nspanel_esphome_version.outputs.version }}
+          echo "Version from setup_dependencies: ${{ steps.extract_version.outputs.version }}"
+          echo "Environment Variable VERSION: $VERSION"
+          if [ -z "${{ steps.extract_version.outputs.version }}" ]; then
+            echo "Error: Version output is empty. Exiting..."
+            exit 1
+          fi
 
       - name: Build ESPHome Prebuilt Firmware
         id: build_nspanel_fw
@@ -388,7 +398,7 @@ jobs:
         with:
           file: ${{ steps.build_nspanel_fw.outputs.name }}/manifest.json
           field: version
-          value: ${{ steps.read_nspanel_esphome_version.outputs.version }}
+          value: ${{ steps.extract_version.outputs.version }}
 
       - name: Update manifest.json - builds.chipFamily
         uses: jossef/action-set-json-field@v2.2
@@ -409,7 +419,7 @@ jobs:
         with:
           file: ${{ steps.build_nspanel_fw.outputs.name }}/manifest.json
           field: builds.ota.release_url
-          value: "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v${{ steps.read_nspanel_esphome_version.outputs.version }}"
+          value: "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v${{ steps.extract_version.outputs.version }}"
 
       - name: Move and Rename Firmware File - nspanel_esphome_prebuilt
         run: |
@@ -437,7 +447,7 @@ jobs:
         with:
           file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json
           field: version
-          value: ${{ steps.read_nspanel_esphome_version.outputs.version }}
+          value: ${{ steps.extract_version.outputs.version }}
 
       - name: Update manifest.json - builds.chipFamily
         uses: jossef/action-set-json-field@v2.2
@@ -458,7 +468,7 @@ jobs:
         with:
           file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json
           field: builds.ota.release_url
-          value: "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v${{ steps.read_nspanel_esphome_version.outputs.version }}"
+          value: "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v${{ steps.extract_version.outputs.version }}"
 
       - name: Move and Rename Firmware File - wall_display
         run: |

diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ Nextion2Text.*
 
 # Ignore dev folder
 dev
+.esphome
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -933,6 +933,19 @@ This fix ensures that the correct TFT file is used, preventing potential display
 
 This update is critical for maintaining the proper functionality of your NSPanel. Please ensure that you update all components as recommended.
 
+## v4.3.12 - Hotfix for Incorrect Timezone Calculation Issues
+This hotfix addresses critical issues with timezone handling on the NSPanel,
+specifically with POSIX string handling in ESP-IDF v4.4 and resolving an error in the propagation of timezone selection from the Blueprint to ESPHome.
+These fixes ensure accurate and consistent time display, fully synchronized with Home Assistant.
+
+### Fix for Incorrect Time Display Due to Timezone Handling (#2363, #2304)
+- **Criticality:** Critical
+- **Affected Components:** ESPHome, Blueprint
+- **Issue Numbers:** #2363, #2304
+- **Description:** Resolved issues where the NSPanel displayed incorrect time due to an inverted timezone offset,
+  affecting users with time discrepancies between the panel and Home Assistant.
+  The fix includes improvements in the propagation of timezone settings from the Blueprint, ensuring the home page accurately reflects the configured timezone.
+
 ## Support
 For support or more information about this update,
 visit our [GitHub repository](https://github.com/Blackymas/NSPanel_HA_Blueprint)
@@ -951,6 +964,7 @@ Your contributions have made our guides more informative and accessible, enrichi
 -  **@briangunderson**: For updating the docs to reflect to the new name for '**action**' (formelly '**service**') on Home Assistant v2024.8.0 (#2236)
 
 ## Previous releases
+- [v4.3.11 - Hotfix for TFT File Download Issue](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.11)
 - [v4.3.10 - Boot Stability Enhancements and Troubleshooting Support](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.10)
 - [v4.3.9 - Ensuring Compatibility with ESPHome v2024.6.0](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.9)
 - [v4.3.8 - Enhancements and Bug Fix](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.8)

diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
@@ -42,7 +42,7 @@ external_components:
       # path: packages/Blackymas/components
       type: git
       url: https://github.com/Blackymas/NSPanel_HA_Blueprint
-      ref: v4.3.11
+      ref: v4.3.12
     components:
       - nspanel_ha_blueprint
     refresh: 30s
@@ -3148,13 +3148,18 @@ script:
       timezone: string
     then:
       - lambda: |-
-          id(mui_timezone) = timezone;
-          if (!timezone.empty()) {
-            ESP_LOGD("script.set_timezone", "Setting timezone: %s", timezone.c_str());
-            time_provider->set_timezone(timezone.c_str());
+          ESP_LOGI("script.set_timezone", "Setting timezone: %s", timezone.c_str());
+          if (timezone != id(mui_timezone)) {
+            id(mui_timezone) = timezone;
+            size_t start = id(mui_timezone).find('<');
+            size_t end = id(mui_timezone).find('>');
+            if (start != std::string::npos && end != std::string::npos && end > start)
+              id(mui_timezone).replace(start, (end - start) + 1, "UTC");
+            time_provider->set_timezone(id(mui_timezone).c_str());
             time_provider->call_setup();
-            time_provider->dump_config();
           }
+          time_provider->dump_config();
+          refresh_datetime->execute();
 
   - id: stop_all
     mode: restart

diff --git a/esphome/nspanel_esphome_version.yaml b/esphome/nspanel_esphome_version.yaml
@@ -7,6 +7,6 @@
 ---
 substitutions:
   ##### DON'T CHANGE THIS ######
-  version: "4.3.11"
+  version: "4.3.12"
   ##############################
 ...
diff --git a/hmi/dev/nspanel_CJK_eu_code/boot.txt b/hmi/dev/nspanel_CJK_eu_code/boot.txt
@@ -29,7 +29,7 @@ Variable (string) version
     Attributes
         ID            : 7
         Scope         : global
-        Text          : 4.3.11
+        Text          : 4.3.12
         Max. Text Size: 16
 
 Variable (int32) log_len

diff --git a/hmi/dev/nspanel_CJK_us_code/boot.txt b/hmi/dev/nspanel_CJK_us_code/boot.txt
@@ -29,7 +29,7 @@ Variable (string) version
     Attributes
         ID            : 7
         Scope         : global
-        Text          : 4.3.11
+        Text          : 4.3.12
         Max. Text Size: 16
 
 Variable (int32) log_len

diff --git a/hmi/dev/nspanel_CJK_us_land_code/boot.txt b/hmi/dev/nspanel_CJK_us_land_code/boot.txt
@@ -29,7 +29,7 @@ Variable (string) version
     Attributes
         ID            : 7
         Scope         : global
-        Text          : 4.3.11
+        Text          : 4.3.12
         Max. Text Size: 16
 
 Variable (int32) log_len

diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt
@@ -29,7 +29,7 @@ Variable (string) version
     Attributes
         ID            : 7
         Scope         : global
-        Text          : 4.3.11
+        Text          : 4.3.12
         Max. Text Size: 16
 
 Variable (int32) log_len

diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt
@@ -29,7 +29,7 @@ Variable (string) version
     Attributes
         ID            : 7
         Scope         : global
-        Text          : 4.3.11
+        Text          : 4.3.12
         Max. Text Size: 16
 
 Variable (int32) log_len

diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt
@@ -29,7 +29,7 @@ Variable (string) version
     Attributes
         ID            : 7
         Scope         : global
-        Text          : 4.3.11
+        Text          : 4.3.12
         Max. Text Size: 16
 
 Variable (int32) log_len

diff --git a/hmi/nspanel_CJK_eu.HMI b/hmi/nspanel_CJK_eu.HMI
diff --git a/hmi/nspanel_CJK_eu.tft b/hmi/nspanel_CJK_eu.tft
diff --git a/hmi/nspanel_CJK_us.HMI b/hmi/nspanel_CJK_us.HMI
diff --git a/hmi/nspanel_CJK_us.tft b/hmi/nspanel_CJK_us.tft
diff --git a/hmi/nspanel_CJK_us_land.HMI b/hmi/nspanel_CJK_us_land.HMI
diff --git a/hmi/nspanel_CJK_us_land.tft b/hmi/nspanel_CJK_us_land.tft
diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI
diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft
diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI
diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft
diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI
diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
@@ -10,7 +10,7 @@ blueprint:
   description: >
     # NSPanel Configuration via Blueprint: Complete UI-Based Setup
 
-    **Version**: v4.3.11
+    **Version**: v4.3.12
 
 
     This project enables comprehensive configuration of your NSPanel through a Blueprint featuring a user interface.
@@ -509,32 +509,32 @@ blueprint:
                 - 'Pacific/Wake (<+12>-12)'
                 - 'Pacific/Wallis (<+12>-12)'
                 - 'Etc/GMT (GMT0)'
-                - 'Etc/GMT-14 (<+14>-14)'
-                - 'Etc/GMT-13 (<+13>-13)'
-                - 'Etc/GMT-12 (<+12>-12)'
-                - 'Etc/GMT-11 (<+11>-11)'
-                - 'Etc/GMT-10 (<+10>-10)'
-                - 'Etc/GMT-9 (<+09>-9)'
-                - 'Etc/GMT-8 (<+08>-8)'
-                - 'Etc/GMT-7 (<+07>-7)'
-                - 'Etc/GMT-6 (<+06>-6)'
-                - 'Etc/GMT-5 (<+05>-5)'
-                - 'Etc/GMT-4 (<+04>-4)'
-                - 'Etc/GMT-3 (<+03>-3)'
-                - 'Etc/GMT-2 (<+02>-2)'
-                - 'Etc/GMT-1 (<+01>-1)'
-                - 'Etc/GMT+1 (<-01>1)'
-                - 'Etc/GMT+2 (<-02>2)'
-                - 'Etc/GMT+3 (<-03>3)'
-                - 'Etc/GMT+4 (<-04>4)'
-                - 'Etc/GMT+5 (<-05>5)'
-                - 'Etc/GMT+6 (<-06>6)'
-                - 'Etc/GMT+7 (<-07>7)'
-                - 'Etc/GMT+8 (<-08>8)'
-                - 'Etc/GMT+9 (<-09>9)'
-                - 'Etc/GMT+10 (<-10>10)'
-                - 'Etc/GMT+11 (<-11>11)'
-                - 'Etc/GMT+12 (<-12>12)'
+                - 'Etc/GMT+14 (<+14>-14)'
+                - 'Etc/GMT+13 (<+13>-13)'
+                - 'Etc/GMT+12 (<+12>-12)'
+                - 'Etc/GMT+11 (<+11>-11)'
+                - 'Etc/GMT+10 (<+10>-10)'
+                - 'Etc/GMT+9 (<+09>-9)'
+                - 'Etc/GMT+8 (<+08>-8)'
+                - 'Etc/GMT+7 (<+07>-7)'
+                - 'Etc/GMT+6 (<+06>-6)'
+                - 'Etc/GMT+5 (<+05>-5)'
+                - 'Etc/GMT+4 (<+04>-4)'
+                - 'Etc/GMT+3 (<+03>-3)'
+                - 'Etc/GMT+2 (<+02>-2)'
+                - 'Etc/GMT+1 (<+01>-1)'
+                - 'Etc/GMT-1 (<-01>1)'
+                - 'Etc/GMT-2 (<-02>2)'
+                - 'Etc/GMT-3 (<-03>3)'
+                - 'Etc/GMT-4 (<-04>4)'
+                - 'Etc/GMT-5 (<-05>5)'
+                - 'Etc/GMT-6 (<-06>6)'
+                - 'Etc/GMT-7 (<-07>7)'
+                - 'Etc/GMT-8 (<-08>8)'
+                - 'Etc/GMT-9 (<-09>9)'
+                - 'Etc/GMT-10 (<-10>10)'
+                - 'Etc/GMT-11 (<-11>11)'
+                - 'Etc/GMT-12 (<-12>12)'
                 - 'Etc/UTC (UTC0)'
         decimal_separator:
           name: System settings - Decimal Separator
@@ -3764,7 +3764,7 @@ trigger_variables:
       group06: !input utilities_page01_group06_line_reference
 
 variables:
-  blueprint_version: '4.3.11'
+  blueprint_version: '4.3.12'
   pages:
     current: '{{ states(currentpage) }}'
     home: "home"
@@ -8196,23 +8196,20 @@ action:
                             qrcode: !input qrcode_value
                           home_indoor_temp_icon: !input home_indoor_temp_icon
                           timezone: !input timezone
+                          timezone_code: >
+                            {{
+                              timezone.split('(')[1]|replace(')', '')
+                              if timezone.split('(') | count > 0
+                              else timezone
+                            }}
 
                       ##### Timezone #####
-                      - if: '{{ timezone is string and timezone | length > 1 and esphome_version >= "4.3.4" }}'
-                        then:
-                          - variables:
-                              timezone_code: >
-                                {{
-                                  timezone.split('(')[1]|replace(')', '')
-                                  if timezone.split('(') | count > 0
-                                  else timezone
-                                }}
-                          - *delay_default
-                          - service: 'esphome.{{ nspanel_name }}_set_string'
-                            data:
-                              component: "timezone"
-                              val: '{{ timezone_code }}'
-                            continue_on_error: true
+                      - *delay_default
+                      - service: 'esphome.{{ nspanel_name }}_set_string'
+                        data:
+                          component: "timezone"
+                          val: '{{ timezone_code }}'
+                        continue_on_error: true
 
                       ##### Home page #####
                       - *delay_default
@@ -8390,14 +8387,12 @@ action:
                           climate_friendly_name: '{{ state_attr(climate, "friendly_name") if climate_entity_id_valid else "" }}'
                           hw_buttons_bars_pages: !input hw_buttons_bars_pages
 
-                      - if: '{{ esphome_version >= "4.3.4" }}'
-                        then:
-                          - *delay_default
-                          - service: 'esphome.{{ nspanel_name }}_set_bool'
-                            data:
-                              component: "is_climate"
-                              val: '{{ climate_entity_id_valid }}'
-                            continue_on_error: true
+                      - *delay_default
+                      - service: 'esphome.{{ nspanel_name }}_set_bool'
+                        data:
+                          component: "is_climate"
+                          val: '{{ climate_entity_id_valid }}'
+                        continue_on_error: true
 
                       - *delay_default
                       - service: 'esphome.{{ nspanel_name }}_init_hardware'

diff --git a/prebuilt/nspanel-esp32/manifest.json b/prebuilt/nspanel-esp32/manifest.json
@@ -2,7 +2,7 @@
   "chipFamily": "ESP32",
   "ota": {
     "path": "nspanel-esp32.ota.bin",
-    "md5": "c5cb885478f366d45fd7d92695716810"
+    "md5": "d4cb0c8bdc8809f8802dc49541f3015a"
   },
   "parts": [
     {
@@ -11,12 +11,12 @@
     }
   ],
   "name": "NSPanel HA Blueprint",
-  "version": "4.3.11",
+  "version": "4.3.12",
   "builds": {
     "chipFamily": "ESP32",
     "ota": {
       "path": "https://raw.githubusercontent.com/Blackymas/NSPanel_HA_Blueprint/main/prebuilt/nspanel_esphome_prebuilt.bin",
-      "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.11"
+      "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.12"
     }
   }
 }
diff --git a/prebuilt/nspanel-esp32/nspanel-esp32.factory.bin b/prebuilt/nspanel-esp32/nspanel-esp32.factory.bin
diff --git a/prebuilt/nspanel-esp32/nspanel-esp32.ota.bin b/prebuilt/nspanel-esp32/nspanel-esp32.ota.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.bin b/prebuilt/nspanel_esphome_prebuilt.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.bin.md5 b/prebuilt/nspanel_esphome_prebuilt.bin.md5
@@ -1 +1 @@
-c5cb885478f366d45fd7d92695716810  prebuilt/nspanel_esphome_prebuilt.bin
+d4cb0c8bdc8809f8802dc49541f3015a  prebuilt/nspanel_esphome_prebuilt.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.factory.bin b/prebuilt/nspanel_esphome_prebuilt.factory.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.factory.bin.md5 b/prebuilt/nspanel_esphome_prebuilt.factory.bin.md5
@@ -1 +1 @@
-6ec4a6cc75e36937ed28407dda7d98ae  prebuilt/nspanel_esphome_prebuilt.factory.bin
+93a7945b78c6f45ba470e32825b2567a  prebuilt/nspanel_esphome_prebuilt.factory.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.manifest.json b/prebuilt/nspanel_esphome_prebuilt.manifest.json
@@ -2,7 +2,7 @@
   "chipFamily": "ESP32",
   "ota": {
     "path": "nspanel-esp32.ota.bin",
-    "md5": "c5cb885478f366d45fd7d92695716810"
+    "md5": "d4cb0c8bdc8809f8802dc49541f3015a"
   },
   "parts": [
     {
@@ -11,12 +11,12 @@
     }
   ],
   "name": "NSPanel HA Blueprint",
-  "version": "4.3.11",
+  "version": "4.3.12",
   "builds": {
     "chipFamily": "ESP32",
     "ota": {
       "path": "https://raw.githubusercontent.com/Blackymas/NSPanel_HA_Blueprint/main/prebuilt/nspanel_esphome_prebuilt.bin",
-      "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.11"
+      "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.12"
     }
   }
 }