Bump version to 2024.12.11 [skip-versioning]

Restore light state on boot

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml

@@ -25,6 +25,11 @@ substitutions:
   LIGHT_TRANSITION_TURN_OFF: '0'  # Transition time in msec
   LIGHT_BRIGHTNESS_TURN_ON: '0'   # Brightness (1 to 100%, 0 to not set it)
 
+  LIGHT_FULL_RESTORE_MODE: RESTORE_DEFAULT_OFF
+  LIGHT_SIDES_RESTORE_MODE: RESTORE_DEFAULT_OFF
+  LIGHT_INDIVIDUAL_RESTORE_MODE: RESTORE_DEFAULT_OFF
+  LIGHT_RELAYS_RESTORE_MODE: RESTORE_DEFAULT_OFF
+
 globals:
   - id: gb_lights_1
     type: std::vector<light::LightState*>
@@ -44,6 +49,7 @@ light:
     # method: esp32_rmt
     num_leds: 32
     pin: GPIO13
+    restore_mode: ${LIGHT_FULL_RESTORE_MODE}
 
   # Those lights are available based on the model selections
   - &light_partition_with_effects
@@ -52,6 +58,7 @@ light:
     platform: partition
     default_transition_length: ${default_transition_length}
     internal: true
+    restore_mode: ${LIGHT_SIDES_RESTORE_MODE}
     effects:
       - addressable_rainbow:
           name: "Rainbow"
@@ -184,6 +191,7 @@ light:
     platform: partition
     disabled_by_default: true
     default_transition_length: ${default_transition_length}
+    restore_mode: ${LIGHT_INDIVIDUAL_RESTORE_MODE}
     segments:
       - id: light_full
         from: 0
@@ -417,6 +425,7 @@ light:
     platform: partition
     internal: true
     default_transition_length: ${default_transition_length}
+    restore_mode: ${LIGHT_RELAYS_RESTORE_MODE}
     segments:
       - id: light_full
         from: 9

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml

@@ -15,6 +15,7 @@ substitutions:
   RELAY_MODE_TEXT_SWITCH: "Switch"
   RELAY_MODE_TEXT_LIGHT: "Light"
   RELAY_MODE_TEXT_NOT_USED: "Not in use"
+  RELAY_RESTORE_MODE: RESTORE_DEFAULT_OFF
 
 globals:
   - id: boot_initialization_relays
@@ -29,6 +30,7 @@ light:
     output: output_relay_1
     platform: binary
     internal: true
+    restore_mode: ${RELAY_RESTORE_MODE}
     on_turn_on:
       then:
         - if:
@@ -189,22 +191,55 @@ script:
           }
 
           // Toggle relay if corresponding button action is enabled
+          ESP_LOGVV("core_hw_relays", "Toggle relays: (${BUTTON_ACTION_NONE_TEXT})");
+          ESP_LOGVV("core_hw_relays", "  Relay 1: %s (%s)",
+                    YESNO(sl_button_1_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
+                    sl_button_1_action->state.c_str());
+          ESP_LOGVV("core_hw_relays", "  Relay 2: %s (%s)",
+                    YESNO(sl_button_2_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
+                    sl_button_2_action->state.c_str());
+          ESP_LOGVV("core_hw_relays", "  Relay 3: %s (%s)",
+                    YESNO(sl_button_3_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
+                    sl_button_3_action->state.c_str());
+          ESP_LOGVV("core_hw_relays", "  Relay 4: %s (%s)",
+                    YESNO(sl_button_4_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
+                    sl_button_4_action->state.c_str());
           switch (button) {
             case ${BUTTON_1_ID}:
-              if (sl_button_1_action->state != "${RELAY_MODE_TEXT_NOT_USED}")
+              if (sl_button_1_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
+                ESP_LOGV("core_hw_relays", "Toggle relay 1: (%s)", sl_button_1_action->state.c_str());
                 sw_relay_1->toggle();
+              } else {
+                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 1: action is '%s'",
+                          sl_button_1_action->state.c_str());
+              }
               break;
             case ${BUTTON_2_ID}:
-              if (sl_button_2_action->state != "${RELAY_MODE_TEXT_NOT_USED}")
+              if (sl_button_2_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
+                ESP_LOGV("core_hw_relays", "Toggle relay 2: (%s)", sl_button_2_action->state.c_str());
                 sw_relay_2->toggle();
+              } else {
+                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 2: action is '%s'",
+                          sl_button_2_action->state.c_str());
+              }
               break;
             case ${BUTTON_3_ID}:
-              if (sl_button_3_action->state != "${RELAY_MODE_TEXT_NOT_USED}")
+              if (sl_button_3_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
+                ESP_LOGV("core_hw_relays", "Toggle relay 3: (%s)", sl_button_3_action->state.c_str());
                 sw_relay_3->toggle();
+              } else {
+                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 3: action is '%s'",
+                          sl_button_3_action->state.c_str());
+              }
               break;
             case ${BUTTON_4_ID}:
-              if (sl_button_4_action->state != "${RELAY_MODE_TEXT_NOT_USED}")
+              if (sl_button_4_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
+                ESP_LOGV("core_hw_relays", "Toggle relay 4: (%s)", sl_button_4_action->state.c_str());
                 sw_relay_4->toggle();
+              } else {
+                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 4: action is '%s'",
+                          sl_button_4_action->state.c_str());
+              }
               break;
           }
 
@@ -316,7 +351,7 @@ switch:
     name: Relay 1
     output: output_relay_1
     platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
+    restore_mode: ${RELAY_RESTORE_MODE}
     internal: true
     on_turn_on:
       then:
@@ -339,7 +374,7 @@ switch:
     name: Relay 2
     output: output_relay_2
     platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
+    restore_mode: ${RELAY_RESTORE_MODE}
     internal: true
     on_turn_on:
       then:
@@ -362,7 +397,7 @@ switch:
     name: Relay 3
     output: output_relay_3
     platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
+    restore_mode: ${RELAY_RESTORE_MODE}
     internal: true
     on_turn_on:
       then:
@@ -385,7 +420,7 @@ switch:
     name: Relay 4
     output: output_relay_4
     platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
+    restore_mode: ${RELAY_RESTORE_MODE}
     internal: true
     on_turn_on:
       then:

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml

@@ -311,9 +311,9 @@ script:
   - id: touch_on_release
     mode: restart
     then:
-      # Extended by:
-      #   - HW Buttons
-      #   - HW Vibration
+    # Extended by:
+    #   - HW Buttons
+    #   - HW Vibration
 
   - id: touch_swipe_left
     mode: restart

versioning/VERSION

@@ -1 +1 @@
-2024.12.9
+2024.12.11

versioning/VERSION_YAML

@@ -1 +1 @@
-version: 2024.12.9
+version: 2024.12.11