a bunch of esphome improvements

esphome/esp-downstbathswitch.yaml

@@ -1,6 +1,7 @@
 #############################################
 #############################################
 # DOWNSTAIRS BATHROOM MAIN LIGHTSWITCH 
+# V2.0 2025-06-05 YAML Tidyups
 # V1.0 2025-02-14 Initial Version
 #############################################
 # Zemismart KS-811 Triple push button
@@ -17,15 +18,29 @@
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
 #############################################
 substitutions:
+  # Device Naming
   devicename: "esp-downstbathswitch"
   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)"
+  device_area: "Downstairs Bathroom" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
+  
+  # Project Naming
+  project_name: "Zemismart Technologies.KS-811 Triple" # Project Details 
+  project_version: "v2.0"  # Project V denotes release of yaml file, allowing checking of deployed vs latest version
+
+  # Passwords
   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
+
+  # Device Settings
   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.  
+
+  # Switch Naming
+  switch_1_name: "Main Lights"
+  switch_2_name: "Cabinet Light"
+  switch_3_name: "Extract Fan" # This is virtual only, no power connected to 3rd relay 
 
 #############################################
 # Included Common Packages
@@ -35,49 +50,32 @@ packages:
   common_wifi: !include
     file: common/network_common.yaml
     vars:
-      local_static_ip_address: ${static_ip_address}
-      local_ota_pass: ${ota_pass}
+      local_static_ip_address: "${static_ip_address}"
+      local_ota_pass: "${ota_pass}"
   common_api: !include
     file: common/api_common.yaml
     vars:
-      local_api_key: ${api_key}
+      local_api_key: "${api_key}"
 #  common_webportal: !include
 #    file: common/webportal_common.yaml
-  common_mqtt: !include
-    file: common/mqtt_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}
+      local_friendly_name: "${friendly_name}"
+      local_update_interval: "${update_interval}"
 
-#  common_multiclick_pushbutton_Switch_2: !include
-#    file: common/multiclick_pushbutton_common.yaml
-#    vars:
-#      local_name: "Button: Light Switch 2 (Cabinet)"
-#      local_gpio: GPIO05 # Switch 2 for KS-811 Triple is GPIO5
-#      local_relay_id: Relay_2 # ID of relay to turn on
-#      local_singleclick_duration: 7200000   # 2 hrs in ms
-#  common_multiclick_pushbutton_Switch_3: !include
-#    file: common/multiclick_pushbutton_common.yaml
-#    vars:
-#      local_name: "Button: Extract Fan"
-#      local_gpio: GPIO04 # Switch 3 for KS-811 Triple is GPIO4
-#      local_relay_id: Relay_3 # ID of relay to turn on
-#      local_singleclick_duration:  300000   # 5 minutes in ms
-#      local_doubleclick_duration: 1800000   # 30 minutes in ms
-#      local_tripleclick_duration: 7200000   # 2 hours in ms    
-  
 #############################################
 # ESPHome
 # https://esphome.io/components/esphome.html
 #############################################
 esphome:
-  name: ${devicename}
-  friendly_name: ${friendly_name}
-  comment: ${description_comment} #Appears on the esphome page in HA
+  name: "${devicename}"
+  friendly_name: "${friendly_name}"
+  comment: "${description_comment}" #Appears on the esphome page in HA
 
 #############################################
 # ESP Platform and Framework
@@ -91,7 +89,7 @@ esp8266:
 # https://esphome.io/components/logger.html
 ############################################# 
 logger:
-  level: ${log_level}  #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
@@ -103,7 +101,7 @@ logger:
 status_led:
   pin:
     number: GPIO2
-    inverted: yes
+    inverted: True
 
 #############################################
 # BINARY SENSORS
@@ -115,7 +113,7 @@ binary_sensor:
       number: GPIO16
       mode: INPUT
       inverted: True
-    name: "Button 1: Light Switch 1 (Main)"
+    name: "Button 1: ${switch_1_name}"
     on_press:
       - switch.toggle: Relay_1
 
@@ -124,7 +122,7 @@ binary_sensor:
       number: GPIO05
       mode: INPUT
       inverted: True
-    name: "Button 2: Light Switch 2 (Cabinet)"
+    name: "Button 2: ${switch_2_name}"
     on_press:
       - switch.toggle: Relay_2
 
@@ -133,7 +131,7 @@ binary_sensor:
       number: GPIO4
       mode: INPUT
       inverted: True
-    name: "Button 3: Light Switch 3 (Fan)"
+    name: "Button 3: ${switch_3_name}"
     on_multi_click:
       # Single click: 1 press → relay on for 5 minutes
       - timing:
@@ -204,15 +202,15 @@ binary_sensor:
 #############################################
 switch:
   - platform: gpio
-    name: "Relay 1: Main Light"
+    name: "Relay 1: ${switch_1_name}"
     pin: GPIO13
     id: Relay_1
   - platform: gpio
-    name: "Relay 2: Cabinet Light"
+    name: "Relay 2: ${switch_2_name}"
     pin: GPIO12
     id: Relay_2
   - platform: gpio
-    name: "Relay 3: Extract Fan"
+    name: "Relay 3: ${switch_3_name}"
     pin: GPIO14
     id: Relay_3