a bunch of esphome improvements

packages/pool_light_switch_sync.yaml

@@ -1,17 +1,60 @@
 automation:
-  - alias: Turn on pool light with downstairs lounge switch
+  - id: poollight_sync_tasmo_on
+    alias: "Sync TASMO → Pool Light (turn ON)"
     trigger:
-      platform: state
-      entity_id: switch.tasmo_ks811t_0707_downstloun_2c
-      to: "on"
+      - platform: state
+        entity_id: switch.tasmo_ks811t_0707_downstloun_2c
+        to: "on"
+    condition:
+      - condition: state
+        entity_id: switch.esp_poollightpower_power_output
+        state: "off"
     action:
-      service: homeassistant.turn_on
-      entity_id: switch.tasmo_athplug_5103_1
-  - alias: Turn off pool light with downstairs lounge switch
+      - service: switch.turn_on
+        target:
+          entity_id: switch.esp_poollightpower_power_output
+
+  - id: poollight_sync_tasmo_off
+    alias: "Sync TASMO → Pool Light (turn OFF)"
     trigger:
-      platform: state
-      entity_id: switch.tasmo_ks811t_0707_downstloun_2c
-      to: "off"
+      - platform: state
+        entity_id: switch.tasmo_ks811t_0707_downstloun_2c
+        to: "off"
+    condition:
+      - condition: state
+        entity_id: switch.esp_poollightpower_power_output
+        state: "on"
     action:
-      service: homeassistant.turn_off
-      entity_id: switch.tasmo_athplug_5103_1
+      - service: switch.turn_off
+        target:
+          entity_id: switch.esp_poollightpower_power_output
+
+  - id: poollight_sync_athplug_on
+    alias: "Sync Pool Light → TASMO (turn ON)"
+    trigger:
+      - platform: state
+        entity_id: switch.esp_poollightpower_power_output
+        to: "on"
+    condition:
+      - condition: state
+        entity_id: switch.tasmo_ks811t_0707_downstloun_2c
+        state: "off"
+    action:
+      - service: switch.turn_on
+        target:
+          entity_id: switch.tasmo_ks811t_0707_downstloun_2c
+
+  - id: poollight_sync_athplug_off
+    alias: "Sync Pool Light → TASMO (turn OFF)"
+    trigger:
+      - platform: state
+        entity_id: switch.esp_poollightpower_power_output
+        to: "off"
+    condition:
+      - condition: state
+        entity_id: switch.tasmo_ks811t_0707_downstloun_2c
+        state: "on"
+    action:
+      - service: switch.turn_off
+        target:
+          entity_id: switch.tasmo_ks811t_0707_downstloun_2c

packages/simulation_lights.yaml

@@ -1,29 +1,7 @@
-#simulation_lights:
-#  name: Simulation Lights
-#  # Lights included in 'away from home' random patterns
-#  entities:
-#    - switch.tasmo_ks811d_1242_entrance_a # Entranceway Main Lights
-#    - switch.tasmo_ks811d_0302_entrybath_a # Entranceway Guest Bathroom Lights
-#    - switch.tasmo_ks811d_6110_kitchen_a # Main Kitchen, Main Lights
-#    - switch.tasmo_ks811d_6110_kitchen_b # Main Kitchen, Bench Lights
-#    - switch.tasmo_ks811s_2940_hallway_1a # Hallway Main Lights
-#    - switch.tasmo_ks811d_1701_stairs_2a # Stairs, Lower ceiling lights
-#    - switch.tasmo_ks811t_0702_lounge_3a # Lounge Main, South
-#    - switch.tasmo_ks811t_0702_lounge_3b # Lounge Main, Middle
-#    - switch.tasmo_ks811t_0702_lounge_3c # Lounge Main, North (above stairs)
-#    - switch.tasmo_ks811t_0707_downstloun_2a # Foxhole Lounge Main Lights
-#    - switch.tasmo_ks811t_0707_downstloun_2b # Foxhole Lounge Wall Lights
-#    - switch.tasmo_ks811s_3136_downstbed2_1a # Foxhole Craft Room Lights
-#    - switch.tasmo_ks811t_3642_downstbed1_1a # Foxhole Main Bedroom, Main Lights
-#    - switch.tasmo_ks811t_2192_downstkitch_1a # Foxhole Kitchen Entry Lights
-#    - switch.tasmo_ks811t_2192_downstkitch_1b # Foxhole Kitchen Main Lights
-#    - switch.tasmo_ks811t_1181_downstbath_a # Foxhole Downstairs Bathroom Main Lights
-#    - switch.tasmo_s4chan_4231_underhouselights_b # Underhouse Main Lights
-
 switch:
   - platform: group
     name: Simulation Lights
-    # Lights included in 'away from home' random patternsentities:
+    # Lights included in 'away from home' random pattern
     entities:
       - switch.tasmo_ks811d_1242_entrance_a # Entranceway Main Lights
       - switch.tasmo_ks811d_0302_entrybath_a # Entranceway Guest Bathroom Lights
@@ -38,7 +16,8 @@ switch:
       - switch.tasmo_ks811t_0707_downstloun_2b # Foxhole Lounge Wall Lights
       - switch.tasmo_ks811s_3136_downstbed2_1a # Foxhole Craft Room Lights
       - switch.tasmo_ks811t_3642_downstbed1_1a # Foxhole Main Bedroom, Main Lights
-      - switch.tasmo_ks811t_2192_downstkitch_1a # Foxhole Kitchen Entry Lights
-      - switch.tasmo_ks811t_2192_downstkitch_1b # Foxhole Kitchen Main Lights
-      - switch.esp_downstbathswitch_relay_main_light # Foxhole Downstairs Bathroom Main Lights
       - switch.tasmo_s4chan_4231_underhouselights_b # Underhouse Main Lights
+      - switch.esp_downstkitchlights_relay_1_dining_light
+      - switch.esp_downstkitchlights_relay_2_kitchen_light
+      - switch.esp_downstbathswitch_relay_1_main_lights
+      - switch.esp_downstbathswitch_relay_2_cabinet_light