Merge pull request #2083 from Blackymas/beta

v4.3.6 - Critical Fixes for Custom Buttons

ReleaseNotes.md

@@ -741,6 +741,32 @@ This update, v4.3.5, is a significant step towards harnessing the full potential
 while continuing to refine the user experience and system stability.
 We appreciate the community's active involvement in identifying these issues and thank everyone for their contributions to improving the firmware.
 
+## v4.3.6 - Critical Fixes for Custom Buttons
+This release of v4.3.6 is an urgent patch to address critical issues affecting the functionality of custom buttons on the NSPanel.
+These fixes ensure that custom buttons properly trigger actions for climate and alarm controls, and correct the integration with external thermostat entities.
+
+### Fixes for Custom Button Functionality
+- **Climate Page Accessibility Restored (#2067)**
+  - **Criticality:** Critical
+  - **Affected Components:** Blueprint
+  - **Description:** Resolved an issue where the climate page was not opening when triggered from a custom button.
+  Users can now access the climate controls directly from the home screen without interruption.
+
+- **Alarm Control from Custom Button Restored (#2081)**
+  - **Criticality:** Critical
+  - **Affected Components:** Blueprint
+  - **Description:** Fixed a malfunction where custom buttons configured for alarm control were unresponsive.
+  This update restores full functionality, allowing for immediate access and control of alarm settings from the home page.
+
+- **Integration of External Thermostat Entities Fixed (#2080)**
+  - **Criticality:** Critical
+  - **Affected Components:** ESPHome
+  - **Description:** Corrected an issue introduced in v4.3.5 where external thermostat entities (the ones controlled by Home Assistant) linked to custom buttons were not functioning correctly.
+  With this fix, users can again utilize custom buttons to control their external thermostats effectively.
+
+This patch release v4.3.6 ensures that custom buttons on the NSPanel are fully operational, addressing urgent issues that impacted user interaction and control of climate and alarm systems.
+We thank our community for their prompt reporting and patience as we continue to enhance the NSPanel experience.
+
 ## Support
 For support or more information about this update,
 visit our [GitHub repository](https://github.com/Blackymas/NSPanel_HA_Blueprint)

esphome/nspanel_esphome_addon_climate_base.yaml

@@ -128,9 +128,11 @@ script:
           #endif
           if (!id(is_uploading_tft)) {
             static const char *const TAG = "nspanel_ha_blueprint";
-            uint cooler_relay = ${cooler_relay};
-            uint heater_relay = ${heater_relay};
+            const uint cooler_relay = ${cooler_relay};
+            const uint heater_relay = ${heater_relay};
             ESP_LOGCONFIG(TAG, "Add-on climate:");
+            if (cooler_relay != 0) ESP_LOGCONFIG(TAG, "  Relay (cooler): %u", cooler_relay);
+            if (heater_relay != 0) ESP_LOGCONFIG(TAG, "  Relay (heater): %u", heater_relay);
             #ifdef NSPANEL_HA_BLUEPRINT_ADDON_CLIMATE_COOL
             ESP_LOGCONFIG(TAG, "  Cool:  Enabled");
             if (cooler_relay == 1 or cooler_relay == 2)

esphome/nspanel_esphome_core.yaml

@@ -17,7 +17,7 @@ substitutions:
   invalid_cooldown: "100ms"
   bytes_per_char: "1"
   ##### DON'T CHANGE THIS ######
-  version: "4.3.5"
+  version: "4.3.6"
   ##############################
 
 ##### External components #####
@@ -27,7 +27,7 @@ external_components:
       # path: packages/Blackymas/components
       type: git
       url: https://github.com/Blackymas/NSPanel_HA_Blueprint
-      ref: v4.3.5
+      ref: v4.3.6
     components:
       - nspanel_ha_blueprint
     refresh: 300s
@@ -319,13 +319,14 @@ api:
         - lambda: |-
             if (!id(is_uploading_tft)) {
               HomeAssistantEntity entity_id = extractHomeAssistantEntity(entity);
+              if (entity == "embedded_climate") entity_id.domain = "climate";
+              else if (entity_id.domain == "alarm_control_panel") entity_id.domain = "alarm";
               if (entity_id.domain != "invalid" or entity == "embedded_climate") {
                 detailed_entity->publish_state(entity);
-                if (entity_id.domain == "alarm_control_panel") entity_id.domain = "alarm";
                 goto_page->execute(entity_id.domain.c_str());
                 disp1->send_command_printf("back_page_id=%" PRIu8, get_page_id(back_page.c_str()));
                 if (entity_id.domain == "climate")
-                  disp1->set_component_value("embedded", (entity == "embedded_climate") ? 1 : 0);
+                  disp1->set_component_value("climate.embedded", (entity == "embedded_climate") ? 1 : 0);
               }
             }
 
@@ -2380,7 +2381,6 @@ script:
       command: string
     then:
       - lambda: |-
-          if (id(is_uploading_tft)) ha_button->stop();
           timer_reset_all->execute();
           esphome::api::CustomAPIDevice ha_event;
           ha_event.fire_homeassistant_event("esphome.nspanel_ha_blueprint",

hmi/dev/nspanel_CJK_eu_code/boot.txt

@@ -95,7 +95,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.3.5
+        Text               : 4.3.6
         Max. Text Size     : 10
 
 Text esph_version

hmi/dev/nspanel_CJK_us_code/boot.txt

@@ -95,7 +95,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.3.5
+        Text               : 4.3.6
         Max. Text Size     : 10
 
     Events

hmi/dev/nspanel_CJK_us_land_code/boot.txt

@@ -95,7 +95,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.3.5
+        Text               : 4.3.6
         Max. Text Size     : 10
 
 Text esph_version

hmi/dev/nspanel_eu_code/boot.txt

@@ -95,7 +95,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.3.5
+        Text               : 4.3.6
         Max. Text Size     : 10
 
 Text esph_version