Merge pull request #544 from Blackymas/beta

v3.2.1 - new features and fixes

.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,5 +1,7 @@
 # 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)
@@ -14,7 +16,7 @@ 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).
 
-📌 Step by Step - [Setup Video](https://www.youtube.com/watch?v=3afPFg6kUdc)
+📌 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)
 
@@ -27,7 +29,8 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 🙋 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)

nspanel_esphome.yaml

@@ -107,12 +107,22 @@ 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:
@@ -161,7 +171,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:
@@ -170,7 +180,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:
@@ -178,6 +188,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:
@@ -229,6 +246,16 @@ api:
             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
@@ -238,6 +265,17 @@ api:
         - 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:
@@ -247,126 +285,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);
@@ -430,7 +354,7 @@ globals:
     restore_value: no
     initial_value: ''
 
-  ##### lastclick_ccurrentpage State #####
+  ##### lastclick_currentpage State #####
   - id: currentpage_global
     type: std::string
     restore_value: no
@@ -442,22 +366,71 @@ 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
+              - lambda: id(disp1).send_command_printf("home.icon_top_01.pic=51");
+              - lambda: id(disp1).send_command_printf("home.left_bt_pic.pic=98");
+              - if: 
+                  condition:
+                    switch.is_on: relay_1
+                  then:
+                    - lambda: id(disp1).send_command_printf("home.icon_top_01.pic=105");
+
 
   ##### 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
+              - lambda: id(disp1).send_command_printf("home.icon_top_02.pic=51");
+              - lambda: id(disp1).send_command_printf("home.right_bt_pic.pic=98");
+              - if: 
+                  condition:
+                    switch.is_on: relay_2
+                  then:
+                    - lambda: id(disp1).send_command_printf("home.icon_top_02.pic=106");
+
+  ##### JUMP PAGE TO SETTING PAGE #####
+  - platform: nextion
+    name: $device_name setting page
+    page_id: 0
+    component_id: 53
+    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: 15
     internal: true
     on_click:
       - button.press: restart_nspanel
@@ -475,7 +448,7 @@ binary_sensor:
   - platform: nextion
     name: ${device_name} Sleep Modus
     page_id: 7
-    component_id: 4
+    component_id: 16
     internal: true
     on_click:
       - switch.toggle: sleep_modus
@@ -504,22 +477,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
@@ -600,6 +581,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
@@ -615,6 +597,10 @@ text_sensor:
     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
@@ -635,6 +621,8 @@ 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
@@ -656,6 +644,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
@@ -677,6 +667,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
@@ -698,6 +690,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
@@ -719,6 +713,32 @@ text_sensor:
         - globals.set:
             id: currentpage_global
             value: !lambda return x;
+        - lambda: |-
+            id(page_timer)->execute(int(id(page_timeout).state));
+
+
+  ##### 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 #####  
@@ -765,16 +785,6 @@ switch:
     restore_state: false
     optimistic: true
 
-  ##### UPDATE TFT DISPLAY #####
-  - platform: template
-    name: ${device_name} Update TFT display
-    id: tft_update
-    entity_category: config
-    turn_on_action:
-      - delay: 16ms
-      - lambda: id(disp1).upload_tft();
-      - switch.turn_off: tft_update
-
   ##### PHYSICAL SWITCH 1 #####
   - platform: gpio
     name: ${device_name} Relay 1
@@ -822,6 +832,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:
@@ -880,6 +904,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:
@@ -890,9 +925,11 @@ display:
     on_setup:
       then:
         - lambda: id(disp1).send_command_printf("page 8");
+        - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "3.2"); ### esphome-version ###
         - wait_until:
             api.connected
-        - delay: 0.5s
+        - 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);'
@@ -904,13 +941,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);
-            }
-        - delay: 0.5s
+        - 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");
+          }