Merge branch 'dev' of https://github.com/andythomas/NSPanel_HA_Blueprint into dev

2024-01-17 20:08:48 +01:00
parent 9c3b301aa0 8849afbbb0
commit d7363e950b
24 changed files with 17 additions and 15 deletions
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
@@ -17,7 +17,7 @@ substitutions:
  name: ${device_name}
  wifi_timeout: '15'
  ##### DON'T CHANGE THIS ######
-  version: "4.2.2"
+  version: "4.2.3"
  ##############################

 ##### External components #####
--- a/advanced/hmi/nspanel_CJK_eu.HMI
+++ b/advanced/hmi/nspanel_CJK_eu.HMI
--- a/advanced/hmi/nspanel_CJK_eu.tft
+++ b/advanced/hmi/nspanel_CJK_eu.tft
--- a/advanced/hmi/nspanel_CJK_eu_code/boot.txt
+++ b/advanced/hmi/nspanel_CJK_eu_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.2.3dev
+        Text               : 4.2.3
        Max. Text Size     : 9
    
 Text esph_version
--- a/advanced/hmi/nspanel_CJK_us.HMI
+++ b/advanced/hmi/nspanel_CJK_us.HMI
--- a/advanced/hmi/nspanel_CJK_us.tft
+++ b/advanced/hmi/nspanel_CJK_us.tft
--- a/advanced/hmi/nspanel_CJK_us_code/boot.txt
+++ b/advanced/hmi/nspanel_CJK_us_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.2.3dev
+        Text               : 4.2.3
        Max. Text Size     : 9
    
    Events
--- a/advanced/hmi/nspanel_CJK_us_land.HMI
+++ b/advanced/hmi/nspanel_CJK_us_land.HMI
--- a/advanced/hmi/nspanel_CJK_us_land.tft
+++ b/advanced/hmi/nspanel_CJK_us_land.tft
--- a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt
+++ b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.2.3dev
+        Text               : 4.2.3
        Max. Text Size     : 9
    
 Text esph_version
--- a/advanced/hmi/nspanel_eu.HMI
+++ b/advanced/hmi/nspanel_eu.HMI
--- a/advanced/hmi/nspanel_eu_code/boot.txt
+++ b/advanced/hmi/nspanel_eu_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.2.3dev
+        Text               : 4.2.3
        Max. Text Size     : 9
    
 Text esph_version
--- a/advanced/hmi/nspanel_us.HMI
+++ b/advanced/hmi/nspanel_us.HMI
--- a/advanced/hmi/nspanel_us_code/boot.txt
+++ b/advanced/hmi/nspanel_us_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.2.3dev
+        Text               : 4.2.3
        Max. Text Size     : 9
    
    Events
--- a/advanced/hmi/nspanel_us_land.HMI
+++ b/advanced/hmi/nspanel_us_land.HMI
--- a/advanced/hmi/nspanel_us_land_code/boot.txt
+++ b/advanced/hmi/nspanel_us_land_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.2.3dev
+        Text               : 4.2.3
        Max. Text Size     : 9
    
 Text esph_version