esphome lounge switches and scene control

esphome/esp-datacupboardpower-right.yaml

@@ -43,9 +43,10 @@ substitutions:
 # PACKAGES: Included Common Packages
 # https://esphome.io/components/packages.html
 ##########################################################################################
+# Comment some of these out where not needed, eg MQTT, Web portal, SNTP, General Sensors
+##########################################################################################
 packages:
-
-  # Network and Wi-Fi
+  #### WIFI, Network (Static/DHCP/IPV6 etc), Fallback AP, Safemode ####
   common_wifi: !include
     file: common/network_common.yaml
     vars:
@@ -53,32 +54,30 @@ packages:
       local_static_ip_address: "${static_ip_address}"
       local_ota_pass: "${ota_pass}"
 
-  # Native API
+  #### HOME ASSISTANT API (choose encryption or no encryption options) ####
   common_api: !include
     file: common/api_common.yaml
+    #file: common/api_common_noencryption.yaml
     vars:
-      #local_api_key: "${api_key}"
-      local_api_key: "tZ/djAp4qiM0wYCgUa1amg+wK7KTF9xR8bUFCaeVskM="
+      local_api_key: "${api_key}"
 
-  # Web Portal
-  common_webportal: !include
-    file: common/webportal_common.yaml
-
-  # MQTT
+  #### MQTT ####
   common_mqtt: !include
     file: common/mqtt_common.yaml
     vars:
       local_device_name: "${device_name}"
+  
+  #### WEB PORTAL ####
+  #common_webportal: !include common/webportal_common.yaml
+  
+  #### SNTP (Only use if you want/need accurate timeclocks) ####
+  common_sntp:      !include common/sntp_common.yaml
 
-  # Time/SNTP
-  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}"
+  #### DIAGNOSTICS Sensors ####
+  diag_basic:       !include common/include_basic_diag_sensors.yaml
+  diag_more:        !include common/include_more_diag_sensors.yaml
+  diag_debug:       !include common/include_debug_diag_sensors.yaml
+  #diag_resetcount:  !include common/include_resetcount_diag_sensors.yaml
 
   # Device Specific included packages
   # Athom Power Monitor Plug V2 (No Relay)