multiple esphome device updates and new devices

esphome/esp-midesklamp1s.yaml

@@ -47,34 +47,34 @@ substitutions:
   update_interval: "60s" # update time for for general sensors etc
   room: "Office"  # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
 
-#############################################
-# Included Common Packages
-# https://esphome.io/components/esphome.html
-#############################################
+##########################################################################################
+# PACKAGES: Included Common Packages
+# https://esphome.io/components/packages.html
+##########################################################################################
 packages:
   common_wifi: !include
     file: common/network_common.yaml
     vars:
-      local_static_ip_address: ${static_ip_address}
-      local_ota_pass: ${ota_pass}
+      local_device_name: "${device_name}"
+      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}
-#  common_webportal: !include
-#    file: common/webportal_common.yaml
+      local_api_key: "${api_key}"
+  #common_webportal: !include
+  #  file: common/webportal_common.yaml
   common_mqtt: !include
     file: common/mqtt_common.yaml
+    vars:
+      local_device_name: "${device_name}"
   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}
-
-#web_server: !remove
-
+      local_friendly_name: "${friendly_name}"
+      local_update_interval: "${update_interval}"
 
 #############################################
 # ESPHome