From 55b9b9728b69b7f1e069ccff88197c4eb1d0b323 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:14:55 +0100
Subject: [PATCH 01/17] Create validate_esphome_beta.yml
---
.github/workflows/validate_esphome_beta.yml | 123 ++++++++++++++++++++
1 file changed, 123 insertions(+)
create mode 100644 .github/workflows/validate_esphome_beta.yml
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
new file mode 100644
index 0000000..dc33f77
--- /dev/null
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -0,0 +1,123 @@
+name: Validate ESPHome (beta)
+
+on:
+ #push:
+ #paths:
+ #- "nspanel_esphome*.yaml"
+ #pull_request:
+ #schedule:
+ # - cron: "0 0 * * *"
+ workflow_dispatch:
+
+concurrency:
+ # yamllint disable-line rule:line-length
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ code_scan:
+ name: Code scan (YAML)
+ runs-on: "ubuntu-latest"
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Validate nspanel_esphome.yaml
+ run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
+ - name: Validate nspanel_esphome_advanced.yaml
+ run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_advanced.yaml
+ - name: Validate nspanel_esphome_addon_climate_cool.yaml
+ run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
+ - name: Validate nspanel_esphome_addon_climate_heat.yaml
+ run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
+
+ build_core:
+ name: Core
+ runs-on: "ubuntu-latest"
+ needs:
+ - code_scan
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_core.yaml"
+ version: beta
+
+ build_advanced:
+ name: Advanced
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_core
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+advanced
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_advanced.yaml"
+ version: beta
+
+ build_climate_heat:
+ name: Climate (heat)
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_core
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+climate_heat
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_climate_heat.yaml"
+ version: beta
+
+ build_climate_cool:
+ name: Climate (cool)
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_core
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+climate_cool
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_climate_cool.yaml"
+ version: beta
+
+ build_climate_heat_advanced:
+ name: Advanced+climate (heat)
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_climate_heat
+ - build_advanced
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+advanced+climate_heat
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_advanced_climate_heat.yaml"
+ version: beta
+
+ build_climate_cool_advanced_esp_idf:
+ name: esp-idf & Bluetooth proxy
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_climate_cool
+ - build_advanced
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+advanced+climate_cool+esp_idf
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
+ version: beta
+
+ #build_climate_cool_advanced_esp_idf5:
+ # name: esp-idf v5 & Bluetooth proxy
+ # runs-on: "ubuntu-latest"
+ # needs:
+ # - build_climate_cool
+ # - build_advanced
+ # steps:
+ # - uses: actions/checkout@v4.1.0
+ # - name: Build core+advanced+climate_cool+esp_idf
+ # uses: esphome/build-action@v1.8.0
+ # with:
+ # yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf5.yaml"
From 40282b2e149a10bba55a9860b76f726c36ced299 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:21:10 +0100
Subject: [PATCH 02/17] Add scheduled
---
.github/workflows/validate_esphome_beta.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index dc33f77..4e11a8e 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -4,9 +4,9 @@ on:
#push:
#paths:
#- "nspanel_esphome*.yaml"
- #pull_request:
- #schedule:
- # - cron: "0 0 * * *"
+ pull_request:
+ schedule:
+ - cron: "0 0 * * *"
workflow_dispatch:
concurrency:
From d6cc901937fd3e3b9c1b3fd1919bb25a5bcb179f Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:28:04 +0100
Subject: [PATCH 03/17] Trigger on push
---
.github/workflows/validate_esphome_beta.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index 4e11a8e..c1135f5 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -1,7 +1,7 @@
name: Validate ESPHome (beta)
on:
- #push:
+ push:
#paths:
#- "nspanel_esphome*.yaml"
pull_request:
From 06ac511ae6ed0658054fba005c314fb0bb3a2258 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:45:46 +0100
Subject: [PATCH 04/17] Don't run on push
---
.github/workflows/validate_esphome_beta.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index c1135f5..df34de6 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -1,12 +1,12 @@
name: Validate ESPHome (beta)
on:
- push:
+ #push:
#paths:
#- "nspanel_esphome*.yaml"
pull_request:
- schedule:
- - cron: "0 0 * * *"
+ #schedule:
+ #- cron: "0 0 * * *"
workflow_dispatch:
concurrency:
From 7f9fd4c81917b1dfe4cb213497dd7d5912b012c5 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 11 Nov 2023 23:48:40 +0100
Subject: [PATCH 05/17] Reorg things
---
.github/workflows/validate_esphome_beta.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index df34de6..cdab127 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -1,13 +1,13 @@
name: Validate ESPHome (beta)
on:
+ workflow_dispatch:
+ pull_request:
#push:
#paths:
#- "nspanel_esphome*.yaml"
- pull_request:
#schedule:
#- cron: "0 0 * * *"
- workflow_dispatch:
concurrency:
# yamllint disable-line rule:line-length
From 42ef8388192916f36a1d71fdea13c5f9f7b6e8b1 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 12 Nov 2023 07:23:01 +0100
Subject: [PATCH 06/17] Remove references to `bluetooth`
It isn't stable enough.
---
ReleaseNotes.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 80b73a4..7e78e51 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -107,7 +107,7 @@ Although this project still using ESPHome default framework (currently `arduino`
The `arduino` protocol still more popular and therefore more components are available, but there are some advantages with the ESP-IDF framework:
- It is updated more frequently by EspressIF, which means it is more secure and stable.
- It reduces a layer, as Arduino is developed in top of ESP-IDF, so basically we are changing from ESPHome -> Arduino -> ESP-IDF -> Hardware to ESPHome -> ESP-IDF -> Hardware.
-- By reducing a layer, more memory is available for future features and for the custom components you might want to add to your panel (like `bluetooth_proxy` or [Improv](https://www.improv-wifi.com/)).
+- By reducing a layer, more memory is available for future features and for the custom components you might want to add to your panel.
- The memory management is more efficient, which makes critical tasks, like uploading a TFT file, more reliable.
In the future we will probably make this as the default framework, so if you are a new user or if for some reason you have to flash your panel via serial/usb, it's a good idea to change to ESP-IDF now.
Please look at [customizations docs in the Wiki](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki/(EN)-Customization#framework-esp-idf) for more details on how to change the framework.
From a0f749d4abf91fc84717913e3fe738a1c9cef02f Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 12 Nov 2023 07:40:43 +0100
Subject: [PATCH 07/17] Add tests on ESPHome beta (temporarily)
---
.github/workflows/validate_esphome.yml | 42 ++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 347264c..6ee1675 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -103,6 +103,47 @@ jobs:
with:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
+ build_core_beta:
+ name: Core
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_core
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_core.yaml"
+ version: beta
+
+ build_climate_heat_advanced_beta:
+ name: Beta - Advanced+climate (heat)
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_core_beta
+ - build_climate_heat_advanced
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+advanced+climate_heat
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_advanced_climate_heat.yaml"
+ version: beta
+
+ build_climate_cool_advanced_esp_idf_beta:
+ name: Beta - esp-idf & Bluetooth proxy
+ runs-on: "ubuntu-latest"
+ needs:
+ - build_core_beta
+ - build_climate_cool_advanced_esp_idf
+ steps:
+ - uses: actions/checkout@v4.1.0
+ - name: Build core+advanced+climate_cool+esp_idf
+ uses: esphome/build-action@v1.8.0
+ with:
+ yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
+ version: beta
+
#build_climate_cool_advanced_esp_idf5:
# name: esp-idf v5 & Bluetooth proxy
# runs-on: "ubuntu-latest"
@@ -115,3 +156,4 @@ jobs:
# uses: esphome/build-action@v1.8.0
# with:
# yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf5.yaml"
+
From b9e23bf855487e96e27dfc63b438ece1d5ac3c17 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 12 Nov 2023 07:42:28 +0100
Subject: [PATCH 08/17] Fix naming
---
.github/workflows/validate_esphome.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 6ee1675..f76c020 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -104,7 +104,7 @@ jobs:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
build_core_beta:
- name: Core
+ name: Beta - Core
runs-on: "ubuntu-latest"
needs:
- build_core
From 7cac47d279817b1b93b112df14a1b5bef9ed2955 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 12 Nov 2023 08:15:42 +0100
Subject: [PATCH 09/17] No need to reload PR every time
---
nspanel_esphome_addon_upload_tft.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/nspanel_esphome_addon_upload_tft.yaml b/nspanel_esphome_addon_upload_tft.yaml
index 7aa5745..c59c49c 100644
--- a/nspanel_esphome_addon_upload_tft.yaml
+++ b/nspanel_esphome_addon_upload_tft.yaml
@@ -17,7 +17,6 @@ external_components:
- source: github://pr#5683 # Remove this when that pr is merged
components:
- nextion
- refresh: 1s
button:
##### UPDATE TFT DISPLAY #####
From bab945b24265a60ada790b976d54c9c9bbd211e9 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 12 Nov 2023 09:35:36 +0100
Subject: [PATCH 10/17] Bump version to 4.1
Ready for release
---
nspanel_blueprint.yaml | 4 ++--
nspanel_esphome_core.yaml | 2 +-
nspanel_eu.HMI | Bin 14899044 -> 14899044 bytes
nspanel_eu.tft | Bin 7248068 -> 7248068 bytes
nspanel_eu_code/boot.txt | 2 +-
nspanel_us.HMI | Bin 14731244 -> 14731244 bytes
nspanel_us.tft | Bin 7255680 -> 7255680 bytes
nspanel_us_code/boot.txt | 2 +-
nspanel_us_land.HMI | Bin 14636231 -> 14636231 bytes
nspanel_us_land.tft | Bin 7248128 -> 7248128 bytes
nspanel_us_land_code/boot.txt | 2 +-
11 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index da2567c..3d1065e 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -33,7 +33,7 @@ blueprint:
đ Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap)
- âšī¸ Version: v4.1b1
+ âšī¸ Version: v4.1
source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml
domain: automation
@@ -3604,7 +3604,7 @@ trigger_variables:
variables:
##### GENERAL #####
- blueprint_version: '4.1b1'
+ blueprint_version: '4.1'
date_format_temp: !input 'date_format'
#Avoid breaking change for existing users with legacy type format
date_format: >
diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml
index ec1e78d..a5bf7ae 100644
--- a/nspanel_esphome_core.yaml
+++ b/nspanel_esphome_core.yaml
@@ -7,7 +7,7 @@
substitutions:
##### DON'T CHANGE THIS #####
- version: "4.1b1"
+ version: "4.1"
#############################
##### ESPHOME CONFIGURATION #####
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 76e22156871fbb1562ca094287b47a3920e2efa0..b352fb74da1bc95204a58df29a8fc49046efe2f8 100644
GIT binary patch
delta 1294
zcmdVY`%_F|7zgn8w7X>+W6ZRM%#;z6F=|uCdRq)o(A
z7;UC-+CmYul_F^yMbUPOrX3VRv9y!oD4r51k#R!~6)Jpl5c|F-%0>Qj(ny(`S|g7C
zl3Za9DoY8s7XzGyo?_n|YtcA8CsG`nER4!?ED|6EbdU;qNP~39fK14OY{-FJAlMCi
zAP@FJJ`}({*bjwp01m<-I1ER?07sz+ia~^9a2!hD1e}CYI0dJ{2xs6doP#nr59M$H
zDxeZB!X>y2RZtBza0P1NDwv=S>fsugp#d7r>2890u_7>tbyhW5${=L&J-VnRGK#R9HlXh!Ar5B~enk-?o%`SV=Bz{0J$9
zA}JeNE?o&JatXN=(<>Qoz4bJ^GyVk5%xC5~-#K&6^WqHG6{&_vGBrpc(zMv{=s1^v
zpg>_+&CcKe)2P+{jF31hQejM~Pr
zFZidyUNhOI%V}V6G~{bFdaXtxE3zgVvZXO5twz;0^3Mz8%No7RhB6z
z${JPq$p3J_C~JlyF%R?M4IlVo0TyBrv{;NKSPDNZ!*ci|0D)M6l~{!!ti~DyV=dMp
z1naQ@8xe|4*o-X*!&Yp=cI<$RaO^|`b|DhGu?JCz#$Lo=A7T-Q{fI{b5|M;tq#(61
z%`eopDI%yhTj|#6yp-I~G&v{F+WcXRGlj^qWLGC4vMsrGwh)>>^6rV
z$dcV%giu?ux9i`zkDCysmU+Ls5Q&!TKUath^ZnyRo2L-=mIr!Fzp`|*tW70hY2&6V
zj%B*3lBY7`M{2bxxGFt-ilRzP=`?9Ql3T2l`lw0|WkPZ4Bz>WhM(LD6nWUpE%BBO9
zL%DR2@+hA`hv+cr=?E3jQ7WWkR7A(=1f8T)R7?gcq0@AR6go@isFcpr1-eLObcxET
zf-X}fRnZl?O4q2GYUn!Mpjx^~b##mBsex{jks9d^-6az>Q8V46`}BYwQVX?G8?{ph
zbIj=+HG@ihWi*KeI_ikP8tr;`TaJ#SZ
ze}$gG@0YMLIjT!gDgh@$L
zewsF8)|`0@7A^T@*@{(b)@|6lNnJ#jS5YeQHyx$It#CWs33tQa;a<2O{s|Al!|*6P
P{+EtU;&-vL)8zkq*`0DP
delta 269
zcmWN=MNS-0007VcgB6Om$ly|3W{@Jqtp$oZ#Rjk3fyGPM5Ek5ogoK1{xyIau|C0Ci
z^qTe--b#@wO+>m3nX+X2AV;o`^5iQ}s7SFApL|xTOt}hCm8w*$QL9e929270(X2(Q
zHtjle>e8)8OkA%%{RVtBXvnY;-;5eFZo;G~(`L+?Gw-_}7A#uw)3Oz-)~wsGY0I`9
zyY}om@XMhi$ImDC$<##b?jd;+o`#9=EIbb{!pra~ybf=|-{GI|@5@8-U;KY0`uH;b
E4vh|OUH||9
diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt
index b75e5b6..bf02617 100644
--- a/nspanel_eu_code/boot.txt
+++ b/nspanel_eu_code/boot.txt
@@ -142,7 +142,7 @@ Text tft_version
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
- Text : 4.1b1
+ Text : 4.1
Max. Text Size : 9
Text esph_version
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index 336c4c3cc44721df1769f31579d409ea7550e788..787883443eb23eda79b8363e6708b7891938d75d 100644
GIT binary patch
delta 1233
zcmdVY>r+f|7zgm*XnfMzmUm_pneoya-_bGt1%5N1`F+nb&zy6fnWwwR?A1+DUA2@dNy*l9
zX`mz=1yZNvFX9tZ^bygKLOr_AX`)gqgyhK6{Pea4`T1E3eY_>fQR>qvg&GX{wD>=*
zykpBv!WhQTWEbLly*8%*SC8M%EV(;O!jreuY!{AV-x957?VzM~vq82PWQjaTL!P9i
zK2C$|jJ?j6)d4V*(~Z
z!6ZyZIHq7KreQiF5Q!O>i6}&47G@&`b1)b4FdqvLi-lN(#aM!+Scc_Tft83uJXT>f
z)*u0Eu@38zh$L*lMkFHzsYpXQGLVT)*o-aMifu3=3)_)hV~Q=;elcYXFxo2H@dk>VE|!{gdLjC%Ie5h1ddNs2
z%G7$RL5K`BhmRJ**!zB8;R+VQNBuyHGq=JtYKX1Jk|}F~^ah(0l_@(vHJE<*Te!`X
zL%Fnr@@OZS3ABsy$wIrSfcDT{Dx`h1pNgoM4$wieQVEsPA+ph7IznZ1l#Wq3RnT#&
zq!Vj&=*T_LNbe(F+NjIpDZqhAsQ9a$J25O``
zbeEc_neNejdO$7okRH)vdO}a>8M)~>wNe|spqKQDUQ;{0p$>XW@8~^!ppQ;>N9W*g
FzW})F{lfqN
delta 1185
zcmd7Q`%leb90%~{QKw`rzkIjW<_G-H)~3tR7Ap5kh2ps6u5T_8s#Ap0SL(cVs`%P_2E%|;Rs7O09up9a7{p>CCSfwBU@E3zI%Z%dW+4voNWg5&!CWLF
z3G*-?CM>{0EW%)aBLyl_u?B0g4(pMI4cLfuY{F)2K?X9B1v9dd
zgRR(xTx`b<>_i^&u?q$DT5`2vAgSN2+3X!9<81wn`D$UYm*-tLM+;G)=kQ=5G(9^)
zgvcM_nF$^v#4zc}5utoOdNzg$;iu>5@c-vA5kgey=Uql2a`YS*DMX&<{s7SwC4|5J
zgEm)TjW%|aZR9V9Vzc*ZJ~GPI+^Xf;+W+K6y39>lN|3eFt
zx=PpRIyvYD-K1K&MRjzWoK#PD=q|aaf$q_LdO(fzkRH)vYNBR(LQm-#wNNWPrx)~+
rUeRl6qc`-H-cdWfrw;0*57b2;=@We>H+`Y6^o_pL4_BwVJE-q3{t*1{
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 4c900ec6ac6660a8a226a39491171b8b75abaeb7..98d00f756ceb241235d79cbb37e137c31fd37ef9 100644
GIT binary patch
delta 271
zcmWl|*DfAl007XKwQH2xs%BBOw^F0_-fH~zeghXSPU5x~O?VKA#A|qiKkmdk^mCGP
z^Y#>X^InWtapEON^g)tjDN?0Lm*JyKS+eE$Bv+o#@)amlq*#ekWxgo)RfS4bs@16V
zO`UoTzH9VDlV&YiwQ1L(Qh|J)NfRjvr=+!
delta 269
zcmWl|*Df7k007|N*tPdot5%EJn^Utzjn=B#rPdqB$+`FvFC>w81()97+z_O%(w}Yrc8_aX2z^J^A;@n?uRAIR{XST&AJW0{I+S!
zwjI0v*z?!EgZsnVMDlUZT`X}J9)-u@Nq8Fm3(vyy@PBv_UWQlU^+POi^ZFcligp#h
E0cpT)IsgCw
diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt
index b75e5b6..bf02617 100644
--- a/nspanel_us_code/boot.txt
+++ b/nspanel_us_code/boot.txt
@@ -142,7 +142,7 @@ Text tft_version
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
- Text : 4.1b1
+ Text : 4.1
Max. Text Size : 9
Text esph_version
diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI
index f361c76f0505236b0ef11a5662bf8cd70be9f022..5bf45da52314fca64587584e47a6d70cde36e754 100644
GIT binary patch
delta 1208
zcmd7Q`BRKx00;2rZFg%k4R$gbMuTQCs0dSz5^@tI_fbhCyqnatt$m$c*o3XZ#7gGoN|C@AE#-`+R4fx6bj)vyP;qV(GJ5O0#`c
z`$@v)YUgX~qR~oHX%9`MN(!-k(E94l;X;TSUrBuF=V{j`s{TB4sKRa(YThNjv$bfa
zbA7D0AJ?XO$7$8k)k*q1m(J?aN#sE)Qj>-}oi3f1zWJYSAK9Fz=&TC+DeR}PpTd3$
z`zh?F=)C&>7ZXYq-H+KAj3F3`VF*VAh9eRqFcPB>h0z#;u^5N(n1G3xgvp4;6ih`7
zVlfSIn2s5kiCLJ9Ihc!in2!aBM*icvycS4!Xx1LWEfB&QSw}Ft>ict*8nW!pFVAJ!hAAOD~mt
zOg46M`lXn@`O66tveIVSLR+bTw$XOlK|5&|?WR3s
zqrJ3`3Q4B@bbt=hAv#P)=qMc{I~}JJR75A~6rH9sbe0@+j?U8sx=5GkGF_o!Dxp#;
zqjIVsCtam$be$@xif&Lf-K1OOqT5tMcc_-`QXSo+db&>!=pj9#$Ml30YM`g|jGogA
XYNRH5Nw4TNy`i`C&Kcu)Z#w@QK{MJ>
delta 1167
zcmd7Q=~InS90&08bi38Hc88g~u+PXaR9Ds(JJ}-25=on^5vi-Ibk&#a+f|Q3Qb@{@
zTb?LnNg@;_k!E`1g%^3eFk{RxzI12&2gaHC%zWo}&YbgoacT;GIMk4oS0a73mxSeu
zy^B`T3K3)Ju62=wb%?e?!*RP)FQ;T5A*5=nu=LRdNd`-d?)Uy~U7(YFZRPi`Y3=&-
zcD+P)q#=9Kl7rH&cO1}RQT2oV!82*9K3!!Gl|5AUP}xIe50yPsy`yu-|8T&n>KlSF
z9uwdNZ}`9$6EO*sF$GgG4bw3LGvS9>n2kA@i+S+Jd@Mi!7GetCh%Zg>jnbA!`ae&WzlE5_
z$)6&OVJWE^@n=~F3z1~Y?yf>4+j8+RAxw6iXIw`J(M9Ua9wYfNY}w!@gwB?|-2cwK
zJ%q@%&6^BDY_(-SPazUJ@9!b1#tPBR_CTG|H`Fv#qx_6EcI_{J%s2OT9PMU^TAeUf
z4&P&nmvdv|JQZiNsj;V$lVLohlMBYQwa5d@%nnNZfs|&g9G8_lJhNZiD5bvDlq#hM
z6ef_7wo@XRXa^-xGVP=kGSeF&QdO&qddx|^K^kOQUP6}Lb^;vR7_XsDqW-NR6;k%N~KgrH%Xy#
zx<$9Cf-30_-KBd}Mfd3eJ)}oeO^>ODo=`14rDs$}&*=rdqA;7U-R|dNdN!<
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index 1eeda58870712518876bfd4e447701ecd348515b..984327bb1a03fdfe1b9972a02cf4ee5e864efd9b 100644
GIT binary patch
delta 271
zcmWl|M=u^=007{qy+_g7TWhqX_TGEerpi}Z+b?i&coG*ECyA4zvq&WTmhZoKJ;`(V
z_!4{hUW^Z7#fg_7QIcdSQl&|kAybxYIX=pjC*LQZ6)04sScy_)%2lXTrCNW@Kgooi#cpRRDr{UT2L-c&*HSR9u
G;^qxawQ+6$
delta 269
zcmWl|*Df7k007|NC`D_uC{=2!y=#x!d+&9e+N00l;!AoX9!4Y*p5?@2xb^#z@8E^uziIPMl`yfTCkJ6;e@X2SHvSiEg#aFrV(Q%EzX5}W4Etlms4?RvOqw!n#;iH>7A#t_Y{jZI>o#oK
zvTet%J^KzGqPOwHSj+#rcr-i=W8vTMC_D~N!qf09JP$9z%kb*)E`I&*Ia2fT8hHZ*
CPHuAm
diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt
index b75e5b6..bf02617 100644
--- a/nspanel_us_land_code/boot.txt
+++ b/nspanel_us_land_code/boot.txt
@@ -142,7 +142,7 @@ Text tft_version
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
- Text : 4.1b1
+ Text : 4.1
Max. Text Size : 9
Text esph_version
From e68d542ad2844a110c8ba4ec42f3bcbb0c32dafd Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 12 Nov 2023 09:53:56 +0100
Subject: [PATCH 11/17] Remove build tests on beta environment
---
.github/workflows/validate_esphome.yml | 41 ---------------------
.github/workflows/validate_esphome_beta.yml | 1 +
2 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index f76c020..984f6a8 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -103,47 +103,6 @@ jobs:
with:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
- build_core_beta:
- name: Beta - Core
- runs-on: "ubuntu-latest"
- needs:
- - build_core
- steps:
- - uses: actions/checkout@v4.1.0
- - name: Build core
- uses: esphome/build-action@v1.8.0
- with:
- yaml_file: "./.test/esphome_core.yaml"
- version: beta
-
- build_climate_heat_advanced_beta:
- name: Beta - Advanced+climate (heat)
- runs-on: "ubuntu-latest"
- needs:
- - build_core_beta
- - build_climate_heat_advanced
- steps:
- - uses: actions/checkout@v4.1.0
- - name: Build core+advanced+climate_heat
- uses: esphome/build-action@v1.8.0
- with:
- yaml_file: "./.test/esphome_advanced_climate_heat.yaml"
- version: beta
-
- build_climate_cool_advanced_esp_idf_beta:
- name: Beta - esp-idf & Bluetooth proxy
- runs-on: "ubuntu-latest"
- needs:
- - build_core_beta
- - build_climate_cool_advanced_esp_idf
- steps:
- - uses: actions/checkout@v4.1.0
- - name: Build core+advanced+climate_cool+esp_idf
- uses: esphome/build-action@v1.8.0
- with:
- yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
- version: beta
-
#build_climate_cool_advanced_esp_idf5:
# name: esp-idf v5 & Bluetooth proxy
# runs-on: "ubuntu-latest"
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index cdab127..eab393f 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -121,3 +121,4 @@ jobs:
# uses: esphome/build-action@v1.8.0
# with:
# yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf5.yaml"
+ # version: beta
From 0578c961a1cf4c49067d5f4a2fe9a4992147719e Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:10:00 +0100
Subject: [PATCH 12/17] Update README.md
---
README.md | 165 ++++++++++++++++++++++++++++--------------------------
1 file changed, 86 insertions(+), 79 deletions(-)
diff --git a/README.md b/README.md
index 902f918..d7e5cfd 100644
--- a/README.md
+++ b/README.md
@@ -1,81 +1,40 @@
+*Are you happy with our version for NSPanel? Please consider supporting us with a donation.*
+
[](https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2)[](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FBlackymas%2FNSPanel_HA_Blueprint%2Fblob%2Fmain%2Fnspanel_blueprint.yaml)
+
+[](https://github.com/Blackymas/NSPanel_HA_Blueprint/actions/workflows/validate_esphome.yml)
+[](https://github.com/Blackymas/NSPanel_HA_Blueprint/actions/workflows/validate_esphome_beta.yml)
+
# 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.*
+This innovative solution is designed to revolutionize how you interact with your Sonoff NSPanel. Our goal? To make the customization of your NSPanel seamless, intuitive, and completely code-free!
-[](https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2)
+## Table of Contents
+1. [Project Highlights](#-project-highlights)
+2. [Documentation & Resources](#-documentation--resources)
+3. [Features](#-features)
+4. [Pages Overview](#-pages-overview)
+5. [Contributing](#-contributing)
+6. [Community & Support](#-community--support)
+7. [Acknowledgements](#-acknowledgements)
+8. [Donations](#-donations)
-[](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FBlackymas%2FNSPanel_HA_Blueprint%2Fblob%2Fmain%2Fnspanel_blueprint.yaml)
+## đ Project Highlights
-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.*
+- **No Coding Required:** Customize your NSPanel without touching a single line of code. It's all about intuitive, user-friendly experiences!
+- **Quick Setup:** Get your NSPanel up and running in minutes with our easy-to-follow graphical interface.
+- **Local Control:** Embrace full local control of your NSPanel, steering clear of cloud dependencies.
+- **Community-Driven:** A project for the users, by the users. Your contributions shape the future of this project!
-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.
+## đ Documentation & Resources
-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!!!!* ;)
+- **Getting Started:** Dive into our comprehensive [Documentation and Setup Guide](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki) for detailed instructions.
+- **Video Tutorial:** Prefer visual learning? Check out our [Step-by-Step Setup Video](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki).
+- **Troubleshooting:** Encounter an issue? Here's how to report it: [WIKI HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki).
+- **Feature Requests:** Got ideas? Share them [here](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/new%20feature%20request).
+- **Project Roadmap:** Curious about what's next? Explore our [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap).
-đ Full documentation and installation is available here: [NSPanel Configuration, Setup and HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki).
+## đ Features
-đ Step by Step - [Setup Video](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 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:
-
-
-
-
-
-
-(Home and Button page)
-
-
-
-
-
-(Light settings - Brightness and TEMP Color)
-
-
-
-
-(Light color wheel)
-
-
-
-
-
-(Cover settings and Weather forecast)
-
-
-
-
-
-(NSPanel settings and Boot screen)
-
-
-
-
-
-
-(HA device settings - Temperature correction)
-
-
-## Blueprint:
-
-
-
-
-
-## Features:
- 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
@@ -93,10 +52,13 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
- 2 physical switches with optional fallback mode
- and much more ;)
-
-## Pages
+
+## đ Pages Overview
+
### Home
+
+
- Current weather with button to Weather Forcast page
- Hardware buttons can be freely assigned
- Hardware button label (optional)
@@ -109,6 +71,9 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
### Button Page
+
+
+
- Up to 32 buttons
- 4 Button pages
- Button design is automatically generated based on the selected entity
@@ -121,6 +86,10 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
### Light Settings
+
+
+
+
- Light current state
- Brightness slider
- RGB color wheel
@@ -129,6 +98,8 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
### Cover Settings
+
+
- Open and close cover
- Cover position via slider
- Cover battery value (when available)
@@ -157,6 +128,8 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
### Weather Forecast
+
+
- 5 days weather forecast via swipe (supports most used weather integrations)
- Min and max outside temperatures
- Date
@@ -169,22 +142,56 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
### Display Settings
+
+
- Restart NSPanel
- Display brightness slider
- Display dim brightness slider
+### Boot
+
-
-## Thanks to:
-SmartHome Yourself: https://www.youtube.com/c/SmarthomeyourselfDe_DIY
+## Home Assistant interface
-Masto: https://github.com/masto/NSPanel-Demo-Files
+## Device's page
+
+
-Marcfager: https://github.com/marcfager/nspanel-mf
+## Automation (Blueprint)
+
+
-lovejoy77: https://github.com/lovejoy777/NSpanel
-Hellis81: https://github.com/Hellis81/NS-panel
+## đ Contributing
-sairon: https://github.com/sairon/esphome-nspanel-lovelace-ui
+- **Pull Requests:** Please direct all pull requests to the `DEV` branch, not the `main` branch.
+- **Join Our Team:** We're on the lookout for enthusiasts in programming, documentation, and translation. Interested? Please let us know.
+## đ Community & Support
+
+Join our vibrant community! Whether you're seeking support, wanting to contribute, or just looking to share your NSPanel journey, we're here for you.
+
+- **[Issues & Feature requests](https://github.com/Blackymas/NSPanel_HA_Blueprint/issues)**
+- **[Discussion Forum](https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions)**
+- **[Home Assistant Community](https://community.home-assistant.io/t/sonoff-nspanel-blueprint-configure-your-own-custom-nspanel-easy-via-a-blueprint/500577)**
+
+## đ Acknowledgements
+
+A huge thank you to everyone who has contributed to making this project a reality. Your support, feedback, and contributions have been invaluable.
+
+And special thanks for the other projects which inspired us:
+- Hellis81: https://github.com/Hellis81/NS-panel
+- Jimmyboy83: https://github.com/Jimmyboy83/nspanel
+- joBr99: https://github.com/joBr99/Generate-HASP-Fonts
+- lovejoy77: https://github.com/lovejoy777/NSpanel
+- Marcfager: https://github.com/marcfager/nspanel-mf
+- Masto: https://github.com/masto/NSPanel-Demo-Files
+- sairon: https://github.com/sairon/esphome-nspanel-lovelace-ui
+- SmartHome Yourself: https://www.youtube.com/c/SmarthomeyourselfDe_DIY
+
+
+## đ Donations
+
+Are you happy with our version for NSPanel? Please consider supporting us with a donation.
+
+[](https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2)
From bf9623505489c4ac548f5c16058164640203bc3a Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:12:25 +0100
Subject: [PATCH 13/17] Update README.md
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d7e5cfd..efc6c92 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
*Are you happy with our version for NSPanel? Please consider supporting us with a donation.*
-
[](https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2)[](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FBlackymas%2FNSPanel_HA_Blueprint%2Fblob%2Fmain%2Fnspanel_blueprint.yaml)
+
[](https://www.paypal.com/donate/?hosted_button_id=S974SWQMB8PB2)
+
+[](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FBlackymas%2FNSPanel_HA_Blueprint%2Fblob%2Fmain%2Fnspanel_blueprint.yaml)
[](https://github.com/Blackymas/NSPanel_HA_Blueprint/actions/workflows/validate_esphome.yml)
[](https://github.com/Blackymas/NSPanel_HA_Blueprint/actions/workflows/validate_esphome_beta.yml)
From 84edfcb8ea2423ac5a6f6b5a7bf204db2f4b3ee7 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:26:34 +0100
Subject: [PATCH 14/17] Add `esphome.xxxxx_play_rtttl` back to core
Solves #1262
---
ReleaseNotes.md | 8 ++++++--
nspanel_esphome_advanced.yaml | 11 -----------
nspanel_esphome_core.yaml | 11 ++++++++++-
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 7e78e51..4eea04b 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -40,8 +40,8 @@ Since in this update lots of input to the blueprint changed, we highly recommend
2. The following components are now deprecated:
- Buttons:
- Exit reparse (`button.xxxxx_exit_reparse`) - It shouldn't be necessary with the new TFT upload engine
- - Services:
- - Play rtttl (`esphome.xxxxx_play_rtttl`)
+ - ~~Services:~~
+ - ~~Play rtttl (`esphome.xxxxx_play_rtttl`)~~
- Sensors:
- API uptime
- Device uptime
@@ -85,6 +85,10 @@ packages:
5. Font size for chips
6. Short click to open Climate and Media Player
+- 4.1.1 patch:
+ - Service `esphome.xxxxx_play_rtttl` is back to core package
+
+
## Details of noteworthy changes
diff --git a/nspanel_esphome_advanced.yaml b/nspanel_esphome_advanced.yaml
index 10d1336..dfb2e06 100644
--- a/nspanel_esphome_advanced.yaml
+++ b/nspanel_esphome_advanced.yaml
@@ -7,17 +7,6 @@
##### ATTENTION: This will add advanced elements to the core system and requires the core part. #####
#####################################################################################################
-api:
- services:
- ##### 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;'
-
button:
##### EXIT REPARSE TFT DISPLAY #####
- name: ${device_name} Exit reparse
diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml
index a5bf7ae..9f89019 100644
--- a/nspanel_esphome_core.yaml
+++ b/nspanel_esphome_core.yaml
@@ -7,7 +7,7 @@
substitutions:
##### DON'T CHANGE THIS #####
- version: "4.1"
+ version: "4.1.1"
#############################
##### ESPHOME CONFIGURATION #####
@@ -172,6 +172,15 @@ api:
then:
- lambda: set_component_color->execute(component, foreground, background);
+ ##### 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 populate the alarm settings page #####
- service: alarm_settings
variables:
From bd14d7aa426e15fdc15dd421fefb48cc795b3ea0 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:28:37 +0100
Subject: [PATCH 15/17] Bump version to 4.1.1
---
ReleaseNotes.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 4eea04b..d98d086 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,4 @@
-# v4.1 - Easier TFT transfer
+# v4.1.1 - Easier TFT transfer
## Support this project
@@ -87,7 +87,7 @@ packages:
- 4.1.1 patch:
- Service `esphome.xxxxx_play_rtttl` is back to core package
-
+
## Details of noteworthy changes
@@ -154,6 +154,7 @@ See here: https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap
@Floppe
## Previous releases
+- [v4.1 - Easier TFT transfer](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.1)
- [v4.0.2 - Bug fixes](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.0.2)
- [v4.0.1 - Bug fixes](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.0.1)
- [v4.0 - Alarm and Media player pages, Climate add-ons and a more robust panel](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.0)
From 6025da2850ca9642095214c41f80c2834ffaf135 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:38:46 +0100
Subject: [PATCH 16/17] Stop fallback to Home when notification is shown
Solves #1261
---
nspanel_esphome_core.yaml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml
index 9f89019..0af6c9c 100644
--- a/nspanel_esphome_core.yaml
+++ b/nspanel_esphome_core.yaml
@@ -1548,12 +1548,22 @@ script:
- if:
condition:
- lambda: |-
- return (page != "screensaver" and page != "boot" and page != "home" and timeout >= 1);
+ return (timeout >= 1 and
+ page != "boot" and
+ page != "confirm" and
+ page != "home" and
+ page != "notification" and
+ page != "screensaver");
then:
- delay: !lambda return (timeout *1000);
- lambda: |-
ESP_LOGV("script.timer_page", "Timed out on page: %s", current_page->state.c_str());
- if (current_page->state != "screensaver" and current_page->state != "boot" and current_page->state != "home" and timeout >= 1)
+ if (timeout >= 1 and
+ current_page->state != "boot" and
+ current_page->state != "confirm" and
+ current_page->state != "home" and
+ current_page->state != "notification" and
+ current_page->state != "screensaver")
{
ESP_LOGD("script.timer_page", "Fallback to page Home");
disp1->goto_page("home");
From 36d1ea7a05e11cfb6e498ee340c5f1f494d14df6 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:41:08 +0100
Subject: [PATCH 17/17] Stop fallback to Home when Notification or Confirm
shown
---
ReleaseNotes.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index d98d086..4412f45 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -87,6 +87,7 @@ packages:
- 4.1.1 patch:
- Service `esphome.xxxxx_play_rtttl` is back to core package
+ - Stop the fallback to Home page when Notification or Confirm pages are shown