From 7d73841907169bd6407d017039a20144fd24bdd9 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/11] 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 7d2fde6e03842e6c96748c9cb2ef2b41cae2f474 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/11] 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 42db0b8502f3e96d0b2148609489884853f3f241 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/11] 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 c93f32837d4e6b1245e17b317a70c1e78313adf0 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/11] 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 9e24d2d4db48b7c8f660848a18478caf9d4cf306 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/11] 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 e2f8a62f44cff0e47d3731e2ff912ba22a5deb81 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/11] 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.
 <br>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.
 <br>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 45a8f7f61ed0641d35a7ecdb3d37556f81e11ecc 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/11] 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 1f5a7c3a5fd3c6b134fc780a470ce4213324e0ea 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/11] 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 848db89b1afd05575d6d637f02dbabbcc8fd968e 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/11] 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 528c0814fb2ec6e77bb091879b4b02b25db2cd46 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/11] 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=|<wLd8;2hzKE<lO##$qE6d(?;%BQs}2#1
zq)^G0Es8EK$u*Z;5;4t~k!c$I&X+wi{sqp=XWs95=6T<9o|(75y3nQ{xQ1FTm~&uZ
zQL$?OzyKyajV^J_s9=nP7(+Zanq#JX&SMy-F|;b}Cg{A-*Df+PRIe~j9JKoLj#9Hh
zU~;TnyJ+Z9R@yU-Ixb8)^7rDFox=3k%b7}Tqm}ZXp5DENA-gfTT2-D_#eo&bKn@D9
zHfvQjEd&3@U*__vJRW247=y<cJjUQL29Gg#m5p)WUuZD#s=f%CNwa7+d6E}-(;S*h
zTAD}m$%lMt0r}BF@}~e=M2l$&1=3PlMnSZkR!}glq*b(<LTC-GrF9fa>uCdRq)o(A
z7;UC-+CmYul_F^yMbUPOrX3VRv9y!oD4r51k#<oMCD#eQA&PN7zIN-xPQBhk%nA|s
z%nX_3p42!omL}yX&Wxo?xneS7saBRACl|(SIZJkN#dVUhtC}&Tl-;NPt$R#ktVF7J
zX&6h8vd;|0be8i+uqJoLhD#slFb}5bC&|R}0>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#d7<I^2LJXoj0`3tFHR+Mpe7!yUK__n-sr
xLnl0dhwum<!xMN4UGNN^!wYx`-S7%t!y9-DJ@5{C;XQnSKKN*MEc)cv_6s3-ye$9#

delta 1210
zcmd7Q>r>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>_+&Cc<n+?JbBh6Kq$l8gnC*H}py+SL<P*}g(Z9Z81Y>Ke)2P+{jF31hQejM~Pr
zFZidyUNhOI%V}V6G~{bFdaXtxE3zgVvZXO5twz;0^3Mz8%No7RhB6z<Y$&s#%!V=>
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)<C<}*&tLfA>>>^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
zb<!hxOkMPZp3*bwrsvc{z4U@!QXjpd*Yt+oQa`<;_w<1V=p%ii&-8`9(jX1dH&dbV
HeW3LZ4)fRP

diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 02f08ec5d0d56169fe8abedae0ee57ffb9d9010b..026e211fdad9f94702ad531eba3f3e0a6a1afccb 100644
GIT binary patch
delta 271
zcmWN=+cMN~007{LrKFJKs*NOaK14)`s1Pe>Ij=+HG@ihWi*KeI_ikP8tr;`TaJ#SZ
ze}$gG@0<BD*SFc3@Z1Agvc=@c_0S`E9?SQ{Qw0hYd8Sy2Qf10jh^zG63kfe(srE{Z
z*J`~{r`}r)8Z~LwqE(xA9Xh?!rQ3TwdVSER-$$Pe_-xRSFNTfy>YMLIjT!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*X<NlKY0Q~1nejp|%oy#mG!?=jm!ilmcM75C?zU-5_Nx_9Y+0h@
zp6kk{6`P`v>nfMzmUm_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$|<?8wme$w4#R%DC9DHKkja0-P}D4as!6pHNC_)j!A6j_&mP>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@<VJr
zuB^D+91S;w#~vU=wwi|z6~d(Es$oK8dGz)K1Pakl>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!V<KPSI&PLuct6Rnd96Ko{u}U8XB!r>j&=*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(cV<Q6K2
zD98PFNKTv(3gs43!g1?In_B(aW;5^Ye9gbmv%U7bzt28<zV9EN-ZG1CFUf{FnI)wt
z&z6BwI!k4@49ZAN&kT!COc44C{b?3<13#QaUcZM*W4Y!ZD221qzgvzF#xQg0zd`QF
z)tb;^g^(@7rPC2mVelS^Q2Q(<#cEO{4IwY`CIk7nOp0%9Pr0gu43a7qRk5n<s<Nxf
zt}45#?5eV>s`%P_2E%|;Rs7O09up9a7{p>CCSfwBU@E3zI%Z%dW+4voNWg5&!CWLF
z3G*-?CM>{0EW%<WV+odG8J1%OR$>)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<i2Oq&-wb#bhDSUMe9g
z?W0oKPY38A9iqcjMn~u<9iwupph`MUHabBksftd~X{x3gIzx6kOXui3U7(9}i7wL>
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(Q<rW%diCk|(||$03>h|J)Nf<PO_(%g+KgFq<}FyXWZ8;U
zYu0Vp^v9NMJ9Zx;*U`Jb(Ma*_eKZp8h5O+_co-gq$KgqM8lHvc;YE1)cptrbd5+)z
H_j>Rjvr=+!

delta 269
zcmWl|*Df7k007|N*tPdot5%EJn^Utzjn=B#rPdqB$+`FvFC>w81()97+<OJ_`;ssI
z@|Y5TFG;c#5vkIo%aAEcwhwaT%9F1^p(4dflqyrMLZvFzYSgMz@1q8dnlx+iNvk&P
zI&}K%i!R-IeATN@zX5}W3>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_fbhC<l5S`tBbx_<X(E+mR#%Z
zT$ETza=tmrJ>yqnatt$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*<SD5J^~sWGu!Kq+lshu?)+x0%=%@RalKRSPKKv
zkx^!hNY-@y{;AO{|D10LlRqYz5_7UuJb7N11BA$Q=e|9K$a3eiy@jxNw9W|#6rzpP
zngfIQ!?<%$un^wv9NO>icvycS4!Xx1LWEfB&QSw}Ft>ict*8nW!pFVAJ!hAAOD~mt
zOg46M`lXn@`O66<h7KNsf}P#-O+KCF`V2#@+`c8fqui}LmuFj$)1;9N2kd<c{S5=0
z%3I4u$r|G@l8M%lnJl!PGAWC)DTi`t18t-{0_D>tveIVSLR+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!7Ge<s5roB9f~8o7U@XT9
zgkU8?u?k@bM+71fh1H108mz@Stj7jyL<}}zGh(p?TM>tCh%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=kGSe<fr8ENVrahESdubo-rvr454$)ycLPzNs9VZK&pbW|+
znNCs`Wz#7-O=l>F&QdO&qddx|^K^kOQUP6}Lb^;vR7_XsDqW-NR6;k%N~KgrH%Xy#
zx<$9Cf-30_-KBd}Mfd3eJ)}oeO^>ODo=`14rDs$}&*=rdq<U(gSM-`1sfpfDGrgr2
QdPnc6l|Co|g>A;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_)%2lXTrCN<zUwl=k
zUV}#8eD_0>W<RxP)uvsCPF=e7=+&p+fI&lsjTkj%+=NL}rp=f&XWoKEzbsj{V%3^;
z8#ZnEZQCC^cAp~G(cAlIr1<I~8VUb~d*OcgFZ>@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@8<p~
z>E^uziIPMl`yfTCkJ6;e@X2SHvSiEg#aFrV<ol*Tq3??PP^`pHrOK46P^n6_8o$)4
zQ?EgzCe2#3YSXSmr{B7C>(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 86a35de57c4fc8d8c79cfd65ce8ce6b700882541 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/11] 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