multiple esphome device updates and new devices

esphome/esp-entmulti.yaml

@@ -10,7 +10,7 @@
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
 #############################################
 substitutions:
-  devicename: "esp-entmulti"
+  device_name: "esp-entmulti"
   friendly_name: "Outside Entrance Multisensor"
   description_comment: "D1 Mini ESP32 outside entranceway with, mmWave presence, PIR and more"
   api_key: !secret esp-entmulti_api_key #unfortunately you can't use substitutions in secrets names
@@ -44,38 +44,41 @@ substitutions:
   #web_server_username: !secret web_server_username
   #web_server_password: !secret web_server_password
 
-#############################################
-# 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
-#  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}
+    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}"
 
 #############################################
 # ESPHome
 # https://esphome.io/components/esphome.html
 #############################################
 esphome:
-  name: ${devicename}
+  name: ${device_name}
   friendly_name: ${friendly_name}
   comment: ${description_comment} #appears on the esphome page in HA
   min_version: 2024.6.0
@@ -113,80 +116,6 @@ logger:
   #esp8266_store_log_strings_in_flash: false
   #tx_buffer_size: 64
 
-#############################################    
-# Enable the Home Assistant API
-# https://esphome.io/components/api.html
-#############################################  
-#api:
-#  encryption:
-#    key: ${api_key}
-#  on_client_connected:
-#    - esp32_ble_tracker.start_scan:
-#       continuous: true
-#  on_client_disconnected:
-#    - esp32_ble_tracker.stop_scan:
-
-#############################################    
-# Enable Over the Air Update Capability
-# https://esphome.io/components/ota.html?highlight=ota
-#############################################  
-#ota:
-#  - platform: esphome
-#    password: ${ota_pass}
-
-#############################################    
-# Safe Mode
-# Safe mode will detect boot loops
-# https://esphome.io/components/safe_mode
-#############################################  
-#safe_mode:
-
-#############################################    
-# Wifi Settings 
-# https://esphome.io/components/wifi.html
-#
-# Power Save mode (can reduce wifi reliability)
-# NONE (least power saving, Default for ESP8266)
-# LIGHT (Default for ESP32)
-# HIGH (most power saving)
-#############################################  
-#wifi:
-#  ssid: ${wifi_ssid}
-#  password: ${wifi_password}
-  #power_save_mode: LIGHT #https://esphome.io/components/wifi.html#wifi-power-save-mode
-  #manual_ip: #optional static IP address
-    #static_ip: ${static_ip_address}
-    #gateway: ${static_ip_gateway}
-    #subnet: ${static_ip_subnet}
-#  ap:   #Details for fallback hotspot in case wifi connection fails https://esphome.io/components/wifi.html#access-point-mode
-#    ssid: $devicename fallback AP
-#    password: !secret fallback_ap_password
-#    ap_timeout: 5min #Time until it brings up fallback AP. default is 1min
-
-#############################################    
-# Web Portal for display and monitoring
-# Turning this off is probably a good idea to save resources.
-# https://esphome.io/components/web_server.html
-#############################################   
-#web_server:
-#  port: 80
-#  auth:
-#   username: ${web_server_username} #probably a good idea to secure it
-#   password: ${web_server_password}
-
-#############################################
-# MQTT Monitoring
-# https://esphome.io/components/mqtt.html?highlight=mqtt
-# MUST also have api enabled if you enable MQTT
-#############################################
-#mqtt:
-#  broker: ${mqtt_server}
-#  topic_prefix: ${mqtt_topic}/${devicename}
-#  username: ${mqtt_username}
-#  password: ${mqtt_password}
-#  discovery: False # enable entity discovery (true is default)
-#  discover_ip: False # enable device discovery (true is default)
-
 #############################################
 # i2c bus
 # https://esphome.io/components/i2c.html