laundry esphome migration

esphome/esp-downstbathswitch.yaml

@@ -1,32 +1,31 @@
 #############################################
 #############################################
 # DOWNSTAIRS BATHROOM MAIN LIGHTSWITCH 
-# Zemismart KS-811 Triple push button
-#
 # V1.0 2025-02-14 Initial Version
-# 
+#############################################
+# Zemismart KS-811 Triple push button
 # pinout/schematic https://community.home-assistant.io/t/zemismart-ks-811-working-with-esphome/
 #
-# INSTRUCTIONS
+# NOTES
 # - 
 #
 #############################################
 #############################################
 
-substitutions:
 #############################################
 # SPECIFIC DEVICE VARIABLE SUBSTITUTIONS
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
 #############################################
+substitutions:
   devicename: "esp-downstbathswitch"
-  friendly_name: "Downstairs Bath Lightswitch"
+  friendly_name: "Downstairs Bath Lightswitch (3)"
   description_comment: "Downstairs Bathroom Main Lightswitch using a Zemismart KS-811 Triple Push Button. Main Light (1), Cabinet Light (2), Extract Fan (3)"
-  
   api_key: !secret esp-downstbathswitch_api_key # unfortunately you can't use substitutions inside secrets names
   ota_pass: !secret esp-downstbathswitch_ota_pass # unfortunately you can't use substitutions inside secrets names
   static_ip_address: !secret esp-downstbathswitch_ip
-
-  update_interval: 60s # update time for for general sensors etc
+  log_level: "INFO" # Define logging level: NONE, ERROR, WARN, INFO, DEBUG (Default), VERBOSE, VERY_VERBOSE
+  update_interval: "60s" # update time for for general sensors etc
+  room: "Downstairs Bathroom" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
 
 #############################################
 # Included Common Packages
@@ -37,17 +36,23 @@ packages:
     file: common/network_common.yaml
     vars:
       local_static_ip_address: ${static_ip_address}
-      local_api_key: ${api_key}
       local_ota_pass: ${ota_pass}
+  common_api: !include
+    file: common/api_common.yaml
+    vars:
+      local_api_key: ${api_key}
+#  common_webportal: !include
+#    file: common/webportal_common.yaml
   common_mqtt: !include
     file: common/mqtt_common.yaml
+  common_sntp: !include
+    file: common/sntp_common.yaml
   common_general_sensors: !include
     file: common/sensors_common.yaml
     vars:
       local_friendly_name: ${friendly_name}
       local_update_interval: ${update_interval}
 
-
 #  common_multiclick_pushbutton_Switch_2: !include
 #    file: common/multiclick_pushbutton_common.yaml
 #    vars:
@@ -86,23 +91,11 @@ esp8266:
 # https://esphome.io/components/logger.html
 ############################################# 
 logger:
-  level: INFO  #INFO Level suggested, or DEBUG for testing
+  level: ${log_level}  #INFO Level suggested, or DEBUG for testing
   #baud_rate: 0 #set to 0 for no logging via UART, needed if you are using it for other serial things (eg PZEM)
   #esp8266_store_log_strings_in_flash: false
   #tx_buffer_size: 64
 
-
-#############################################
-# Real time clock time source for ESPHome
-# If it's invalid, we fall back to an internal clock
-# https://esphome.io/components/time/
-# https://esphome.io/components/time/sntp
-#############################################
-time:
-  - platform: sntp
-    id: sntp_time
-
-
 #############################################
 # STATUS LED
 # https://esphome.io/components/status_led.html
@@ -112,7 +105,6 @@ status_led:
     number: GPIO2
     inverted: yes
 
-
 #############################################
 # BINARY SENSORS
 # https://esphome.io/components/binary_sensor/
@@ -123,7 +115,7 @@ binary_sensor:
       number: GPIO16
       mode: INPUT
       inverted: True
-    name: "Button: Light Switch 1 (Main)"
+    name: "Button 1: Light Switch 1 (Main)"
     on_press:
       - switch.toggle: Relay_1
 
@@ -132,7 +124,7 @@ binary_sensor:
       number: GPIO05
       mode: INPUT
       inverted: True
-    name: "Button: Light Switch 2 (Cabinet)"
+    name: "Button 2: Light Switch 2 (Cabinet)"
     on_press:
       - switch.toggle: Relay_2
 
@@ -141,7 +133,7 @@ binary_sensor:
       number: GPIO4
       mode: INPUT
       inverted: True
-    name: "Button: Light Switch 3 (Fan)"
+    name: "Button 3: Light Switch 3 (Fan)"
     on_multi_click:
       # Single click: 1 press → relay on for 5 minutes
       - timing:
@@ -206,40 +198,21 @@ binary_sensor:
               else:
                 - switch.turn_on: Relay_3
 
-#  - platform: gpio
-#    pin:
-#      number: GPIO04
-#      mode: INPUT
-#      inverted: True
-#    name: "Button: Light Switch 3 (Fan)"
-#    on_press:
-#      - switch.toggle: Relay_3
-
-#  - platform: gpio
-#    pin:
-#      number: GPIO05
-#      mode: INPUT
-#      inverted: True
-#    name: "Button: Light Switch 2 (Cabinet)"
-#    on_press:
-#      - switch.toggle: Relay_2
-
-
 #############################################
 # SWITCH COMPONENT
 # https://esphome.io/components/switch/
 #############################################
 switch:
   - platform: gpio
-    name: "Relay: Main Light"
+    name: "Relay 1: Main Light"
     pin: GPIO13
     id: Relay_1
   - platform: gpio
-    name: "Relay: Cabinet Light"
+    name: "Relay 2: Cabinet Light"
     pin: GPIO12
     id: Relay_2
   - platform: gpio
-    name: "Relay: Extract Fan"
+    name: "Relay 3: Extract Fan"
     pin: GPIO14
     id: Relay_3