Edit esp-masterbdrmwest.yaml

esphome/esp-masterbdrmwest.yaml

@@ -6,11 +6,13 @@
 # https://home.fox.co.nz/gitea/zorruno/zorruno-homeassistant/src/branch/master/esphome/esp-masterbdrmwest.yaml
 #:########################################################################################:#
 # VERSIONS:
+# v1.3 2026-06-12 Reassigned logical controls after live wiring checks.
+#                 Relay 1 on both switches = North Lights virtual/Tasmota control.
+#                 Relay 2 on both switches = South Lights control; WEST Relay 2 is physical load.
+#                 Button 1 now controls North Lights; Button 2 now controls South Lights.
 # v1.2 2026-06-12 Reworked after live wiring checks.
 #                 Confirmed North Lights are controlled by Tasmota/iFan02 Power1.
-#                 Confirmed South Lights physical load is on this WEST switch Relay 2.
+#                 Confirmed South Lights physical load is on WEST switch Relay 2.
-#                 Relay 1 is now a virtual South Lights control/mirror.
-#                 Button 2 now sends Tasmota POWER1 TOGGLE and listens to stat POWER1 feedback.
 # v1.1 2026-06-12 North Lights controlled via Tasmota iFan02 MQTT cmnd/stat topics.
 # v1.0 2026-06-11 Initial YAML for Master Bedroom West 3-gang switch.
 #:########################################################################################:#
@@ -20,14 +22,15 @@
 #:########################################################################################:#
 # OPERATION NOTES:
 # - 3-gang KS-811 triple switch.
-# - Button 1 = Master Bedroom South Lights.
+# - Relay/Button 1 = Master Bedroom North Lights.
-#     * Actual South Lights physical load is on this WEST switch Relay 2.
-#     * Button 1 directly toggles Relay 2 for local/offline operation.
-#     * Relay 1 is virtual/mirror only and follows the South Lights state.
-# - Button 2 = Master Bedroom North Lights.
 #     * Actual North Lights are controlled by Tasmota/iFan02 light.tasmo_ifan02_3793_bedrm1_1.
-#     * Button 2 sends MQTT TOGGLE to the Tasmota POWER1 command topic.
+#     * Button 1 sends MQTT TOGGLE to the Tasmota POWER1 command topic.
-#     * Relay 2 is NOT used as a North Lights mirror because it is the physical South Lights load.
+#     * Relay 1 is virtual/mirror only and follows Tasmota POWER1 feedback.
+#     * Relay 1 can also be switched from HA; ON/OFF sends explicit Tasmota ON/OFF.
+# - Relay/Button 2 = Master Bedroom South Lights.
+#     * On this WEST switch, Relay 2 is the physical South Lights load.
+#     * Button 2 toggles Relay 2 directly.
+#     * Relay 2 publishes retained South Lights status for the SOUTH switch mirror.
 # - Button 3 = Bedside Lamp Jump/Fade via Home Assistant action.
 #     * Requires ESPHome integration permission: "Allow the device to perform Home Assistant actions".
 # - Relay 3 = unused output. Forced off/internal; Button 3 does NOT toggle Relay 3.
@@ -43,31 +46,44 @@
 #
 # - North Lights Tasmota status topic:
 #   ${north_lights_tasmota_status_topic}
-#     Payload "ON" / "OFF" updates internal North Lights state.
+#     Payload "ON" / "OFF" updates Relay 1 mirror state on both switches.
+#
+# - North Lights local command topic:
+#   ${mqtt_local_command_topic1}/set
+#     Payload "On" / "ON"   -> North Lights ON via Tasmota POWER1
+#     Payload "Off" / "OFF" -> North Lights OFF via Tasmota POWER1
+#     NOTE: TOGGLE is intentionally not handled here to avoid double-toggle if both switches receive it.
+#
+# - North Lights retained status/sync topic:
+#   ${mqtt_local_status_topic1}/state
+#     Payload "On" / "Off" mirrors the actual North Lights state.
 #
 # - South Lights local command topic:
 #   ${mqtt_local_command_topic2}/set
 #     Payload "On" / "ON"   -> Relay 2 ON
 #     Payload "Off" / "OFF" -> Relay 2 OFF
+#     NOTE: TOGGLE is intentionally not handled here to avoid ambiguous multi-device toggles.
 #
 # - South Lights retained status/sync topic:
 #   ${mqtt_local_status_topic2}/state
-#     Payload "On" / "Off" published when Relay 2 physical South Lights changes state.
+#     Payload "On" / "Off" published when Relay 2 changes state.
 #:########################################################################################:#
 # OFFLINE NOTES:
 # a) Home Assistant OFFLINE, WiFi OK, MQTT broker OK
-# - Button 1 controls the South Lights locally via WEST Relay 2 and publishes MQTT status.
+# - Button 1 controls the North Lights through direct Tasmota MQTT command.
-# - Button 2 controls the North Lights through direct Tasmota MQTT command.
+# - Button 2 controls the South Lights locally through Relay 2.
+# - Tasmota feedback updates Relay 1 mirror via stat POWER1.
+# - Relay 2 status updates the SOUTH switch mirror via the South Lights retained status topic.
 # - Button 3 cannot toggle the bedside lamp because it requires Home Assistant/API.
 #
 # b) MQTT OFFLINE (or broker unreachable), Home Assistant/API OK
-# - Button 1 still controls the South Lights locally via WEST Relay 2.
+# - Button 1 attempts HA action fallback to light.toggle the Tasmota/iFan02 HA entity.
-# - Button 2 attempts HA action fallback to light.toggle the Tasmota/iFan02 HA entity.
+# - Button 2 still controls the local South Lights Relay 2.
 # - Button 3 can still toggle the bedside lamp via Home Assistant/API.
 #
 # c) Home Assistant and MQTT OFFLINE, WiFi OK or entire network OFFLINE
-# - Button 1 still controls the local South Lights physical relay.
+# - Button 2 still controls local Relay 2 / South Lights.
-# - Button 2 cannot control the North Lights because they are on the separate Tasmota/iFan02 controller.
+# - Button 1 cannot control the North Lights unless MQTT or HA/API is available.
 # - Button 3 cannot control the bedside lamp.
 # - Accurate time is NOT needed (SNTP not needed).
 #:########################################################################################:#
@@ -81,12 +97,12 @@ substitutions:
   # Device Naming
   device_name: "esp-masterbdrmwest"
   friendly_name: "Master Bedroom Main Lights West"
-  description_comment: "Master Bedroom Main Lights West using a Zemismart KS-811 Triple Push Button. South Lights physical on Relay 2, Relay 1 South Lights mirror, North Lights Tasmota/iFan02 control on Button 2, Button 3 toggles bedside lamp jump/fade. (Layout V1.1)"
+  description_comment: "Master Bedroom Main Lights West using a Zemismart KS-811 Triple Push Button. Relay/Button 1 North Lights Tasmota/iFan02 virtual mirror, Relay/Button 2 South Lights physical load, Button 3 toggles bedside lamp jump/fade. (Layout V1.1)"
   device_area: "Master Bedroom"
 
   # Project Naming
   project_name: "Zemismart Technologies.KS-811 Triple"
-  project_version: "v1.2"
+  project_version: "v1.3"
 
   # Passwords & Secrets
   api_key: !secret esp-api_key
@@ -104,12 +120,12 @@ substitutions:
   update_interval: "60s"
 
   # MQTT LOCAL Controls
-  # NOTE: device_name1 is North Lights and maps to the Tasmota/iFan02 light.
+  # NOTE: device_name1 is North Lights and maps to Relay 1 / Tasmota/iFan02 light.
   mqtt_device_name1: "masterbrdm-northlights"
   mqtt_local_command_topic1: "${mqtt_command_main_topic}/${mqtt_device_name1}"
   mqtt_local_status_topic1: "${mqtt_status_main_topic}/${mqtt_device_name1}"
 
-  # NOTE: device_name2 is South Lights and maps to this WEST switch Relay 2 physical load.
+  # NOTE: device_name2 is South Lights and maps to Relay 2 / this WEST switch physical load.
   mqtt_device_name2: "masterbrdm-southlights"
   mqtt_local_command_topic2: "${mqtt_command_main_topic}/${mqtt_device_name2}"
   mqtt_local_status_topic2: "${mqtt_status_main_topic}/${mqtt_device_name2}"
@@ -123,8 +139,8 @@ substitutions:
   north_lights_ha_entity: "light.tasmo_ifan02_3793_bedrm1_1"
 
   # Switch/Relay/Button Naming
-  switch_1_name: "Master Bedroom South Lights"
+  switch_1_name: "Master Bedroom North Lights"
-  switch_2_name: "Master Bedroom South Lights" # NOTE: Relay 2 is the physical South Lights load on this WEST switch
+  switch_2_name: "Master Bedroom South Lights"
   switch_3_name: "Bedside Lamp Jump/Fade" # NOTE: Relay 3 output is unused and forced off
 
   # Home Assistant bedside lamp entity controlled by Button 3
@@ -198,6 +214,11 @@ logger:
 # Used to suppress MQTT/HA feedback loops and hold the last known remote states.
 #:########################################################################################:#
 globals:
+  - id: north_update_from_sync
+    type: bool
+    restore_value: false
+    initial_value: 'false'
+
   - id: south_update_from_sync
     type: bool
     restore_value: false
@@ -208,6 +229,11 @@ globals:
     restore_value: false
     initial_value: 'false'
 
+  - id: south_lights_state
+    type: bool
+    restore_value: false
+    initial_value: 'false'
+
 #:########################################################################################:#
 # MQTT: Device-specific MQTT command + retained status/sync triggers
 # This adds device-specific MQTT command triggers to the common MQTT configuration.
@@ -225,6 +251,8 @@ mqtt:
   on_message:
     # -------------------------------------------------------------------------
     # North Lights local command topic -> Tasmota/iFan02 command topic
+    # NOTE: TOGGLE is intentionally ignored here to avoid double-toggle if both
+    # switches receive the same MQTT command. Buttons publish TOGGLE directly.
     # -------------------------------------------------------------------------
     - topic: "${mqtt_local_command_topic1}/set"
       then:
@@ -233,8 +261,6 @@ mqtt:
               id(request_north_lights_on).execute();
             } else if (x == "Off" || x == "OFF" || x == "off") {
               id(request_north_lights_off).execute();
-            } else if (x == "Toggle" || x == "TOGGLE" || x == "toggle") {
-              id(request_north_lights_toggle).execute();
             }
 
     # Tasmota/iFan02 POWER1 feedback is the source of truth for North Lights state.
@@ -242,11 +268,19 @@ mqtt:
       then:
         - lambda: |-
             if (x == "ON" || x == "On" || x == "on") {
-              id(north_lights_state) = true;
+              id(set_north_on_from_tasmota).execute();
-              id(publish_north_status_on).execute();
             } else if (x == "OFF" || x == "Off" || x == "off") {
-              id(north_lights_state) = false;
+              id(set_north_off_from_tasmota).execute();
-              id(publish_north_status_off).execute();
+            }
+
+    # Retained North status is a secondary mirror/sync path.
+    - topic: "${mqtt_local_status_topic1}/state"
+      then:
+        - lambda: |-
+            if (x == "On" || x == "ON" || x == "on") {
+              id(set_north_on_from_sync).execute();
+            } else if (x == "Off" || x == "OFF" || x == "off") {
+              id(set_north_off_from_sync).execute();
             }
 
     # -------------------------------------------------------------------------
@@ -259,18 +293,16 @@ mqtt:
               id(request_south_lights_on).execute();
             } else if (x == "Off" || x == "OFF" || x == "off") {
               id(request_south_lights_off).execute();
-            } else if (x == "Toggle" || x == "TOGGLE" || x == "toggle") {
-              id(toggle_south_lights_local).execute();
             }
 
-    # Retained South status is used only to keep Relay 1 mirror in step.
+    # Retained South status keeps this physical relay and the SOUTH mirror in step.
     - topic: "${mqtt_local_status_topic2}/state"
       then:
         - lambda: |-
             if (x == "On" || x == "ON" || x == "on") {
-              id(set_south_mirror_on).execute();
+              id(set_south_on_from_sync).execute();
             } else if (x == "Off" || x == "OFF" || x == "off") {
-              id(set_south_mirror_off).execute();
+              id(set_south_off_from_sync).execute();
             }
 
 #:########################################################################################:#
@@ -288,27 +320,27 @@ status_led:
 #:########################################################################################:#
 binary_sensor:
   # Button 1 (GPIO16) - polling (GPIO16 has no interrupts)
-  # South Lights: direct local physical control through Relay 2.
+  # North Lights: direct TOGGLE to Tasmota/iFan02. Relay 1 follows Tasmota feedback only.
   - platform: gpio
     pin:
       number: GPIO16
       mode: INPUT
       inverted: true
     use_interrupt: false
-    name: "Button 1: Master Bedroom South Lights"
+    name: "Button 1: ${switch_1_name}"
     on_press:
-      - switch.toggle: relay_2
+      - script.execute: request_north_lights_toggle
 
   # Button 2 (GPIO05)
-  # North Lights: direct TOGGLE to Tasmota/iFan02. Relay 2 is not used for North because it is South physical load.
+  # South Lights: direct local physical control through Relay 2.
   - platform: gpio
     pin:
       number: GPIO05
       mode: INPUT
       inverted: true
-    name: "Button 2: Master Bedroom North Lights"
+    name: "Button 2: ${switch_2_name}"
     on_press:
-      - script.execute: request_north_lights_toggle
+      - switch.toggle: relay_2
 
   # Button 3 (GPIO04)
   # NOTE: This does not toggle Relay 3. It checks the HA entity state and calls the opposite HA action.
@@ -332,46 +364,9 @@ binary_sensor:
 # https://esphome.io/components/script.html
 #:########################################################################################:#
 script:
-  # ---------------------------------------------------------------------------
-  # South Lights helpers
-  # Actual physical South Lights relay is this WEST switch Relay 2.
-  # ---------------------------------------------------------------------------
-  - id: request_south_lights_on
-    mode: restart
-    then:
-      - switch.turn_on: relay_2
-
-  - id: request_south_lights_off
-    mode: restart
-    then:
-      - switch.turn_off: relay_2
-
-  - id: toggle_south_lights_local
-    mode: restart
-    then:
-      - switch.toggle: relay_2
-
-  - id: set_south_mirror_on
-    mode: restart
-    then:
-      - lambda: |-
-          id(south_update_from_sync) = true;
-      - switch.turn_on: relay_1
-      - lambda: |-
-          id(south_update_from_sync) = false;
-
-  - id: set_south_mirror_off
-    mode: restart
-    then:
-      - lambda: |-
-          id(south_update_from_sync) = true;
-      - switch.turn_off: relay_1
-      - lambda: |-
-          id(south_update_from_sync) = false;
-
   # ---------------------------------------------------------------------------
   # North Lights helpers
-  # Actual North Lights are Tasmota/iFan02 POWER1.
+  # Actual North Lights are Tasmota/iFan02 POWER1. Relay 1 is the local mirror/control.
   # ---------------------------------------------------------------------------
   - id: request_north_lights_toggle
     mode: restart
@@ -396,7 +391,7 @@ script:
                 else:
                   - logger.log:
                       level: WARN
-                      format: "Button 2 pressed, but MQTT and HA/API are not connected. North Lights not changed."
+                      format: "Button 1 pressed, but MQTT and HA/API are not connected. North Lights not changed."
 
   - id: request_north_lights_on
     mode: restart
@@ -412,21 +407,87 @@ script:
           topic: "${north_lights_tasmota_command_topic}"
           payload: "OFF"
 
-  - id: publish_north_status_on
+  - id: set_north_on_from_tasmota
     mode: restart
     then:
+      - lambda: |-
+          id(north_lights_state) = true;
+          id(north_update_from_sync) = true;
+      - switch.turn_on: relay_1
       - mqtt.publish:
           topic: "${mqtt_local_status_topic1}/state"
           payload: "On"
           retain: true
+      - lambda: |-
+          id(north_update_from_sync) = false;
 
-  - id: publish_north_status_off
+  - id: set_north_off_from_tasmota
     mode: restart
     then:
+      - lambda: |-
+          id(north_lights_state) = false;
+          id(north_update_from_sync) = true;
+      - switch.turn_off: relay_1
       - mqtt.publish:
           topic: "${mqtt_local_status_topic1}/state"
           payload: "Off"
           retain: true
+      - lambda: |-
+          id(north_update_from_sync) = false;
+
+  - id: set_north_on_from_sync
+    mode: restart
+    then:
+      - lambda: |-
+          id(north_lights_state) = true;
+          id(north_update_from_sync) = true;
+      - switch.turn_on: relay_1
+      - lambda: |-
+          id(north_update_from_sync) = false;
+
+  - id: set_north_off_from_sync
+    mode: restart
+    then:
+      - lambda: |-
+          id(north_lights_state) = false;
+          id(north_update_from_sync) = true;
+      - switch.turn_off: relay_1
+      - lambda: |-
+          id(north_update_from_sync) = false;
+
+  # ---------------------------------------------------------------------------
+  # South Lights helpers
+  # Actual physical South Lights relay is this WEST switch Relay 2.
+  # ---------------------------------------------------------------------------
+  - id: request_south_lights_on
+    mode: restart
+    then:
+      - switch.turn_on: relay_2
+
+  - id: request_south_lights_off
+    mode: restart
+    then:
+      - switch.turn_off: relay_2
+
+  - id: set_south_on_from_sync
+    mode: restart
+    then:
+      - lambda: |-
+          id(south_lights_state) = true;
+          id(south_update_from_sync) = true;
+      - switch.turn_on: relay_2
+      - lambda: |-
+          id(south_update_from_sync) = false;
+
+  - id: set_south_off_from_sync
+    mode: restart
+    then:
+      - lambda: |-
+          id(south_lights_state) = false;
+          id(south_update_from_sync) = true;
+      - switch.turn_off: relay_2
+      - lambda: |-
+          id(south_update_from_sync) = false;
 
   # ---------------------------------------------------------------------------
   # Bedside lamp helper
@@ -462,7 +523,7 @@ script:
 # https://esphome.io/components/switch/
 #:########################################################################################:#
 switch:
-  # Relay 1 (GPIO13) - Master Bedroom South Lights - VIRTUAL/MIRROR ONLY ON THIS SWITCH
+  # Relay 1 (GPIO13) - Master Bedroom North Lights - VIRTUAL/MIRROR ONLY ON THIS SWITCH
   - platform: gpio
     name: "Relay 1: ${switch_1_name}"
     pin: GPIO13
@@ -470,13 +531,13 @@ switch:
     restore_mode: RESTORE_DEFAULT_OFF
     on_turn_on:
       - lambda: |-
-          if (!id(south_update_from_sync)) {
+          if (!id(north_update_from_sync)) {
-            id(request_south_lights_on).execute();
+            id(request_north_lights_on).execute();
           }
     on_turn_off:
       - lambda: |-
-          if (!id(south_update_from_sync)) {
+          if (!id(north_update_from_sync)) {
-            id(request_south_lights_off).execute();
+            id(request_north_lights_off).execute();
           }
 
   # Relay 2 (GPIO12) - Master Bedroom South Lights - PHYSICAL LOAD CONNECTED HERE
@@ -486,17 +547,33 @@ switch:
     id: relay_2
     restore_mode: RESTORE_DEFAULT_OFF
     on_turn_on:
-      - mqtt.publish:
+      - lambda: |-
-          topic: "${mqtt_local_status_topic2}/state"
+          id(south_lights_state) = true;
-          payload: "On"
+          if (!id(south_update_from_sync)) {
-          retain: true
+            // Publish retained state for the SOUTH switch mirror and any MQTT consumers.
-      - script.execute: set_south_mirror_on
+          }
+      - if:
+          condition:
+            lambda: 'return !id(south_update_from_sync);'
+          then:
+            - mqtt.publish:
+                topic: "${mqtt_local_status_topic2}/state"
+                payload: "On"
+                retain: true
     on_turn_off:
-      - mqtt.publish:
+      - lambda: |-
-          topic: "${mqtt_local_status_topic2}/state"
+          id(south_lights_state) = false;
-          payload: "Off"
+          if (!id(south_update_from_sync)) {
-          retain: true
+            // Publish retained state for the SOUTH switch mirror and any MQTT consumers.
-      - script.execute: set_south_mirror_off
+          }
+      - if:
+          condition:
+            lambda: 'return !id(south_update_from_sync);'
+          then:
+            - mqtt.publish:
+                topic: "${mqtt_local_status_topic2}/state"
+                payload: "Off"
+                retain: true
 
   # Relay 3 (GPIO14) - unused output, intentionally not exposed to Home Assistant.
   # Button 3 controls the bedside lamp via Home Assistant/API instead.