various tidyups and esphome adds

esphome/esp-lounge6chdimmer.yaml

@@ -71,6 +71,10 @@ substitutions:
   ota_pass: !secret esp-ota_pass # unfortunately you can't use substitutions inside secrets names
   static_ip_address: !secret esp-lounge6chdimmer_ip
 
+  # If we are changing IP addresses, you must update the current IP address here, otherwise it remains
+  # Don't forget to switch it back when changed.
+  current_ip_address: ${static_ip_address}
+
   # Device Settings
   #relay_icon: "mdi:lightbulb-group"
   log_level: "INFO" # Define logging level: NONE, ERROR, WARN, INFO, DEBUG (Default), VERBOSE, VERY_VERBOSE
@@ -114,6 +118,7 @@ packages:
       local_device_name: "${device_name}"
       local_static_ip_address: "${static_ip_address}"
       local_ota_pass: "${ota_pass}"
+      local_current_ip_address: "${current_ip_address}"
 
   #### HOME ASSISTANT API (choose encryption or no encryption options) ####
   common_api: !include