bump to v4.3.0b1

2024-03-10 20:06:14 +01:00
parent 19ecf80f45
commit 0b6d8e0fd1
104 changed files with 88 additions and 193 deletions
--- a/hmi/dev/nspanel_CJK_us_code/Program.s.txt
+++ b/hmi/dev/nspanel_CJK_us_code/Program.s.txt
@@ -9,7 +9,7 @@ Program.s
    int back_page_id=0
    int dimdelta=0
    int api=0 // 0 = disconnected from HA, 1 = connected to HA
-    int is_qrcode=0,is_notification=0,is_utilities=0
+    int is_utilities=0
    int brightness=100,brightness_dim=40,brightness_sleep=0
    int display_mode=2 // 1 = EU, 2 = US, 3 = US landscape, 4 = blank
    int charset=2 // 1 = International (original), 2 = CJK
--- a/hmi/dev/nspanel_CJK_us_code/alarm.txt
+++ b/hmi/dev/nspanel_CJK_us_code/alarm.txt
@@ -24,8 +24,6 @@ Page alarm
                vis bt_bypass,0
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/boot.txt
+++ b/hmi/dev/nspanel_CJK_us_code/boot.txt
@@ -16,8 +16,6 @@ Page boot
            covx baud,baud_rate.txt,0,0
            baud_rate.txt+=" bps"
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
        Page Exit Event
@@ -103,7 +101,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3dev3
+        Text               : 4.3.0b1
        Max. Text Size     : 9
    
    Events
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt
@@ -35,8 +35,6 @@ Page buttonpage01
                }
                vis page_index,1
            }
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt
@@ -35,8 +35,6 @@ Page buttonpage02
                }
                vis page_index,1
            }
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt
@@ -35,8 +35,6 @@ Page buttonpage03
                }
                vis page_index,1
            }
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt
@@ -22,8 +22,6 @@ Page buttonpage04
                vis page_index,1
                vis page_label,1
            }
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/climate.txt
+++ b/hmi/dev/nspanel_CJK_us_code/climate.txt
@@ -33,8 +33,6 @@ Page climate
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
        Page Exit Event
--- a/hmi/dev/nspanel_CJK_us_code/confirm.txt
+++ b/hmi/dev/nspanel_CJK_us_code/confirm.txt
@@ -17,8 +17,6 @@ Page confirm
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (int32) page_id
--- a/hmi/dev/nspanel_CJK_us_code/cover.txt
+++ b/hmi/dev/nspanel_CJK_us_code/cover.txt
@@ -17,8 +17,6 @@ Page cover
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (string) va1
--- a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt
@@ -30,8 +30,6 @@ Page entitypage01
            {
                page_index.txt+="â—‹"
            }
-        
-        Postinitialize Event
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt
@@ -30,8 +30,6 @@ Page entitypage02
            {
                page_index.txt+="â—‹"
            }
-        
-        Postinitialize Event
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt
@@ -30,8 +30,6 @@ Page entitypage03
            {
                page_index.txt+="â—‹"
            }
-        
-        Postinitialize Event
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt
+++ b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt
@@ -30,8 +30,6 @@ Page entitypage04
                page_index.txt+="â—‹"
            }
            page_index.txt+="â—"
-        
-        Postinitialize Event
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_CJK_us_code/fan.txt
+++ b/hmi/dev/nspanel_CJK_us_code/fan.txt
@@ -18,8 +18,6 @@ Page fan
            }
            vis unavailable,0
            vis bt_oscillate,0
-        
-        Postinitialize Event
            sendme
        
 Variable (string) fansetting
--- a/hmi/dev/nspanel_CJK_us_code/home.txt
+++ b/hmi/dev/nspanel_CJK_us_code/home.txt
@@ -20,8 +20,6 @@ Page home
            {
                vis bt_entities,0
            }
-            vis bt_notific,is_notification
-            vis bt_qrcode,is_qrcode
            vis bt_utilities,is_utilities
            if(display_mode==3)
            {
@@ -29,8 +27,6 @@ Page home
                vis right_bt_text,0
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
@@ -355,7 +351,10 @@ Text bt_qrcode
    
    Events
        Touch Release Event
-            page qrcode
+            if(bt_qrcode.txt!="")
+            {
+                page qrcode
+            }
        
 Text bt_entities
    Attributes
@@ -629,6 +628,26 @@ Text bt_utilities
                page utilities
            }
        
+Text value04_icon
+    Attributes
+        ID                 : 46
+        Scope              : global
+        Dragging           : 0
+        Send Component ID  : on press and release
+        Associated Keyboard: none
+        Text               : 
+        Max. Text Size     : 3
+    
+Text value04
+    Attributes
+        ID                 : 47
+        Scope              : global
+        Dragging           : 0
+        Send Component ID  : on press and release
+        Associated Keyboard: none
+        Text               : 
+        Max. Text Size     : 10
+    
 Picture weather
    Attributes
        ID               : 7
--- a/hmi/dev/nspanel_CJK_us_code/keyb_num.txt
+++ b/hmi/dev/nspanel_CJK_us_code/keyb_num.txt
@@ -17,8 +17,6 @@ Page keyb_num
                page page_id.val
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (int32) page_id
--- a/hmi/dev/nspanel_CJK_us_code/light.txt
+++ b/hmi/dev/nspanel_CJK_us_code/light.txt
@@ -37,8 +37,6 @@ Page light
                vis color_button,0
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (int32) rgb565
--- a/hmi/dev/nspanel_CJK_us_code/media_player.txt
+++ b/hmi/dev/nspanel_CJK_us_code/media_player.txt
@@ -17,8 +17,6 @@ Page media_player
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/notification.txt
+++ b/hmi/dev/nspanel_CJK_us_code/notification.txt
@@ -17,8 +17,6 @@ Page notification
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_CJK_us_code/qrcode.txt
+++ b/hmi/dev/nspanel_CJK_us_code/qrcode.txt
@@ -13,8 +13,6 @@ Page qrcode
    Events
        Preinitialize Event
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text qrcode_label
--- a/hmi/dev/nspanel_CJK_us_code/screensaver.txt
+++ b/hmi/dev/nspanel_CJK_us_code/screensaver.txt
@@ -15,8 +15,6 @@ Page screensaver
            vis text,0
            dim=brightness_sleep
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
        Touch Release Event
--- a/hmi/dev/nspanel_CJK_us_code/settings.txt
+++ b/hmi/dev/nspanel_CJK_us_code/settings.txt
@@ -19,8 +19,6 @@ Page settings
            vis lbl_sleep,0
            vis bt_sleep,0
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text bright_text
--- a/hmi/dev/nspanel_CJK_us_code/utilities.txt
+++ b/hmi/dev/nspanel_CJK_us_code/utilities.txt
@@ -20,8 +20,6 @@ Page utilities
            vis title_icon,1
            vis title,1
            vis button_back,1
-        
-        Postinitialize Event
            sendme
        
 Variable (int32) line_main_d
--- a/hmi/dev/nspanel_CJK_us_code/weather01.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather01.txt
@@ -17,8 +17,6 @@ Page weather01
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text day
--- a/hmi/dev/nspanel_CJK_us_code/weather02.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather02.txt
@@ -17,8 +17,6 @@ Page weather02
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text day
--- a/hmi/dev/nspanel_CJK_us_code/weather03.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather03.txt
@@ -17,8 +17,6 @@ Page weather03
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text day
--- a/hmi/dev/nspanel_CJK_us_code/weather04.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather04.txt
@@ -17,8 +17,6 @@ Page weather04
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text day
--- a/hmi/dev/nspanel_CJK_us_code/weather05.txt
+++ b/hmi/dev/nspanel_CJK_us_code/weather05.txt
@@ -17,8 +17,6 @@ Page weather05
                page home
            }
            vis unavailable,0
-        
-        Postinitialize Event
            sendme
        
 Text day