From ca1f1637cb373c2c936c0025a65e2addc5c09d3a Mon Sep 17 00:00:00 2001 From: ESPHome Device Builder Date: Fri, 12 Jun 2026 22:17:50 +1200 Subject: [PATCH] Edit esp-masterbdrmsouth.yaml --- esphome/esp-masterbdrmsouth.yaml | 324 +++++++++++++++++-------------- 1 file changed, 181 insertions(+), 143 deletions(-) diff --git a/esphome/esp-masterbdrmsouth.yaml b/esphome/esp-masterbdrmsouth.yaml index aecf632..775318c 100644 --- a/esphome/esp-masterbdrmsouth.yaml +++ b/esphome/esp-masterbdrmsouth.yaml @@ -6,12 +6,13 @@ # https://home.fox.co.nz/gitea/zorruno/zorruno-homeassistant/src/branch/master/esphome/esp-masterbdrmsouth.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 WEST switch Relay 2. -# South switch Relay 1 is now a virtual South Lights control/mirror. -# South switch Relay 2 is now a virtual North 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 South 3-gang switch. #:########################################################################################:# @@ -21,14 +22,15 @@ #:########################################################################################:# # OPERATION NOTES: # - 3-gang KS-811 triple switch. -# - Button 1 = Master Bedroom South Lights. -# * On this SOUTH switch, Relay 1 is virtual/mirror only. -# * Actual South Lights physical load is WEST switch Relay 2. -# * Button 1 toggles Relay 1, which sends the South Lights command to the WEST switch. -# - Button 2 = Master Bedroom North Lights. +# - Relay/Button 1 = 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. -# * Relay 2 is virtual/mirror only and follows Tasmota POWER1 feedback. +# * Button 1 sends MQTT TOGGLE to the Tasmota POWER1 command topic. +# * 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 SOUTH switch, Relay 2 is virtual/mirror/control only. +# * Actual South Lights physical load is WEST switch Relay 2. +# * Button 2 toggles Relay 2, which sends the South Lights command to the WEST switch. # - 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. @@ -44,12 +46,23 @@ # # - North Lights Tasmota status topic: # ${north_lights_tasmota_status_topic} -# Payload "ON" / "OFF" updates Relay 2 mirror state on this switch. +# 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" -> South Lights ON via WEST Relay 2 # Payload "Off" / "OFF" -> South Lights OFF via WEST Relay 2 +# NOTE: TOGGLE is intentionally not handled here to avoid ambiguous multi-device toggles. # # - South Lights retained status/sync topic: # ${mqtt_local_status_topic2}/state @@ -57,14 +70,15 @@ #:########################################################################################:# # OFFLINE NOTES: # a) Home Assistant OFFLINE, WiFi OK, MQTT broker OK -# - Button 1 controls the South Lights through MQTT command to the WEST switch. -# - Button 2 controls the North Lights through direct Tasmota MQTT command. -# - Tasmota feedback updates Relay 2 mirror via stat POWER1. +# - Button 1 controls the North Lights through direct Tasmota MQTT command. +# - Button 2 controls the South Lights through MQTT command to the WEST switch. +# - Tasmota feedback updates Relay 1 mirror via stat POWER1. +# - WEST Relay 2 status updates Relay 2 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 attempts HA action fallback to the WEST physical South Lights relay entity. -# - Button 2 attempts HA action fallback to light.toggle the Tasmota/iFan02 HA entity. +# - Button 1 attempts HA action fallback to light.toggle the Tasmota/iFan02 HA entity. +# - Button 2 attempts HA action fallback to the WEST physical South Lights relay entity. # - Button 3 can still toggle the bedside lamp via Home Assistant/API. # # c) Home Assistant and MQTT OFFLINE, WiFi OK or entire network OFFLINE @@ -82,12 +96,12 @@ substitutions: # Device Naming device_name: "esp-masterbdrmsouth" friendly_name: "Master Bedroom Main Lights South" - description_comment: "Master Bedroom Main Lights South using a Zemismart KS-811 Triple Push Button. South Lights virtual control on Relay 1, North Lights Tasmota/iFan02 virtual mirror on Relay 2, Button 3 toggles bedside lamp jump/fade. (Layout V1.1)" + description_comment: "Master Bedroom Main Lights South using a Zemismart KS-811 Triple Push Button. Relay/Button 1 North Lights Tasmota/iFan02 virtual mirror, Relay/Button 2 South Lights virtual control, 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 @@ -105,12 +119,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 WEST switch Relay 2 physical load. + # NOTE: device_name2 is South Lights and maps to Relay 2 / 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}" @@ -122,12 +136,12 @@ substitutions: # Home Assistant fallback entities north_lights_ha_entity: "light.tasmo_ifan02_3793_bedrm1_1" - # NOTE: If HA renames WEST Relay 2 after the YAML name correction, update this entity_id. - south_lights_physical_entity: "switch.master_bedroom_master_bedroom_main_lights_west_relay_2_master_bedroom_north_lights" + # NOTE: If HA renames WEST Relay 2 after this YAML name correction, update this entity_id. + south_lights_physical_entity: "switch.master_bedroom_master_bedroom_main_lights_west_relay_2_master_bedroom_south_lights" # Switch/Relay/Button Naming - switch_1_name: "Master Bedroom South Lights" - switch_2_name: "Master Bedroom North Lights" + switch_1_name: "Master Bedroom North Lights" + 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 @@ -201,12 +215,17 @@ 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 initial_value: 'false' - - id: north_update_from_tasmota + - id: north_lights_state type: bool restore_value: false initial_value: 'false' @@ -216,11 +235,6 @@ globals: restore_value: false initial_value: 'false' - - id: north_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. @@ -238,6 +252,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: @@ -246,8 +262,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. @@ -260,19 +274,23 @@ mqtt: id(set_north_off_from_tasmota).execute(); } - # ------------------------------------------------------------------------- - # South Lights command/status. Actual physical South load is WEST Relay 2. - # This SOUTH switch mirrors the state on Relay 1. - # ------------------------------------------------------------------------- - - topic: "${mqtt_local_command_topic2}/set" + # 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_south_on_from_sync).execute(); + id(set_north_on_from_sync).execute(); } else if (x == "Off" || x == "OFF" || x == "off") { - id(set_south_off_from_sync).execute(); + id(set_north_off_from_sync).execute(); } + # ------------------------------------------------------------------------- + # South Lights status. Actual physical South load is WEST Relay 2. + # This SOUTH switch publishes commands but does NOT subscribe to its own + # command topic, to avoid command echo/chatter. The WEST switch publishes + # retained status after the physical Relay 2 changes, and this switch mirrors + # that status onto its local Relay 2. + # ------------------------------------------------------------------------- - topic: "${mqtt_local_status_topic2}/state" then: - lambda: |- @@ -297,7 +315,7 @@ status_led: #:########################################################################################:# binary_sensor: # Button 1 (GPIO16) - polling (GPIO16 has no interrupts) - # South Lights: toggles virtual Relay 1, which sends command to WEST physical Relay 2. + # North Lights: direct TOGGLE to Tasmota/iFan02. Relay 1 follows Tasmota feedback only. - platform: gpio pin: number: GPIO16 @@ -306,10 +324,10 @@ binary_sensor: use_interrupt: false name: "Button 1: ${switch_1_name}" on_press: - - switch.toggle: relay_1 + - script.execute: request_north_lights_toggle # Button 2 (GPIO05) - # North Lights: direct TOGGLE to Tasmota/iFan02. Relay 2 follows Tasmota feedback only. + # South Lights: toggles virtual Relay 2, which sends command to WEST physical Relay 2. - platform: gpio pin: number: GPIO05 @@ -317,7 +335,7 @@ binary_sensor: inverted: true 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. @@ -341,83 +359,9 @@ binary_sensor: # https://esphome.io/components/script.html #:########################################################################################:# script: - # --------------------------------------------------------------------------- - # South Lights helpers - # Actual physical South Lights relay is WEST switch Relay 2. - # --------------------------------------------------------------------------- - - id: request_south_lights_on - mode: restart - then: - - if: - condition: - mqtt.connected: - then: - - mqtt.publish: - topic: "${mqtt_local_command_topic2}/set" - payload: "On" - else: - - if: - condition: - api.connected: - state_subscription_only: true - then: - - homeassistant.action: - action: switch.turn_on - data: - entity_id: "${south_lights_physical_entity}" - else: - - logger.log: - level: WARN - format: "Button 1 pressed, but MQTT and HA/API are not connected. South Lights not changed." - - - id: request_south_lights_off - mode: restart - then: - - if: - condition: - mqtt.connected: - then: - - mqtt.publish: - topic: "${mqtt_local_command_topic2}/set" - payload: "Off" - else: - - if: - condition: - api.connected: - state_subscription_only: true - then: - - homeassistant.action: - action: switch.turn_off - data: - entity_id: "${south_lights_physical_entity}" - else: - - logger.log: - level: WARN - format: "Button 1 pressed, but MQTT and HA/API are not connected. South Lights not changed." - - - 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_1 - - 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_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 @@ -442,7 +386,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 @@ -463,28 +407,122 @@ script: then: - lambda: |- id(north_lights_state) = true; - id(north_update_from_tasmota) = true; - - switch.turn_on: relay_2 + 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_tasmota) = false; + id(north_update_from_sync) = false; - id: set_north_off_from_tasmota mode: restart then: - lambda: |- id(north_lights_state) = false; - id(north_update_from_tasmota) = true; - - switch.turn_off: relay_2 + 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_tasmota) = false; + 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 WEST switch Relay 2. Relay 2 is the local mirror/control. + # --------------------------------------------------------------------------- + - id: request_south_lights_on + mode: restart + then: + - if: + condition: + mqtt.connected: + then: + - mqtt.publish: + topic: "${mqtt_local_command_topic2}/set" + payload: "On" + else: + - if: + condition: + api.connected: + state_subscription_only: true + then: + - homeassistant.action: + action: switch.turn_on + data: + entity_id: "${south_lights_physical_entity}" + else: + - logger.log: + level: WARN + format: "Button 2 pressed, but MQTT and HA/API are not connected. South Lights not changed." + + - id: request_south_lights_off + mode: restart + then: + - if: + condition: + mqtt.connected: + then: + - mqtt.publish: + topic: "${mqtt_local_command_topic2}/set" + payload: "Off" + else: + - if: + condition: + api.connected: + state_subscription_only: true + then: + - homeassistant.action: + action: switch.turn_off + data: + entity_id: "${south_lights_physical_entity}" + else: + - logger.log: + level: WARN + format: "Button 2 pressed, but MQTT and HA/API are not connected. South Lights not changed." + + - 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 @@ -520,12 +558,29 @@ 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 id: relay_1 restore_mode: RESTORE_DEFAULT_OFF + on_turn_on: + - lambda: |- + if (!id(north_update_from_sync)) { + id(request_north_lights_on).execute(); + } + on_turn_off: + - lambda: |- + if (!id(north_update_from_sync)) { + id(request_north_lights_off).execute(); + } + + # Relay 2 (GPIO12) - Master Bedroom South Lights - VIRTUAL/MIRROR ONLY ON THIS SWITCH + - platform: gpio + name: "Relay 2: ${switch_2_name}" + pin: GPIO12 + id: relay_2 + restore_mode: RESTORE_DEFAULT_OFF on_turn_on: - lambda: |- if (!id(south_update_from_sync)) { @@ -537,23 +592,6 @@ switch: id(request_south_lights_off).execute(); } - # Relay 2 (GPIO12) - Master Bedroom North Lights - VIRTUAL/MIRROR ONLY ON THIS SWITCH - - platform: gpio - name: "Relay 2: ${switch_2_name}" - pin: GPIO12 - id: relay_2 - restore_mode: RESTORE_DEFAULT_OFF - on_turn_on: - - lambda: |- - if (!id(north_update_from_tasmota)) { - id(request_north_lights_on).execute(); - } - on_turn_off: - - lambda: |- - if (!id(north_update_from_tasmota)) { - id(request_north_lights_off).execute(); - } - # Relay 3 (GPIO14) - unused output, intentionally not exposed to Home Assistant. # Button 3 controls the bedside lamp via Home Assistant/API instead. - platform: gpio