multiple esphome device updates and new devices

esphome/esp-maindishwasherspower.yaml

@@ -39,19 +39,26 @@ substitutions:
   current_limit : "10" # Current Limit in Amps. AU Plug = 10. IL, BR, EU, UK, US Plug = 16.
   
 ##########################################################################################
-# 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_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
+  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
@@ -60,12 +67,6 @@ packages:
       local_friendly_name: "${friendly_name}"
       local_update_interval: "${update_interval}"
 
-  # Web and MQTT Packages
-  #common_webportal: !include
-  #  file: common/webportal_common.yaml
-  #common_mqtt: !include
-  #  file: common/mqtt_common.yaml
-
   # Device Specific included packages
   common_athompowermonV1: !include
     file: common/athompowermonv1_common.yaml