Bump to v4.3.0b2

2024-03-10 23:20:26 +01:00
parent 8b45ec7a85
commit f2f137789d
15 changed files with 18 additions and 6 deletions
--- a/hmi/dev/nspanel_CJK_eu_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/boot.txt
@@ -101,7 +101,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0b1
+        Text               : 4.3.0b2
        Max. Text Size     : 9
    
 Text esph_version
--- a/hmi/dev/nspanel_CJK_eu_code/home.txt
+++ b/hmi/dev/nspanel_CJK_eu_code/home.txt
@@ -13,6 +13,10 @@ Page home
    Events
        Preinitialize Event
            back_page_id=0
+            if(qrcode.qrcode_value.txt=="")
+            {
+                vis bt_qrcode,0
+            }
            if(is_entitypage01>0||is_entitypage02>0||is_entitypage03>0||is_entitypage04>0)
            {
                vis bt_entities,1
@@ -351,7 +355,7 @@ Text bt_qrcode
    
    Events
        Touch Release Event
-            if(bt_qrcode.txt!="")
+            if(qrcode.qrcode_value.txt!="")
            {
                page qrcode
            }
--- a/hmi/dev/nspanel_CJK_us_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_us_code/boot.txt
@@ -101,7 +101,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0b1
+        Text               : 4.3.0b2
        Max. Text Size     : 9
    
    Events
--- a/hmi/dev/nspanel_CJK_us_code/home.txt
+++ b/hmi/dev/nspanel_CJK_us_code/home.txt
@@ -13,6 +13,10 @@ Page home
    Events
        Preinitialize Event
            back_page_id=0
+            if(qrcode.qrcode_value.txt=="")
+            {
+                vis bt_qrcode,0
+            }
            if(is_entitypage01>0||is_entitypage02>0||is_entitypage03>0||is_entitypage04>0)
            {
                vis bt_entities,1
@@ -351,7 +355,7 @@ Text bt_qrcode
    
    Events
        Touch Release Event
-            if(bt_qrcode.txt!="")
+            if(qrcode.qrcode_value.txt!="")
            {
                page qrcode
            }
--- a/hmi/dev/nspanel_CJK_us_land_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/boot.txt
@@ -101,7 +101,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0b1
+        Text               : 4.3.0b2
        Max. Text Size     : 9
    
 Text esph_version
--- a/hmi/dev/nspanel_CJK_us_land_code/home.txt
+++ b/hmi/dev/nspanel_CJK_us_land_code/home.txt
@@ -13,6 +13,10 @@ Page home
    Events
        Preinitialize Event
            back_page_id=0
+            if(qrcode.qrcode_value.txt=="")
+            {
+                vis bt_qrcode,0
+            }
            if(is_entitypage01>0||is_entitypage02>0||is_entitypage03>0||is_entitypage04>0)
            {
                vis bt_entities,1
@@ -351,7 +355,7 @@ Text bt_qrcode
    
    Events
        Touch Release Event
-            if(bt_qrcode.txt!="")
+            if(qrcode.qrcode_value.txt!="")
            {
                page qrcode
            }
--- a/hmi/nspanel_CJK_eu.HMI
+++ b/hmi/nspanel_CJK_eu.HMI
--- a/hmi/nspanel_CJK_eu.tft
+++ b/hmi/nspanel_CJK_eu.tft
--- a/hmi/nspanel_CJK_us.HMI
+++ b/hmi/nspanel_CJK_us.HMI
--- a/hmi/nspanel_CJK_us.tft
+++ b/hmi/nspanel_CJK_us.tft
--- a/hmi/nspanel_CJK_us_land.HMI
+++ b/hmi/nspanel_CJK_us_land.HMI
--- a/hmi/nspanel_CJK_us_land.tft
+++ b/hmi/nspanel_CJK_us_land.tft
--- a/hmi/nspanel_eu.HMI
+++ b/hmi/nspanel_eu.HMI
--- a/hmi/nspanel_us.HMI
+++ b/hmi/nspanel_us.HMI
--- a/hmi/nspanel_us_land.HMI
+++ b/hmi/nspanel_us_land.HMI