From c7bfe4096a8357cb50604679245b367421ca59f8 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Mon, 1 Apr 2024 00:05:33 +0200
Subject: [PATCH] Performance improvement - Home page values triggering

Solves #1977
Hopefully solves #2001
---
 esphome/nspanel_esphome_advanced.yaml |  8 +++++
 esphome/nspanel_esphome_core.yaml     |  9 +-----
 nspanel_blueprint.yaml                | 45 +++++++++++++++++----------
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/esphome/nspanel_esphome_advanced.yaml b/esphome/nspanel_esphome_advanced.yaml
index 24e419f..03da043 100644
--- a/esphome/nspanel_esphome_advanced.yaml
+++ b/esphome/nspanel_esphome_advanced.yaml
@@ -12,6 +12,7 @@ substitutions:
   ## Change only in your      ##
   ## local yaml substitutions ##
   ap_password: ${wifi_password}
+  web_password: ${wifi_password}
   ##############################
 
 button:
@@ -95,6 +96,13 @@ time:
         - component.update: api_timestamp
         - component.update: device_timestamp
 
+web_server:
+  id: web_server_std
+  port: 80
+  auth:
+    username: admin
+    password: ${web_password}
+
 wifi:
   ap:
     ssid: "${name}"
diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index 6a6366f..1cadf99 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -13,7 +13,6 @@ substitutions:
   name: ${device_name}
   friendly_name: ${device_name}
   ota_password: ${wifi_password}
-  web_password: ${wifi_password}
   temp_units: "°C"
   invalid_cooldown: "100ms"
   ##### DON'T CHANGE THIS ######
@@ -168,13 +167,7 @@ time:
         - logger.log: "System clock synchronized"
         - script.execute: refresh_datetime
 
-##### Web server #####
-web_server:
-  id: web_server_std
-  port: 80
-  auth:
-    username: admin
-    password: ${web_password}
+json:  # Can be replaced by web_server
 
 ##### START - API CONFIGURATION #####
 api:
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index cdcc1c2..c75419b 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -3783,31 +3783,43 @@ trigger:
   ##### Trigger - Home - Values - State change #################################################################################################################
 
     ##### HOME Value 01 #####
-    - platform: event
-      event_type: state_changed
-      event_data:
-        entity_id: !input 'home_value01'
+    - platform: state
+      entity_id: !input home_value01
+      not_to:
+        - unknown
+        - unavailable
+      for:
+        seconds: 1
       id: home_values_state
 
     ##### HOME Value 02 #####
-    - platform: event
-      event_type: state_changed
-      event_data:
-        entity_id: !input 'home_value02'
+    - platform: state
+      entity_id: !input home_value02
+      not_to:
+        - unknown
+        - unavailable
+      for:
+        seconds: 1
       id: home_values_state
 
     ##### HOME Value 03 #####
-    - platform: event
-      event_type: state_changed
-      event_data:
-        entity_id: !input 'home_value03'
+    - platform: state
+      entity_id: !input home_value03
+      not_to:
+        - unknown
+        - unavailable
+      for:
+        seconds: 1
       id: home_values_state
 
     ##### HOME Value 04 #####
-    - platform: event
-      event_type: state_changed
-      event_data:
-        entity_id: !input 'home_value04'
+    - platform: state
+      entity_id: !input home_value04
+      not_to:
+        - unknown
+        - unavailable
+      for:
+        seconds: 1
       id: home_values_state
 
   ##### Trigger - Home - Custom buttons - State change #################################################################################################################
@@ -10582,7 +10594,6 @@ action:
         conditions:
           - condition: trigger
             id: home_values_state
-          - '{{ pages.current == pages.home }}'
         sequence:
           - repeat:
               for_each: '{{ home_page.entity_value | selectattr("entity", "defined") | selectattr("entity", "eq", trigger.event.data.entity_id) | list }}'