esphome lounge switches and scene control

esphome/esp-poolpumppower.yaml

@@ -86,10 +86,6 @@ substitutions:
 # https://esphome.io/components/packages.html
 ##########################################################################################
 packages:
-  ##################################################
-  # MANDATORY packages (won't compile without them!)
-  ##################################################
-
   #### WIFI, Network (Static/DHCP/IPV6 etc), Fallback AP, Safemode ####
   common_wifi: !include
     file: common/network_common.yaml
@@ -98,20 +94,12 @@ packages:
       local_static_ip_address: "${static_ip_address}"
       local_ota_pass: "${ota_pass}"
 
-  ##################################################
-  # OPTIONAL packages (comment if you don't want them)
-  ##################################################   
-
   #### 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}"
-  
-  #### WEB PORTAL ####
-  #common_webportal: !include
-  #  file: common/webportal_common.yaml
 
   #### MQTT ####
   common_mqtt: !include
@@ -119,24 +107,16 @@ packages:
     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
-    file: common/sntp_common.yaml
+  common_sntp:      !include common/sntp_common.yaml
 
-    #### DIAGNOSTICS Lite Sensors ####
-  # Option of everything, or a lite version
-  common_lite_sensors: !include
-    file: common/sensors_common_lite.yaml
-
-  #### DIAGNOSTICS General Sensors ####
-  # Option of everything, or a lite version
-  common_general_sensors: !include
-    file: common/sensors_common.yaml
-
-  #### DEBUGGING Sensors ####
-  # A count of various resets
-  #common_resetcount_debugging: !include
-  #  file: common/resetcount_common.yaml
+  #### 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
   common_athompowermonV3: !include