diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index b4ce2a5..636dfcd 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -18,7 +18,7 @@ substitutions: temp_units: "°C" invalid_cooldown: "100ms" ##### DON'T CHANGE THIS ###### - version: "4.3dev4" + version: "4.3.0b1" ############################## ##### External components ##### diff --git a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt b/hmi/dev/nspanel_CJK_eu_code/Program.s.txt index e37b9eb..cda6c3a 100644 --- a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt +++ b/hmi/dev/nspanel_CJK_eu_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=1 // 1 = EU, 2 = US, 3 = US landscape, 4 = blank int charset=2 // 1 = International (original), 2 = CJK diff --git a/hmi/dev/nspanel_CJK_eu_code/alarm.txt b/hmi/dev/nspanel_CJK_eu_code/alarm.txt index d4778be..9bb1c6a 100644 --- a/hmi/dev/nspanel_CJK_eu_code/alarm.txt +++ b/hmi/dev/nspanel_CJK_eu_code/alarm.txt @@ -24,8 +24,6 @@ Page alarm vis bt_bypass,0 } vis unavailable,0 - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/boot.txt b/hmi/dev/nspanel_CJK_eu_code/boot.txt index 17a8d9f..97b2c8e 100644 --- a/hmi/dev/nspanel_CJK_eu_code/boot.txt +++ b/hmi/dev/nspanel_CJK_eu_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 Text esph_version diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt index 2026b19..0b5acd8 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt @@ -35,8 +35,6 @@ Page buttonpage01 } vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt index 3d479dc..eed659f 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt @@ -35,8 +35,6 @@ Page buttonpage02 } vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt index ed1c1f0..17f7232 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt @@ -35,8 +35,6 @@ Page buttonpage03 } vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt index 088a871..3268c4d 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt @@ -35,8 +35,6 @@ Page buttonpage04 page_index.txt+="●" vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/climate.txt b/hmi/dev/nspanel_CJK_eu_code/climate.txt index c7530e1..e016bb6 100644 --- a/hmi/dev/nspanel_CJK_eu_code/climate.txt +++ b/hmi/dev/nspanel_CJK_eu_code/climate.txt @@ -33,8 +33,6 @@ Page climate page home } vis unavailable,0 - - Postinitialize Event sendme Page Exit Event diff --git a/hmi/dev/nspanel_CJK_eu_code/confirm.txt b/hmi/dev/nspanel_CJK_eu_code/confirm.txt index 131e50e..38da546 100644 --- a/hmi/dev/nspanel_CJK_eu_code/confirm.txt +++ b/hmi/dev/nspanel_CJK_eu_code/confirm.txt @@ -17,8 +17,6 @@ Page confirm page home } vis unavailable,0 - - Postinitialize Event sendme Variable (int32) page_id diff --git a/hmi/dev/nspanel_CJK_eu_code/cover.txt b/hmi/dev/nspanel_CJK_eu_code/cover.txt index b7afc34..6b74670 100644 --- a/hmi/dev/nspanel_CJK_eu_code/cover.txt +++ b/hmi/dev/nspanel_CJK_eu_code/cover.txt @@ -17,8 +17,6 @@ Page cover page home } vis unavailable,0 - - Postinitialize Event sendme Variable (string) va1 diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt index 977a7b4..e4cf268 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt @@ -30,8 +30,6 @@ Page entitypage01 { page_index.txt+="â—‹" } - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt index 4b25de6..624506d 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt @@ -30,8 +30,6 @@ Page entitypage02 { page_index.txt+="â—‹" } - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt index 38e1097..b2b9ed3 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt @@ -30,8 +30,6 @@ Page entitypage03 { page_index.txt+="â—‹" } - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt index a7c0222..5ae4454 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt @@ -30,8 +30,6 @@ Page entitypage04 page_index.txt+="â—‹" } page_index.txt+="●" - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_eu_code/fan.txt b/hmi/dev/nspanel_CJK_eu_code/fan.txt index 80c36db..95478b5 100644 --- a/hmi/dev/nspanel_CJK_eu_code/fan.txt +++ b/hmi/dev/nspanel_CJK_eu_code/fan.txt @@ -18,8 +18,6 @@ Page fan } vis unavailable,0 vis bt_oscillate,0 - - Postinitialize Event sendme Variable (string) fansetting diff --git a/hmi/dev/nspanel_CJK_eu_code/home.txt b/hmi/dev/nspanel_CJK_eu_code/home.txt index 6bd21a1..fc81eb1 100644 --- a/hmi/dev/nspanel_CJK_eu_code/home.txt +++ b/hmi/dev/nspanel_CJK_eu_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 @@ -250,7 +246,7 @@ Text value01_icon Text : Max. Text Size : 3 -Text value03 +Text value04 Attributes ID : 22 Scope : global @@ -260,7 +256,7 @@ Text value03 Text : Max. Text Size : 10 -Text value03_icon +Text value04_icon Attributes ID : 23 Scope : global @@ -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 value03_icon + Attributes + ID : 46 + Scope : global + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : + Max. Text Size : 3 + +Text value03 + 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 diff --git a/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt b/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt index 07c3562..3c62216 100644 --- a/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt +++ b/hmi/dev/nspanel_CJK_eu_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 diff --git a/hmi/dev/nspanel_CJK_eu_code/light.txt b/hmi/dev/nspanel_CJK_eu_code/light.txt index da41027..734b183 100644 --- a/hmi/dev/nspanel_CJK_eu_code/light.txt +++ b/hmi/dev/nspanel_CJK_eu_code/light.txt @@ -37,8 +37,6 @@ Page light vis color_button,0 } vis unavailable,0 - - Postinitialize Event sendme Variable (int32) rgb565 diff --git a/hmi/dev/nspanel_CJK_eu_code/media_player.txt b/hmi/dev/nspanel_CJK_eu_code/media_player.txt index 7aceec7..dcf2a2f 100644 --- a/hmi/dev/nspanel_CJK_eu_code/media_player.txt +++ b/hmi/dev/nspanel_CJK_eu_code/media_player.txt @@ -17,8 +17,6 @@ Page media_player page home } vis unavailable,0 - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/notification.txt b/hmi/dev/nspanel_CJK_eu_code/notification.txt index b3e282f..ed2fbf2 100644 --- a/hmi/dev/nspanel_CJK_eu_code/notification.txt +++ b/hmi/dev/nspanel_CJK_eu_code/notification.txt @@ -17,8 +17,6 @@ Page notification page home } vis unavailable,0 - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_eu_code/qrcode.txt b/hmi/dev/nspanel_CJK_eu_code/qrcode.txt index e9a780b..6e55366 100644 --- a/hmi/dev/nspanel_CJK_eu_code/qrcode.txt +++ b/hmi/dev/nspanel_CJK_eu_code/qrcode.txt @@ -13,8 +13,6 @@ Page qrcode Events Preinitialize Event vis unavailable,0 - - Postinitialize Event sendme Text qrcode_label diff --git a/hmi/dev/nspanel_CJK_eu_code/screensaver.txt b/hmi/dev/nspanel_CJK_eu_code/screensaver.txt index 4c0ad19..6f8da50 100644 --- a/hmi/dev/nspanel_CJK_eu_code/screensaver.txt +++ b/hmi/dev/nspanel_CJK_eu_code/screensaver.txt @@ -15,8 +15,6 @@ Page screensaver vis text,0 dim=brightness_sleep vis unavailable,0 - - Postinitialize Event sendme Touch Release Event diff --git a/hmi/dev/nspanel_CJK_eu_code/settings.txt b/hmi/dev/nspanel_CJK_eu_code/settings.txt index adaf793..1881ea9 100644 --- a/hmi/dev/nspanel_CJK_eu_code/settings.txt +++ b/hmi/dev/nspanel_CJK_eu_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 diff --git a/hmi/dev/nspanel_CJK_eu_code/utilities.txt b/hmi/dev/nspanel_CJK_eu_code/utilities.txt index af61588..30c6040 100644 --- a/hmi/dev/nspanel_CJK_eu_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_eu_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 diff --git a/hmi/dev/nspanel_CJK_eu_code/weather01.txt b/hmi/dev/nspanel_CJK_eu_code/weather01.txt index 31c8edc..878553e 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/weather01.txt @@ -17,8 +17,6 @@ Page weather01 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_eu_code/weather02.txt b/hmi/dev/nspanel_CJK_eu_code/weather02.txt index d1e703a..9dbf735 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/weather02.txt @@ -17,8 +17,6 @@ Page weather02 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_eu_code/weather03.txt b/hmi/dev/nspanel_CJK_eu_code/weather03.txt index be8be75..d0d38c9 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/weather03.txt @@ -17,8 +17,6 @@ Page weather03 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_eu_code/weather04.txt b/hmi/dev/nspanel_CJK_eu_code/weather04.txt index 9760d9e..208299d 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/weather04.txt @@ -17,8 +17,6 @@ Page weather04 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_eu_code/weather05.txt b/hmi/dev/nspanel_CJK_eu_code/weather05.txt index 04ea0f0..73bd1b8 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather05.txt +++ b/hmi/dev/nspanel_CJK_eu_code/weather05.txt @@ -17,8 +17,6 @@ Page weather05 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_us_code/Program.s.txt b/hmi/dev/nspanel_CJK_us_code/Program.s.txt index d9d2f36..e47d21b 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/alarm.txt b/hmi/dev/nspanel_CJK_us_code/alarm.txt index a358203..a2a65cf 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/boot.txt b/hmi/dev/nspanel_CJK_us_code/boot.txt index 3e63dce..8189e0c 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt index 2026b19..0b5acd8 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt index 3d479dc..eed659f 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt index ed1c1f0..17f7232 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt index 0f5f3e6..6199075 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/climate.txt b/hmi/dev/nspanel_CJK_us_code/climate.txt index 721f7ad..3ba81b3 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/confirm.txt b/hmi/dev/nspanel_CJK_us_code/confirm.txt index 131e50e..38da546 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/cover.txt b/hmi/dev/nspanel_CJK_us_code/cover.txt index d2d624e..a103257 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt index 977a7b4..e4cf268 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt index 4b25de6..624506d 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt index 97fecd2..6112d73 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt index a7c0222..5ae4454 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/fan.txt b/hmi/dev/nspanel_CJK_us_code/fan.txt index 80c36db..95478b5 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/home.txt b/hmi/dev/nspanel_CJK_us_code/home.txt index 6bd21a1..e461e9d 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/keyb_num.txt b/hmi/dev/nspanel_CJK_us_code/keyb_num.txt index aea6a3e..adcc655 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/light.txt b/hmi/dev/nspanel_CJK_us_code/light.txt index ca91503..54e4869 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/media_player.txt b/hmi/dev/nspanel_CJK_us_code/media_player.txt index a0d7d1d..4050fd7 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/notification.txt b/hmi/dev/nspanel_CJK_us_code/notification.txt index 089013e..99d93c7 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/qrcode.txt b/hmi/dev/nspanel_CJK_us_code/qrcode.txt index e9a780b..6e55366 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/screensaver.txt b/hmi/dev/nspanel_CJK_us_code/screensaver.txt index 4c0ad19..6f8da50 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/settings.txt b/hmi/dev/nspanel_CJK_us_code/settings.txt index 501cdd2..7d51a3e 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/utilities.txt b/hmi/dev/nspanel_CJK_us_code/utilities.txt index 0d47821..a664959 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/weather01.txt b/hmi/dev/nspanel_CJK_us_code/weather01.txt index 31c8edc..878553e 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/weather02.txt b/hmi/dev/nspanel_CJK_us_code/weather02.txt index d1e703a..9dbf735 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/weather03.txt b/hmi/dev/nspanel_CJK_us_code/weather03.txt index be8be75..d0d38c9 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/weather04.txt b/hmi/dev/nspanel_CJK_us_code/weather04.txt index 9760d9e..208299d 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_code/weather05.txt b/hmi/dev/nspanel_CJK_us_code/weather05.txt index 04ea0f0..73bd1b8 100644 --- 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 diff --git a/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt b/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt index 468e201..1ea8b81 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt +++ b/hmi/dev/nspanel_CJK_us_land_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=3 // 1 = EU, 2 = US, 3 = US landscape, 4 = blank int charset=2 // 1 = International (original), 2 = CJK diff --git a/hmi/dev/nspanel_CJK_us_land_code/alarm.txt b/hmi/dev/nspanel_CJK_us_land_code/alarm.txt index d4778be..9bb1c6a 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/alarm.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/alarm.txt @@ -24,8 +24,6 @@ Page alarm vis bt_bypass,0 } vis unavailable,0 - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/boot.txt b/hmi/dev/nspanel_CJK_us_land_code/boot.txt index 17a8d9f..97b2c8e 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_land_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 Text esph_version diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt index 2026b19..0b5acd8 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt @@ -35,8 +35,6 @@ Page buttonpage01 } vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt index 3d479dc..eed659f 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt @@ -35,8 +35,6 @@ Page buttonpage02 } vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt index ed1c1f0..17f7232 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt @@ -35,8 +35,6 @@ Page buttonpage03 } vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt index 088a871..3268c4d 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt @@ -35,8 +35,6 @@ Page buttonpage04 page_index.txt+="●" vis page_index,1 } - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/climate.txt b/hmi/dev/nspanel_CJK_us_land_code/climate.txt index c7530e1..e016bb6 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/climate.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/climate.txt @@ -33,8 +33,6 @@ Page climate page home } vis unavailable,0 - - Postinitialize Event sendme Page Exit Event diff --git a/hmi/dev/nspanel_CJK_us_land_code/confirm.txt b/hmi/dev/nspanel_CJK_us_land_code/confirm.txt index 131e50e..38da546 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/confirm.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/confirm.txt @@ -17,8 +17,6 @@ Page confirm page home } vis unavailable,0 - - Postinitialize Event sendme Variable (int32) page_id diff --git a/hmi/dev/nspanel_CJK_us_land_code/cover.txt b/hmi/dev/nspanel_CJK_us_land_code/cover.txt index b7afc34..6b74670 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/cover.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/cover.txt @@ -17,8 +17,6 @@ Page cover page home } vis unavailable,0 - - Postinitialize Event sendme Variable (string) va1 diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt index 977a7b4..e4cf268 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt @@ -30,8 +30,6 @@ Page entitypage01 { page_index.txt+="â—‹" } - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt index 4b25de6..624506d 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt @@ -30,8 +30,6 @@ Page entitypage02 { page_index.txt+="â—‹" } - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt index 38e1097..b2b9ed3 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt @@ -30,8 +30,6 @@ Page entitypage03 { page_index.txt+="â—‹" } - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt index a7c0222..5ae4454 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt @@ -30,8 +30,6 @@ Page entitypage04 page_index.txt+="â—‹" } page_index.txt+="●" - - Postinitialize Event sendme Text value01_label diff --git a/hmi/dev/nspanel_CJK_us_land_code/fan.txt b/hmi/dev/nspanel_CJK_us_land_code/fan.txt index 80c36db..95478b5 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/fan.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/fan.txt @@ -18,8 +18,6 @@ Page fan } vis unavailable,0 vis bt_oscillate,0 - - Postinitialize Event sendme Variable (string) fansetting diff --git a/hmi/dev/nspanel_CJK_us_land_code/home.txt b/hmi/dev/nspanel_CJK_us_land_code/home.txt index 6bd21a1..fc81eb1 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_land_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 @@ -250,7 +246,7 @@ Text value01_icon Text : Max. Text Size : 3 -Text value03 +Text value04 Attributes ID : 22 Scope : global @@ -260,7 +256,7 @@ Text value03 Text : Max. Text Size : 10 -Text value03_icon +Text value04_icon Attributes ID : 23 Scope : global @@ -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 value03_icon + Attributes + ID : 46 + Scope : global + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : + Max. Text Size : 3 + +Text value03 + 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 diff --git a/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt b/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt index 07c3562..3c62216 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt +++ b/hmi/dev/nspanel_CJK_us_land_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 diff --git a/hmi/dev/nspanel_CJK_us_land_code/light.txt b/hmi/dev/nspanel_CJK_us_land_code/light.txt index da41027..734b183 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/light.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/light.txt @@ -37,8 +37,6 @@ Page light vis color_button,0 } vis unavailable,0 - - Postinitialize Event sendme Variable (int32) rgb565 diff --git a/hmi/dev/nspanel_CJK_us_land_code/media_player.txt b/hmi/dev/nspanel_CJK_us_land_code/media_player.txt index 7aceec7..dcf2a2f 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/media_player.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/media_player.txt @@ -17,8 +17,6 @@ Page media_player page home } vis unavailable,0 - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/notification.txt b/hmi/dev/nspanel_CJK_us_land_code/notification.txt index b3e282f..ed2fbf2 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/notification.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/notification.txt @@ -17,8 +17,6 @@ Page notification page home } vis unavailable,0 - - Postinitialize Event sendme Variable (string) lastclick diff --git a/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt b/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt index e9a780b..6e55366 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt @@ -13,8 +13,6 @@ Page qrcode Events Preinitialize Event vis unavailable,0 - - Postinitialize Event sendme Text qrcode_label diff --git a/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt b/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt index 4c0ad19..6f8da50 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt @@ -15,8 +15,6 @@ Page screensaver vis text,0 dim=brightness_sleep vis unavailable,0 - - Postinitialize Event sendme Touch Release Event diff --git a/hmi/dev/nspanel_CJK_us_land_code/settings.txt b/hmi/dev/nspanel_CJK_us_land_code/settings.txt index adaf793..1881ea9 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/settings.txt +++ b/hmi/dev/nspanel_CJK_us_land_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 diff --git a/hmi/dev/nspanel_CJK_us_land_code/utilities.txt b/hmi/dev/nspanel_CJK_us_land_code/utilities.txt index af61588..30c6040 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_us_land_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 diff --git a/hmi/dev/nspanel_CJK_us_land_code/weather01.txt b/hmi/dev/nspanel_CJK_us_land_code/weather01.txt index 31c8edc..878553e 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/weather01.txt @@ -17,8 +17,6 @@ Page weather01 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_us_land_code/weather02.txt b/hmi/dev/nspanel_CJK_us_land_code/weather02.txt index d1e703a..9dbf735 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/weather02.txt @@ -17,8 +17,6 @@ Page weather02 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_us_land_code/weather03.txt b/hmi/dev/nspanel_CJK_us_land_code/weather03.txt index be8be75..d0d38c9 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/weather03.txt @@ -17,8 +17,6 @@ Page weather03 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_us_land_code/weather04.txt b/hmi/dev/nspanel_CJK_us_land_code/weather04.txt index 9760d9e..208299d 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/weather04.txt @@ -17,8 +17,6 @@ Page weather04 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_CJK_us_land_code/weather05.txt b/hmi/dev/nspanel_CJK_us_land_code/weather05.txt index 04ea0f0..73bd1b8 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather05.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/weather05.txt @@ -17,8 +17,6 @@ Page weather05 page home } vis unavailable,0 - - Postinitialize Event sendme Text day diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt index 6d97bca..97b2c8e 100644 --- a/hmi/dev/nspanel_eu_code/boot.txt +++ b/hmi/dev/nspanel_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.3dev4 + Text : 4.3.0b1 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt index daa69a3..8189e0c 100644 --- a/hmi/dev/nspanel_us_code/boot.txt +++ b/hmi/dev/nspanel_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.3dev4 + Text : 4.3.0b1 Max. Text Size : 9 Events diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt index 6d97bca..97b2c8e 100644 --- a/hmi/dev/nspanel_us_land_code/boot.txt +++ b/hmi/dev/nspanel_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.3dev4 + Text : 4.3.0b1 Max. Text Size : 9 Text esph_version diff --git a/hmi/nspanel_CJK_eu.HMI b/hmi/nspanel_CJK_eu.HMI index b497f08..1930c59 100644 Binary files a/hmi/nspanel_CJK_eu.HMI and b/hmi/nspanel_CJK_eu.HMI differ diff --git a/hmi/nspanel_CJK_eu.tft b/hmi/nspanel_CJK_eu.tft index 7836262..886f292 100644 Binary files a/hmi/nspanel_CJK_eu.tft and b/hmi/nspanel_CJK_eu.tft differ diff --git a/hmi/nspanel_CJK_us.HMI b/hmi/nspanel_CJK_us.HMI index aa2756f..0fccbf5 100644 Binary files a/hmi/nspanel_CJK_us.HMI and b/hmi/nspanel_CJK_us.HMI differ diff --git a/hmi/nspanel_CJK_us.tft b/hmi/nspanel_CJK_us.tft index 22079ae..d77fef4 100644 Binary files a/hmi/nspanel_CJK_us.tft and b/hmi/nspanel_CJK_us.tft differ diff --git a/hmi/nspanel_CJK_us_land.HMI b/hmi/nspanel_CJK_us_land.HMI index af170f8..d3ade07 100644 Binary files a/hmi/nspanel_CJK_us_land.HMI and b/hmi/nspanel_CJK_us_land.HMI differ diff --git a/hmi/nspanel_CJK_us_land.tft b/hmi/nspanel_CJK_us_land.tft index bdbb2d4..8e0b039 100644 Binary files a/hmi/nspanel_CJK_us_land.tft and b/hmi/nspanel_CJK_us_land.tft differ diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 8a3fe7e..886ddb4 100644 Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft index ccda69c..b1f36e8 100644 Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI index 5824db4..669baac 100644 Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft index 2a7eb95..03525e0 100644 Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index 540ae9f..ccdd929 100644 Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index 4109562..212cde1 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 30a0eab..d233d5e 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -10,7 +10,7 @@ blueprint: description: > # NSPanel Configuration via Blueprint: Complete UI-Based Setup - **Version**: v4.3dev4 + **Version**: v4.3.0b1 This project enables comprehensive configuration of your NSPanel through a Blueprint featuring a user interface. @@ -3263,7 +3263,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.3dev4' + blueprint_version: '4.3.0b1' date_format_temp: !input 'date_format' # Avoid breaking change for existing users with legacy type format date_format: '{{ date_format_temp if date_format_temp not in ["%d.%m", "%d/%m", "%-d/%-m", "%-m/%-d"] else "%A, " ~ date_format_temp }}'