Merge pull request #86 from Blackymas/beta

button label 25 fix

README.md

@@ -1,5 +1,10 @@
 # NSPanel Custom with HA Blueprint
+
+
+[![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.
@@ -7,11 +12,15 @@ And the best thing is, the installation takes only a few minutes.
 
 The goal was to create a version that allows everyone to use the NSpanel fully local without having to deal with programming or reading hours of documentation - *AND YES WE DID IT!!!!* ;)
 
-📕 Full documentation and installation is available here [NSPanel Configuration, Setup and HowTo ](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki). (coming soon)
+📕 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)
 
-ℹ️ Version 2.0.0
+⭐ 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)
+
+🙋 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)
@@ -39,8 +48,16 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 
 
 ![10 Settings](https://user-images.githubusercontent.com/41958506/203654386-e4e574ad-8674-4268-84dd-1c4e40f98eb9.png)
+![1 Boot](https://user-images.githubusercontent.com/41958506/203667473-d33523a4-3197-4838-9099-cccebfc727db.png)
 
-(NSPanel Settings)
+(NSPanel Settings and Boot Screen)
+
+
+![Device Setting 1](https://user-images.githubusercontent.com/41958506/203723223-8afc0e44-51cf-49ed-8a49-8ba713716639.png)
+![Device Setting 2](https://user-images.githubusercontent.com/41958506/203724491-53ecd93d-bc7c-4c2d-850b-f106691e2639.png)
+
+
+(HA Device Seeting for Example temperature correction)
 
 
 ## Blueprint:
@@ -150,3 +167,4 @@ Marcfager:  https://github.com/marcfager/nspanel-mf
 lovejoy77: https://github.com/lovejoy777/NSpanel
 
 Hellis81: https://github.com/Hellis81/NS-panel
+

nspanel_blueprint.yaml

@@ -6,19 +6,34 @@ blueprint:
   name: NSPanel Configuration
   description: '# Configuration and synchronization NSPanel via Blueprint
 
-This Blueprint makes it possible to configure the complete NSPanel easily via blueprint 
+[![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)
 
-It is no longer necessary to change anything in the code. All entities can be set and configured via the blueprint.
-
-The only requirement is that the NSPanel was flashed with ESPHome. See Wiki.
+(you can update your blueprint via the link)
 
 
-    📕 Full documentation is available here [NSPanel Configuration, Setup and HowTo ](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki).
+This project allows you to configure your complete NSPanel via a Blueprint with UI.
+
+### *That means you dont 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.
+And the best thing is, the installation takes only a few minutes.
 
 
-    ℹ️ Version 2.0.0
+The goal was to create a version that allows everyone to use the NSpanel fully local without having to deal with programming or reading hours of documentation - *AND YES WE DID IT!!!!* ;)
 
-    '
+
+📕 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)
+
+
+⭐ 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)
+
+'
 
   source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspnael_blueprint.yaml
   domain: automation
@@ -1629,7 +1644,7 @@ action:
                   button_label: "{{ entity24_name }}"
                   button: buttonpage03.button08
                 - entity: "{{ entity25 }}"
-                  button_label: "{{ entity17_name }}"
+                  button_label: "{{ entity25_name }}"
                   button: buttonpage04.button01
                 - entity: "{{ entity26 }}"
                   button_label: "{{ entity26_name }}"
@@ -1757,12 +1772,16 @@ action:
               message: "{{ time }}"
           
           #####  NSPanel boot init - Humidity #####
-          - delay:
-              milliseconds: "{{ delay_value }}"
-          - service: "{{ command_text_printf }}"
-            data:
-              component: home.humidity_state
-              message: "{{ states(humidity) |round(0) }}%"
+          - if:
+              - condition: template
+                value_template: '{{ humidity is match "sensor." and states(humidity).state != "unavailable" }}'
+            then:
+              - delay:
+                  milliseconds: "{{ delay_value }}"
+              - service: "{{ command_text_printf }}"
+                data:
+                  component: home.humidity_state
+                  message: "{{ states(humidity) |round(0) }}%"
           
           #####  NSPanel boot init - Hotwater #####
           - if:
@@ -1784,9 +1803,10 @@ action:
           #####  NSPanel boot init - Outdoor Temp #####
           - variables:
               outdoor_temp: >-
-                {%- if outdoortemp is match "sensor." -%} {{ states(outdoortemp) |round(0) }}
-                {%- elif weather == "Default" -%} {{state_attr(ha_weather,"temperature") | round(0)}}
-                {%- elif weather == "AccuWeather" -%} {{state_attr(accuweather_value,"temperature") | round(0)}}
+                {%- if outdoortemp is match "sensor." and states(outdoortemp).state != "unavailable" -%} {{ states(outdoortemp) |round(0) }}
+                {%- elif weather == "Default" and state_attr(ha_weather, "temperature") != None -%} {{state_attr(ha_weather,"temperature") | round(0)}}
+                {%- elif weather == "AccuWeather" and state_attr(accuweather_value, "temperature") != None -%} {{state_attr(accuweather_value,"temperature") | round(0)}}
+                {%- else -%} 0
                 {%- endif -%}
           - delay:
               milliseconds: "{{ delay_value }}"
@@ -3094,17 +3114,21 @@ action:
                       message: "{{ time }}"
                   
                   #####  NSPanel Humidity #####
-                  - delay:
-                      milliseconds: "{{ delay_value }}"
-                  - service: "{{ command_text_printf }}"
-                    data:
-                      component: home.humidity_state
-                      message: "{{ states(humidity) |round(0) }}%"
+                  - if:
+                      - condition: template
+                        value_template: '{{ humidity is match "sensor." and states(humidity).state != "unavailable" }}'
+                    then:
+                      - delay:
+                          milliseconds: "{{ delay_value }}"
+                      - service: "{{ command_text_printf }}"
+                        data:
+                          component: home.humidity_state
+                          message: "{{ states(humidity) |round(0) }}%"
                   
                   #####  NSPanel Hotwater #####
                   - if:
                       - condition: template
-                        value_template: '{{ hotwatertemp is match "sensor." }}'
+                        value_template: '{{ hotwatertemp is match "sensor." and states(hotwatertemp).state != "unavailable" }}'
                     then:
                       - delay:
                           milliseconds: "{{ delay_value }}"
@@ -3121,9 +3145,10 @@ action:
                   #####  NSPanel Outdoor Temp #####
                   - variables:
                       outdoor_temp: >-
-                        {%- if outdoortemp is match "sensor." -%} {{ states(outdoortemp) |round(0) }}
-                        {%- elif weather == "Default" -%} {{state_attr(ha_weather,"temperature") | round(0)}}
-                        {%- elif weather == "AccuWeather" -%} {{state_attr(accuweather_value,"temperature") | round(0)}}
+                        {%- if outdoortemp is match "sensor." and states(outdoortemp).state != "unavailable" -%} {{ states(outdoortemp) |round(0) }}
+                        {%- elif weather == "Default" and state_attr(ha_weather, "temperature") != None -%} {{state_attr(ha_weather,"temperature") | round(0)}}
+                        {%- elif weather == "AccuWeather" and state_attr(accuweather_value, "temperature") != None -%} {{state_attr(accuweather_value,"temperature") | round(0)}}
+                        {%- else -%} 0
                         {%- endif -%}
                   - delay:
                       milliseconds: "{{ delay_value }}"
@@ -4461,9 +4486,10 @@ action:
                   - variables:
                       hvac_mode: "{{ states(climate) }}"
                       outdoor_temp: >-
-                        {%- if outdoortemp is match "sensor." -%} {{ states(outdoortemp) |round(0) }}
-                        {%- elif weather == "Default" -%} {{state_attr(ha_weather,"temperature") | round(0)}}
-                        {%- elif weather == "AccuWeather" -%} {{state_attr(accuweather_value,"temperature") | round(0)}}
+                        {%- if outdoortemp is match "sensor." and states(outdoortemp).state != "unavailable" -%} {{ states(outdoortemp) |round(0) }}
+                        {%- elif weather == "Default" and state_attr(ha_weather, "temperature") != None -%} {{state_attr(ha_weather,"temperature") | round(0)}}
+                        {%- elif weather == "AccuWeather" and state_attr(accuweather_value, "temperature") != None -%} {{state_attr(accuweather_value,"temperature") | round(0)}}
+                        {%- else -%} 0
                         {%- endif -%}
                       heating_state: >-
                         {%- if hvac_mode == "off" -%} {{ off_mui }}

nspanel_esphome.yaml

@@ -11,8 +11,10 @@
   # ## 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.
-  # wifi_password: !secret nspanel_wifi_password # add in your esphome secrets file.
-  # ota_password: !secret nspanel_ota_password # add in your esphome secrets file.
+  # wifi_password: !secret nspanel_wifi_password # add in your esphome secrets file. -> per default this is also used for ota_password and web_password
+  # ota_password: !secret nspanel_ota_password # add in your esphome secrets file. - manual change in code required to activate
+  # web_password: !secret nspanel_web_password # add in your esphome secrets file. - manual change in code required to activate
+  # api_password: !secret nspanel_api_password # add in your esphome secrets file. - manual change in code required to activate
   # nextion_update_url: !secret nspanel_update_url # add in your esphome secrets file. Example: "http://"HOME ASSISTANT IP":8123/local/nspanel/nspanel.tft"
 
   # ## static ip config ##
@@ -22,6 +24,11 @@
   # dns: "10.0.0.138"
   # domain: ".local"
 
+##### if you rename this file to .nspanel_esphome.yaml then you can activate nested config
+##### use the ADVANCED CONFIG-Section as device configuration
+##### https://esphome.io/guides/configuration-types.html#yaml-insertion-operator
+# <<: !include .nspanel_esphome.yaml
+
 ##### END OF ADVANCED CONFIGURATION ##############################################################
 
 ##### WIFI SETUP #####
@@ -36,7 +43,7 @@ wifi:
   #   subnet: ${subnet}
   #   dns1: ${dns}
   # domain: ${domain}
-  # Enable fallback hotspot (captive portal) in case wifi connection fails
+  ##### Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
     ssid: "${device_name}"
     password: ${wifi_password}
@@ -62,11 +69,15 @@ web_server:
   port: 80
   auth:
     username: admin
-    password: ${ota_password}
+    password: ${wifi_password}
+    ##### advanced config - change to use web_password ##### 
+    # password: ${web_password}
 
 ##### OTA PASSWORD #####
 ota:
-  password: ${ota_password}
+  password: ${wifi_password}
+  ##### advanced config - change to use ota_password ##### 
+  # password: ${ota_password}
   safe_mode: true
   reboot_timeout: 3min
   num_attempts: 3
@@ -105,6 +116,8 @@ button:
 
 ##### START - API CONFIGURATION #####
 api:
+  ##### advanced config - activate to use api_password ##### 
+  # password: ${api_password}
   services:
 
     ##### SERVICE TO UPDATE THE HMI FILE #####