v3.2.2 - fixed some bugs performance improvement

v3.2.2 - fixed some bugs performance improvement

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2

.gitignore

@@ -1,3 +1,6 @@
 # Ignore Mac DS_Store files
 .DS_Store
 **/.DS_Store
+
+# Ignore IntelliJ IDEA project directory
+.idea

README.md

@@ -1,10 +1,12 @@
 # NSPanel Custom with HA Blueprint
 
+*You use our NSPanel version and are satisfied with it? Then we would be very happy about a donation to support our project.*
+
+[![Paypal](https://user-images.githubusercontent.com/41958506/212499642-b2fd097a-0938-4bfc-b37b-74df64592c58.png)](https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2)
 
 [![Open your Home Assistant instance and show the blueprint import dialog with a specific blueprint pre-filled.](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FBlackymas%2FNSPanel_HA_Blueprint%2Fblob%2Fmain%2Fnspanel_blueprint.yaml)
 
 This project allows you to configure your complete NSPanel via a Blueprint with UI.
-
 ### *That means you don't have to customize any code or change any lines in the code.*
 
 So you have a nice graphical interface where you can build your NSPanel.
@@ -14,17 +16,24 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 
 📕 Full documentation and installation is available here [NSPanel Configuration, Setup and HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki).
 
-🚀 How to create "Issues" when I have a problem [WIKI HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki/Welcome-to-the-NSPanel_HA_Blueprint-WIKI)
+📌 Step by Step - [Setup and Overview Video´s](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki)
+
+🚀 How to create "Issues" when I have a problem [WIKI HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki)
 
 ⭐ All Feature Requests can be found here [All Feature Request](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/new%20feature%20request)
 
 🎉 Roadmap Roadmap can be found here [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap)
 
+💥 Please move pull request to DEV branch and not to main branch - thanks!
+
 🙋 WE ARE LOOKING FOR YOU! _**We are always looking for people who would like to support this project. We are looking for help with "programming new features, writing documentation or translating documentation to EN. If you are interested then please contact us :)**_
 
 ## NSPanel:
-![2 Home](https://user-images.githubusercontent.com/41958506/203653897-cf96a7af-2b92-4ad9-a375-987decad5aa7.png)
+![2 Home](https://user-images.githubusercontent.com/41958506/212768891-9610d800-43c5-454f-a8b6-6b7c43677b5d.png)
+
+
 ![3 Buttonpage](https://user-images.githubusercontent.com/41958506/203654022-c6d81263-ce56-4a84-917a-9d4911f19f55.png)
+![NEW Domains](https://user-images.githubusercontent.com/41958506/206879659-3aea30c1-b126-4d52-a869-abf6adfc8fa1.png)
 
 (Home and Buttonpage)
 
@@ -44,7 +53,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 ![8 Cover](https://user-images.githubusercontent.com/41958506/203654290-c6ec2f2f-7924-492c-914c-0d96dc3907e0.png)
 ![9 Weather](https://user-images.githubusercontent.com/41958506/203654307-24000d00-b7e1-47eb-bd64-9e97b508db52.png)
 
-(Coversetting and Weather Forcast)
+(Coversetting and Weather Forecast)
 
 
 ![10 Settings](https://user-images.githubusercontent.com/41958506/203654386-e4e574ad-8674-4268-84dd-1c4e40f98eb9.png)
@@ -57,7 +66,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 ![Device Setting 2](https://user-images.githubusercontent.com/41958506/203724491-53ecd93d-bc7c-4c2d-850b-f106691e2639.png)
 
 
-(HA Device Seeting for Example temperature correction)
+(HA Device Setting for Example temperature correction)
 
 
 ## Blueprint:
@@ -67,28 +76,28 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 
 
 ## Features:
-- easy to use and simple configuration via Blueprint - no change in the code is necessary
+- Easy to use and simple configuration via Blueprint - no change in the code is necessary
 - 32 buttons on 4 button pages with long press function for settings (more buttons are also possible)
 - Button design is automatically generated based on the selected entity
 - Buttons show current brightness and cover position in the button itself
 - Buttons label can be assigned via blueprint
-- Weather + 5 days weather forcast
+- Weather + 5 days weather forecast
 - Thermostat + Touch + Relay control for floor heating
-- Light control (brightness-slider, colorwheel, TempColor-slider) - via Long Press
+- Light control (brightness-slider, colorwheel, TempColor-slider) - via long Press
 - Cover control (open, close, position-slider) - via long press
 - Settings page (display brightness, display dim brightness, auto-dim, sleep mode, reboot NSPanel)
 - Swipe between pages
 - Top menu with 10 icons for specific states
 - Heating control (hot water)
-- modern design - design easy to change via Adobe Express (free + design template)
-- 2 pysical switches
+- Modern design - design easy to change via Adobe Express (free + design template)
+- 2 physical switches
 - and much more ;)
 
 
 # Pages
 
 ## Home
-- current weather with button to Weather Forcast page
+- Current weather with button to Weather Forcast page
 - Hardware buttons can be freely assigned
 - Hardware button label or without label
 - Blue line indicates on or off of the entity
@@ -135,8 +144,8 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 - Hot water button
 
 
-## Weather Forcast
-- 5 days Weather Forcast via swipe (Integration Accuweather - but should also go with another integration)
+## Weather Forecast
+- 5 days Weather Forecast via swipe (Integration Accuweather - but should also go with another integration)
 - Lowest and highest temperature outside
 - Date
 - Rain probability

nspanel_esphome.yaml

@@ -7,7 +7,7 @@
 
 
 ##### ADVANCED CONFIGURATION - activate only when you know what you do ##############################
-# substitutions: 
+# substitutions:
   # ## usage of secrets-file ## -> comment in ###### Change ME ######
   # device_name: "nspanel-name" # Wird im Blueprint benötigt!
   # wifi_ssid: !secret nspanel_wifi_ssid # add in your esphome secrets file.
@@ -36,7 +36,7 @@ wifi:
   ssid: ${wifi_ssid}
   password: ${wifi_password}
   power_save_mode: none
-  ##### advanced config - uncomment to use static IP-Config #####  
+  ##### advanced config - uncomment to use static IP-Config #####
   # manual_ip:
   #   static_ip: ${ip}
   #   gateway: ${gw}
@@ -49,15 +49,19 @@ wifi:
     password: ${wifi_password}
 
 ##### Functionality for the Nextion display #####
-external_components:
-  - source: github://pr#2956
-    components: [nextion]
-    refresh: 1h
+# external_components:
+#   - source: github://pr#2956
+#     components: [nextion]
+#     refresh: 1h
 
 ##### ESPHOME CONFIGURATION #####
 esphome:
   name: ${device_name}
   min_version: 2022.10.2
+  on_boot:
+    priority: 601
+    then:
+      - lambda: id(disp1).send_command_printf("DRAKJHSUYDGBNCJHGJKSHBDN");
 
 ##### TYPE OF ESP BOARD #####
 esp32:
@@ -70,13 +74,13 @@ web_server:
   auth:
     username: admin
     password: ${wifi_password}
-    ##### advanced config - change to use web_password ##### 
+    ##### advanced config - change to use web_password #####
     # password: ${web_password}
 
 ##### OTA PASSWORD #####
 ota:
   password: ${wifi_password}
-  ##### advanced config - change to use ota_password ##### 
+  ##### advanced config - change to use ota_password #####
   # password: ${ota_password}
   safe_mode: true
   reboot_timeout: 3min
@@ -107,16 +111,26 @@ uart:
   baud_rate: 115200
   id: tf_uart
 
-###### REBOOT BUTTON #####
+##### START - BUTTON CONFIGURATION #####
 button:
+  ###### REBOOT BUTTON #####
   - platform: restart
     name: ${device_name} Restart
     id: restart_nspanel
 
+  ##### UPDATE TFT DISPLAY #####
+  - platform: template
+    name: ${device_name} Update TFT display
+    icon: mdi:file-sync
+    id: tft_update
+    entity_category: config
+    on_press:
+      - delay: 16ms
+      - lambda: id(disp1).upload_tft();
 
 ##### START - API CONFIGURATION #####
 api:
-  ##### advanced config - activate to use api_password ##### 
+  ##### advanced config - activate to use api_password #####
   # password: ${api_password}
   services:
 
@@ -124,7 +138,15 @@ api:
     - service: upload_tft
       then:
         - lambda: 'id(disp1)->upload_tft();'
-            
+
+    ##### SERVICE TO UPDATE THE TFT FILE from URL #####
+    - service: upload_tft_url
+      variables:
+        url: string
+      then:
+        - lambda: 'id(disp1)->set_tft_url(url.c_str());'
+        - lambda: 'id(disp1)->upload_tft();'
+
     ##### Service to send a command "printf" directly to the display #####
     - service: send_command_printf
       variables:
@@ -153,7 +175,7 @@ api:
         - lambda: 'id(disp1).set_component_value(component.c_str(), message);'
 
     ##### Service to send a command "hide componente" directly to the display #####
-    - service: send_command_hide
+    - service: send_command_hide ### unused ###
       variables:
         component: string
       then:
@@ -162,7 +184,7 @@ api:
         - lambda: 'id(disp1).hide_component(component.c_str());'
 
     ##### Service to send a command "show componente" directly to the display #####
-    - service: send_command_show
+    - service: send_command_show ### unused ###
       variables:
         component: string
       then:
@@ -170,6 +192,13 @@ api:
               switch.is_on: nextion_init
         - lambda: 'id(disp1).show_component(component.c_str());'
 
+    ##### Service to send a command "show ALL componente" directly to the display #####
+    - service: send_command_show_all ### unused ###
+      then:
+        - wait_until:
+              switch.is_on: nextion_init
+        - lambda: 'id(disp1).show_component("255");'
+
     ##### Service to send a command "font color" directly to the display #####
     - service: send_command_font_color
       variables:
@@ -179,6 +208,7 @@ api:
         - wait_until:
               switch.is_on: nextion_init
         - lambda: 'id(disp1).set_component_font_color(component.c_str(), message);'
+
     ##### Service to send a command "background color" directly to the display #####
     - service: send_command_background_color
       variables:
@@ -189,6 +219,67 @@ api:
               switch.is_on: nextion_init
         - lambda: 'id(disp1).set_component_background_color(component.c_str(), message);'
 
+    ##### Service to show a notification-message on the screen #####
+    - service: notification_show
+      variables:
+        label: string
+        text: string
+      then:
+        - wait_until:
+              switch.is_on: nextion_init
+        - lambda: |-
+            id(disp1).send_command_printf("page notification");
+            id(disp1).set_component_text_printf("notification.notifi_label", "%s", label.c_str());
+            id(disp1).set_component_text_printf("notification.notifi_text01", "%s", text.c_str());
+            id(notification_label).publish_state(label.c_str());
+            id(notification_text).publish_state(text.c_str());
+        - switch.turn_on: notification_unread
+        - if:
+            condition:
+              switch.is_on: notification_sound
+            then:
+              - rtttl.play: "two short:d=4,o=5,b=100:16e6,16e6"
+
+    ##### Service to clear the notification #####
+    - service: notification_clear
+      then:
+        - wait_until:
+              switch.is_on: nextion_init
+        - lambda: |-
+            id(notification_label).publish_state("");
+            id(notification_text).publish_state("");
+        - switch.turn_off: notification_unread
+
+    ##### Service to set entity-information for settings-page(s)
+    - service: set_settings_entity
+      variables:
+        entity: string
+      then:
+        - wait_until:
+            switch.is_on: nextion_init
+        - lambda: |-
+            id(settings_entity).publish_state(entity.c_str());
+
+    ##### Service to play a rtttl tones #####
+    # Example tones : https://codebender.cc/sketch:109888#RTTTL%20Songs.ino
+    - service: play_rtttl
+      variables:
+        song_str: string
+      then:
+        - rtttl.play:
+            rtttl: !lambda 'return song_str;'
+
+    # Service to show a QR code on the display (ex. for WiFi password)
+    - service: qr_code
+      variables:
+        qrdata: string
+      then:
+        - wait_until:
+              switch.is_on: nextion_init
+        - lambda: |-
+            id(disp1).send_command_printf("page qrcode");
+            id(disp1).set_component_text_printf("qrcode.qrcode_value", "%s", qrdata.c_str());
+
     #### Service to send thermostat cycle state ####
     - service: send_thermostat_cycle_state
       variables:
@@ -198,126 +289,12 @@ api:
               switch.is_on: nextion_init
         - lambda: |-
             //ESP_LOGD("nextion", "thermostat sendig value %f", value);
-            int left=16; // 16 is empty left.
-            int mid=17; // 17 is empty mid.
-            int right=18; // 18 is empty right.
-            if (value < 13.5) {
-              left=16;
-              mid=17;
-              right=18;
-            } else if (value >= 13.5 and value < 14) {
-              left=19;
-              mid=17;
-              right=18;
-            } else if (value >= 14 and value < 14.5) {
-              left=20;
-              mid=17;
-              right=18;
-            } else if (value >= 14.5 and value < 15) {
-              left=21;
-              mid=17;
-              right=18;
-            } else if (value >= 15 and value < 15.5) {
-              left=22;
-              mid=17;
-              right=18;
-            } else if (value >= 15.5 and value < 16) {
-              left=23;
-              mid=17;
-              right=18;
-            } else if (value >= 16 and value < 16.5) {
-              left=24;
-              mid=17;
-              right=18;
-            } else if (value >= 16.5 and value < 17) {
-              left=25;
-              mid=17;
-              right=18;
-            } else if (value >= 17 and value < 17.5) {
-              left=26;
-              mid=17;
-              right=18;
-            } else if (value >= 17.5 and value < 18) {
-              left=27;
-              mid=17;
-              right=18;
-            } else if (value >= 18 and value < 18.5) {
-              left=28;
-              mid=17;
-              right=18;
-            } else if (value >= 18.5 and value < 19) {
-              left=29;
-              mid=30;
-              right=18;
-            } else if (value >= 19 and value < 19.5) {
-              left=29; 
-              mid=31;
-              right=18;
-            } else if (value >= 19.5 and value < 20) {
-              left=29;
-              mid=32;
-              right=18;
-            } else if (value >= 20 and value < 20.5) {
-              left=29;
-              mid=33;
-              right=18;
-            } else if (value >= 20.5 and value < 21) {
-              left=29;
-              mid=34;
-              right=18;
-            } else if (value >= 21 and value < 21.5) {
-              left=29;
-              mid=35;
-              right=18;
-            } else if (value >= 21.5 and value < 22) {
-              left=29;
-              mid=36;
-              right=18;
-            } else if (value >= 22 and value < 22.5) {
-              left=29;
-              mid=37;
-              right=38;
-            } else if (value >= 22.5 and value < 23) {
-              left=29;
-              mid=37;
-              right=39;
-            } else if (value >= 23 and value < 23.5) {
-              left=29;
-              mid=37;
-              right=40;
-            } else if (value >= 23.5 and value < 24) {
-              left=29;
-              mid=37;
-              right=41;
-            } else if (value >= 24 and value < 24.5) {
-              left=29;
-              mid=37;
-              right=42;
-            } else if (value >= 24.5 and value < 25) {
-              left=29;
-              mid=37;
-              right=43;
-            } else if (value >= 25 and value < 25.5) {
-              left=29;
-              mid=37;
-              right=44;
-            } else if (value >= 25.5 and value < 26) {
-              left=29;
-              mid=37;
-              right=45;
-            } else if (value >= 26 and value < 26.5) {
-              left=29;
-              mid=37;
-              right=46;
-            } else if (value >= 26.5 and value < 27) {
-              left=29;
-              mid=37;
-              right=47;
-            } else if (value >= 27) {
-              left=29;
-              mid=37;
-              right=48;
-            }
+            int v = int(2 * std::min(std::max(value - 13.5, 0.0), 5.0));
+            int left = v + (v ? 19 : 16); // 16 is empty left.
+            v = int(2 * std::min(std::max(value - 18.0, 0.0), 4.0));
+            int mid = v + (v ? 29 : 17); // 17 is empty mid.
+            v = int(2 * std::min(std::max(value - 21.5, 0.0), 5.5));
+            int right = v + (v ? 37 : 18); // 18 is empty right.
             // sends the 3 images to the display
             //ESP_LOGD("nextion", "thermostat left %i", left);
             //ESP_LOGD("nextion", "thermostat mid %i", mid);
@@ -329,6 +306,41 @@ api:
             id(disp1).set_component_text_printf("target_temp", "%.1f°", value);
             id(display_target_temp).publish_state(value);
 
+    #### Service to set the buttons ####
+    - service: set_button
+      variables:
+        btn_id: string
+        btn_pic: int
+        btn_bg: int
+        btn_icon_font: int
+        btn_txt_font: int
+        btn_bri_font: int
+        btn_icon: string
+        btn_label: string
+        btn_bri_txt: string
+      then:
+        - wait_until:
+              switch.is_on: nextion_init
+        - lambda: |-
+            // ESP_LOGD("nextion", "set button %s", btn_id.c_str());
+            std::string btnicon = btn_id.c_str() + std::string("icon");
+            std::string btntext = btn_id.c_str() + std::string("text");
+            std::string btnbri = btn_id.c_str() + std::string("bri");
+            id(disp1).send_command_printf("%spic.pic=%i", btn_id.c_str(), btn_pic);
+            id(disp1).set_component_background_color(btnicon.c_str(), btn_bg);
+            id(disp1).set_component_background_color(btntext.c_str(), btn_bg);
+            id(disp1).set_component_background_color(btnbri.c_str(), btn_bg);
+            id(disp1).set_component_font_color(btnicon.c_str(), btn_icon_font);
+            id(disp1).set_component_font_color(btntext.c_str(), btn_txt_font);
+            id(disp1).set_component_font_color(btnbri.c_str(), btn_bri_font);
+            id(disp1).set_component_text_printf(btnicon.c_str(), "%s", btn_icon.c_str());
+            id(disp1).set_component_text_printf(btntext.c_str(), "%s", btn_label.c_str());
+            // id(disp1).set_component_text_printf(btnbri.c_str(), "%s", btn_bri_txt.c_str());
+            if (strcmp(btn_bri_txt.c_str(), "0") != 0) {
+              id(disp1).set_component_text_printf(btnbri.c_str(), "%s", btn_bri_txt.c_str());
+            } else {
+              id(disp1).set_component_text_printf(btnbri.c_str(), " ");
+            }
 
 ##### START - GLOBALS CONFIGURATION #####
 globals:
@@ -381,7 +393,7 @@ globals:
     restore_value: no
     initial_value: ''
 
-  ##### lastclick_ccurrentpage State #####
+  ##### lastclick_currentpage State #####
   - id: currentpage_global
     type: std::string
     restore_value: no
@@ -393,22 +405,84 @@ binary_sensor:
   ###### LEFT BUTTON BELOW DISPLAY TO TOGGLE RELAY#####
   - platform: gpio
     name: ${device_name} Left Button
+    id: left_button
     pin:
       number: 14
       inverted: true
+    on_click:
+      then:
+        - if:
+            condition:
+              and:
+                  - switch.is_on: relay1_fallback
+                  - not:
+                      api.connected:
+            then:
+              - switch.toggle: relay_1
+              - if: 
+                  condition:
+                    switch.is_on: relay_1
+                  then:
+                    - lambda: id(disp1).send_command_printf("home.left_bt_pic.pic=78");
+                    - lambda: id(disp1).send_command_printf("home.icon_top_01","\U0000E3A5");
+                  else:
+                    - lambda: id(disp1).send_command_printf("home.left_bt_pic.pic=77");
+                    - lambda: id(disp1).send_command_printf("home.icon_top_01","\U0000FFFF");
+
 
   ##### RIGHT BUTTON BELOW DISPLAY TO TOGGLE RELAY #####
   - platform: gpio
     name: ${device_name} Right Button
+    id: right_button
     pin:
       number: 27
       inverted: true
+    on_click:
+      then:
+        - if:
+            condition:
+              and:
+                  - switch.is_on: relay2_fallback
+                  - not:
+                      api.connected:
+            then:
+              - switch.toggle: relay_2
+              - if: 
+                  condition:
+                    switch.is_on: relay_2
+                  then:
+                    - lambda: id(disp1).send_command_printf("home.right_bt_pic.pic=78");
+                    - lambda: id(disp1).send_command_printf("home.icon_top_02","\U0000E3A8");
+                  else:
+                    - lambda: id(disp1).send_command_printf("home.right_bt_pic.pic=77");
+                    - lambda: id(disp1).send_command_printf("home.icon_top_02","\U0000FFFF");
 
-  ##### Restart NSPanel Button #####
+  ##### JUMP PAGE TO SETTING PAGE #####
+  - platform: nextion
+    name: $device_name setting page
+    page_id: 0
+    component_id: 52
+    internal: true
+    on_multi_click:
+      - timing:
+          - ON for at least 1s #LONG Press
+        then:
+          - lambda: 'id(disp1).send_command_printf("page settings");'
+
+  ##### Restart NSPanel Button - Setting Page #####
   - platform: nextion
     name: ${device_name} Restart
     page_id: 7
-    component_id: 9
+    component_id: 13
+    internal: true
+    on_click:
+      - button.press: restart_nspanel
+
+  ##### Restart NSPanel Button - Boot Page #####
+  - platform: nextion
+    name: ${device_name} Restart
+    page_id: 8
+    component_id: 4
     internal: true
     on_click:
       - button.press: restart_nspanel
@@ -417,7 +491,7 @@ binary_sensor:
   - platform: nextion
     name: ${device_name} Sleep Modus
     page_id: 7
-    component_id: 4
+    component_id: 14
     internal: true
     on_click:
       - switch.toggle: sleep_modus
@@ -446,22 +520,30 @@ sensor:
   - platform: wifi_signal
     name: ${device_name} RSSI
     update_interval: 60s
+    on_value:
+      - if:
+          condition:
+            wifi.connected:
+          then:
+            - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000E5A8");
+          else:
+            - lambda: id(disp1).set_component_text_printf("home.wifi_icon", "%s", "\U0000FFFF");
 
-  ##### INTERNAL TEMPERATUE SENSOR, ADC VALUE #####
+  ##### INTERNAL TEMPERATURE SENSOR, ADC VALUE #####
   - platform: adc
     id: ntc_source
     pin: 38
-    update_interval: 10s
+    update_interval: 60s
     attenuation: 11db
 
-  ##### INTERNAL TEMPERATUE SENSOR, adc reading converted to resistance (calculation)#####
+  ##### INTERNAL TEMPERATURE SENSOR, adc reading converted to resistance (calculation)#####
   - platform: resistance
     id: resistance_sensor
     sensor: ntc_source
     configuration: DOWNSTREAM
     resistor: 11.2kOhm
 
-  ##### INTERNAL TEMPERATUE SENSOR, resistance to temperature (calculation) #####
+  ##### INTERNAL TEMPERATURE SENSOR, resistance to temperature (calculation) #####
   - platform: ntc
     name: ${device_name} Temperature
     id: temp_nspanel
@@ -472,12 +554,12 @@ sensor:
       reference_resistance: 10kOhm
     filters:
       - lambda: return x + id(temperature_correction_global);
-    on_value:
-      then:
-        - wait_until:
-            switch.is_on: nextion_init
-        - lambda: id(disp1).set_component_text_printf("home.current_temp", "%.1f°", id(temp_nspanel).state); # onboard temp (thermostat temp) to home page.
-        # - lambda: id(disp1).set_component_text_printf("climate.current_temp", "%.1f", id(temp_nspanel).state);
+#    on_value:
+#      then:
+#        - wait_until:
+#            switch.is_on: nextion_init
+#         - lambda: id(disp1).set_component_text_printf("home.current_temp", "%.1f°", id(temp_nspanel).state); # onboard temp (thermostat temp) to home page.
+#         - lambda: id(disp1).set_component_text_printf("climate.current_temp", "%.1f", id(temp_nspanel).state);
 
   ##### current value of page-climate target_temp #####
   - platform: template
@@ -499,7 +581,7 @@ sensor:
         - number.set:
             id: display_brightness
             value: !lambda 'return int(x);'
-          # send text field percentage of current_lightslider_val  
+          # send text field percentage of current_lightslider_val
         - lambda: id(disp1).set_component_text_printf("settings.a03", "%i", id(display_brightness_global));
 
   ###### Display DIM Brightness GET VALUE FROM NSPanel SLIDER #####
@@ -515,7 +597,7 @@ sensor:
         - number.set:
             id: display_dim_brightness
             value: !lambda 'return int(x);'
-          # send text field percentage of current_lightslider_val  
+          # send text field percentage of current_lightslider_val
         - lambda: id(disp1).set_component_text_printf("settings.a04", "%i", id(display_dim_brightness_global));
 
   ###### Send current page to HA
@@ -542,6 +624,7 @@ text_sensor:
     ip_address:
       name: ${device_name} IP
       disabled_by_default: true
+      id: ip_address
     ssid:
       name: ${device_name} SSID
       disabled_by_default: true
@@ -549,6 +632,18 @@ text_sensor:
       name: ${device_name} BSSID
       disabled_by_default: true
 
+  - platform: template
+    name: ${device_name} Notification Label
+    id: notification_label
+
+  - platform: template
+    name: ${device_name} Notification Text
+    id: notification_text
+
+  - platform: template
+    name: ${device_name} Settings Entity
+    id: settings_entity
+
   ##### last click sensor, the main action variable - push to HA #####
   - platform: nextion
     nextion_id: disp1
@@ -569,7 +664,9 @@ text_sensor:
         - globals.set:
             id: lastclick_general_global
             value: !lambda return x;
-  
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
+
   ##### last click lightsettings page, the main action variable - push to HA #####
   - platform: nextion
     nextion_id: disp1
@@ -590,6 +687,8 @@ text_sensor:
         - globals.set:
             id: lastclick_lightsettings_global
             value: !lambda return x;
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
 
   ##### last click coversettings page, the main action variable - push to HA #####
   - platform: nextion
@@ -611,6 +710,8 @@ text_sensor:
         - globals.set:
             id: lastclick_coversettings_global
             value: !lambda return x;
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
 
   ##### last click climate page, the main action variable - push to HA #####
   - platform: nextion
@@ -632,6 +733,8 @@ text_sensor:
         - globals.set:
             id: lastclick_climatesettings_global
             value: !lambda return x;
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
 
   ##### currentpage sensor, the main action variable - push to HA #####
   - platform: nextion
@@ -653,9 +756,35 @@ text_sensor:
         - globals.set:
             id: currentpage_global
             value: !lambda return x;
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
 
 
-##### START - SWITCH CONFIGURATION #####  
+  ##### touchevent sensor, Reset the page timeout #####
+  - platform: nextion
+    nextion_id: disp1
+    #name: ${device_name} touchevent
+    id: disp1_touchevent
+    update_interval: 50ms
+    component_name: touchevent
+    internal: true
+    filters:
+      - lambda: |-
+          static std::string touchevent_history = "";
+          if (strcmp(x.c_str(), touchevent_history.c_str()) != 0) {
+            touchevent_history = x;
+            return x;
+            // touchevent_history = "";
+          } else {
+            return {};
+          }
+    on_value:
+      then:
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
+
+
+##### START - SWITCH CONFIGURATION #####
 switch:
 
   # ##### Restart switch ######
@@ -675,15 +804,29 @@ switch:
     assumed_state: off
     optimistic: true
 
-  ##### UPDATE TFT DISPLAY #####
+  ##### Notification unread #####
   - platform: template
-    name: Update TFT display
-    id: tft_update
+    name: ${device_name} Notification unread
+    id: notification_unread
     entity_category: config
-    turn_on_action:
-      - delay: 16ms
-      - lambda: id(disp1).upload_tft();
-      - switch.turn_off: tft_update
+    restore_state: true
+    optimistic: true
+
+  ##### Notification sound #####
+  - platform: template
+    name: ${device_name} Notification sound
+    id: notification_sound
+    entity_category: config
+    restore_state: true
+    optimistic: true
+
+  ##### Confirmation Message #####
+  - platform: template
+    name: ${device_name} Confirmation Message
+    id: confirmation_message
+    entity_category: config
+    restore_state: false
+    optimistic: true
 
   ##### PHYSICAL SWITCH 1 #####
   - platform: gpio
@@ -698,7 +841,7 @@ switch:
     id: relay_2
     pin:
       number: 19
-      
+
   ##### DISPLAY ALWAYS ON #####
   - platform: gpio
     name: ${device_name} Screen Power
@@ -732,6 +875,20 @@ switch:
             value: '1'
       - lambda:  id(disp1).set_component_value("settings.a02",1);
 
+  ##### Relay Local control Fallback #####
+  - platform: template
+    name: ${device_name} Relay 1 Local Fallback
+    id: relay1_fallback
+    entity_category: config
+    restore_state: true
+    optimistic: true
+
+  - platform: template
+    name: ${device_name} Relay 2 Local Fallback
+    id: relay2_fallback
+    entity_category: config
+    restore_state: true
+    optimistic: true
 
 ##### START - NUMBER CONFIGURATION #####
 number:
@@ -790,6 +947,17 @@ number:
             id: temperature_correction_global
             value: !lambda 'return x;'
 
+##### page-timeout #####
+  - platform: template
+    name: ${device_name} Page Timeout
+    id: page_timeout
+    entity_category: config
+    min_value: 0
+    max_value: 60
+    initial_value: 10
+    step: 1
+    restore_value: true
+    optimistic: true
 
 ##### START - DISPLAY START CONFIGURATION #####
 display:
@@ -799,17 +967,12 @@ display:
     tft_url: ${nextion_update_url}
     on_setup:
       then:
-        - lambda: id(disp1).send_command_printf("page 9"); ##### CHANGE! -  Loading page #####
+        - lambda: id(disp1).send_command_printf("page 8");
+        - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "3.2.2"); ### esphome-version ###
         - wait_until:
             api.connected
-        - delay: 0.5s
-        - rtttl.play: "two short:d=4,o=5,b=100:16e6,16e6"
-        - delay: 0.5s
-        - switch.template.publish:
-            id: nextion_init
-            state: on
-        - lambda: id(disp1).send_command_printf("page 0"); #### home page #####
-        - delay: 2s ##### gives the display time to update other components & set the home page #####
+        - lambda: id(disp1).set_component_text_printf("boot.ip_addr", "%s", id(ip_address).state.c_str());
+        - delay: 1s
         - number.set:
             id: display_brightness
             value: !lambda 'return id(display_brightness_global);'
@@ -821,9 +984,25 @@ display:
         - lambda: id(disp1).send_command_printf("settings.brightslider.val=%i", id(display_brightness_global));
         - lambda: id(disp1).send_command_printf("settings.dimslider.val=%i", id(display_dim_brightness_global));
         - lambda: id(disp1).send_command_printf("home.sleepmodus.val=%i", id(sleep_modus_global));
-        - lambda: |-
-            id(disp1).set_component_value("settings.a02",0);
-            if (id(sleep_modus_global) == 1) 
-            {
-              id(disp1).set_component_value("settings.a02",1);
-            }
+        - lambda: id(disp1).set_component_value("settings.a02", id(sleep_modus_global) == 1);
+        - delay: 1s
+        - switch.template.publish:
+            id: nextion_init
+            state: on
+
+### Script for page_timer
+script:
+  - id: page_timer
+    mode: restart
+    parameters:
+      delay: int
+    then:
+      - lambda: ESP_LOGD("nspanel", "start page-timer delay %i", int(id(page_timeout).state));
+      - delay: !lambda return delay *1000;
+      - lambda: |-
+          if (id(disp1_currentpage).state == "home" or id(disp1_currentpage).state == "screensaver" or id(disp1_currentpage).state == "boot" or int(id(page_timeout).state) == 0) {
+            ESP_LOGD("nspanel", "no page-jump");
+          } else {
+            ESP_LOGD("nspanel", "timer->home");
+            id(disp1).send_command_printf("page 0");
+          }