diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index e2dc853..2d35fba 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/Program.s.txt b/advanced/hmi/nspanel_eu_code/Program.s.txt index 00cf31b..2758b30 100644 --- a/advanced/hmi/nspanel_eu_code/Program.s.txt +++ b/advanced/hmi/nspanel_eu_code/Program.s.txt @@ -9,6 +9,7 @@ Program.s int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0 int brightness=100,brightness_dim=40 int display_mode=1 // 1 = EU, 2 = US, 3 = US landscape + int charset=1 // 1 = International (original), 2 = CJK //bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode randset 0,65535//used for touchevent sensor diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt index fa09988..1eb80f4 100644 --- a/advanced/hmi/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -3,7 +3,7 @@ Page boot ID : 0 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Locked : no Swide up page ID : disabled Swide down page ID : disabled @@ -18,7 +18,8 @@ Page boot covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + covx charset,aux3.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\", \"charset\": \""+aux3.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -70,12 +71,19 @@ Variable (string) aux2 Text : Max. Text Size: 10 +Variable (string) aux3 + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 10 + Text ip_addr Attributes ID : 1 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Initializing... Max. Text Size : 15 @@ -85,7 +93,7 @@ Text t0 ID : 2 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Please wait... Max. Text Size : 15 @@ -95,7 +103,7 @@ Text t1 ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : The process can take several seconds! Max. Text Size : 50 @@ -105,7 +113,7 @@ Text tft_label ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : TFT: Max. Text Size : 4 @@ -115,7 +123,7 @@ Text esph_label ID : 6 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : ESPHome: Max. Text Size : 8 @@ -125,7 +133,7 @@ Text bluep_label ID : 7 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Blueprint: Max. Text Size : 10 @@ -135,7 +143,7 @@ Text tft_version ID : 8 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : 4.2dev Max. Text Size : 9 @@ -145,7 +153,7 @@ Text esph_version ID : 9 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 9 @@ -155,7 +163,7 @@ Text bluep_version ID : 10 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 9 @@ -165,7 +173,7 @@ Text baud_rate ID : 18 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 10 @@ -175,7 +183,7 @@ Text framework ID : 20 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 10 @@ -263,7 +271,8 @@ Timer tm_pageid Events Timer Event covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + covx charset,aux3.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\", \"charset\": \""+aux3.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 4f54b27..db054b4 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/Program.s.txt b/advanced/hmi/nspanel_us_code/Program.s.txt index 517ea65..174651c 100644 --- a/advanced/hmi/nspanel_us_code/Program.s.txt +++ b/advanced/hmi/nspanel_us_code/Program.s.txt @@ -9,6 +9,7 @@ Program.s int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0 int brightness=100,brightness_dim=40 int display_mode=2 // 1 = EU, 2 = US, 3 = US landscape + int charset=1 // 1 = International (original), 2 = CJK //bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode randset 0,65535//used for touchevent sensor diff --git a/advanced/hmi/nspanel_us_code/boot.txt b/advanced/hmi/nspanel_us_code/boot.txt index fa09988..1eb80f4 100644 --- a/advanced/hmi/nspanel_us_code/boot.txt +++ b/advanced/hmi/nspanel_us_code/boot.txt @@ -3,7 +3,7 @@ Page boot ID : 0 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Locked : no Swide up page ID : disabled Swide down page ID : disabled @@ -18,7 +18,8 @@ Page boot covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + covx charset,aux3.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\", \"charset\": \""+aux3.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -70,12 +71,19 @@ Variable (string) aux2 Text : Max. Text Size: 10 +Variable (string) aux3 + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 10 + Text ip_addr Attributes ID : 1 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Initializing... Max. Text Size : 15 @@ -85,7 +93,7 @@ Text t0 ID : 2 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Please wait... Max. Text Size : 15 @@ -95,7 +103,7 @@ Text t1 ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : The process can take several seconds! Max. Text Size : 50 @@ -105,7 +113,7 @@ Text tft_label ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : TFT: Max. Text Size : 4 @@ -115,7 +123,7 @@ Text esph_label ID : 6 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : ESPHome: Max. Text Size : 8 @@ -125,7 +133,7 @@ Text bluep_label ID : 7 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Blueprint: Max. Text Size : 10 @@ -135,7 +143,7 @@ Text tft_version ID : 8 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : 4.2dev Max. Text Size : 9 @@ -145,7 +153,7 @@ Text esph_version ID : 9 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 9 @@ -155,7 +163,7 @@ Text bluep_version ID : 10 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 9 @@ -165,7 +173,7 @@ Text baud_rate ID : 18 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 10 @@ -175,7 +183,7 @@ Text framework ID : 20 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 10 @@ -263,7 +271,8 @@ Timer tm_pageid Events Timer Event covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + covx charset,aux3.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\", \"charset\": \""+aux3.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 273ed73..9464b1a 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/Program.s.txt b/advanced/hmi/nspanel_us_land_code/Program.s.txt index 45de6e8..981d751 100644 --- a/advanced/hmi/nspanel_us_land_code/Program.s.txt +++ b/advanced/hmi/nspanel_us_land_code/Program.s.txt @@ -9,6 +9,7 @@ Program.s int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0 int brightness=100,brightness_dim=40 int display_mode=3 // 1 = EU, 2 = US, 3 = US landscape + int charset=1 // 1 = International (original), 2 = CJK //bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode randset 0,65535//used for touchevent sensor diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt index fa09988..1eb80f4 100644 --- a/advanced/hmi/nspanel_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_us_land_code/boot.txt @@ -3,7 +3,7 @@ Page boot ID : 0 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Locked : no Swide up page ID : disabled Swide down page ID : disabled @@ -18,7 +18,8 @@ Page boot covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + covx charset,aux3.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\", \"charset\": \""+aux3.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -70,12 +71,19 @@ Variable (string) aux2 Text : Max. Text Size: 10 +Variable (string) aux3 + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 10 + Text ip_addr Attributes ID : 1 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Initializing... Max. Text Size : 15 @@ -85,7 +93,7 @@ Text t0 ID : 2 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Please wait... Max. Text Size : 15 @@ -95,7 +103,7 @@ Text t1 ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : The process can take several seconds! Max. Text Size : 50 @@ -105,7 +113,7 @@ Text tft_label ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : TFT: Max. Text Size : 4 @@ -115,7 +123,7 @@ Text esph_label ID : 6 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : ESPHome: Max. Text Size : 8 @@ -125,7 +133,7 @@ Text bluep_label ID : 7 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Blueprint: Max. Text Size : 10 @@ -135,7 +143,7 @@ Text tft_version ID : 8 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : 4.2dev Max. Text Size : 9 @@ -145,7 +153,7 @@ Text esph_version ID : 9 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 9 @@ -155,7 +163,7 @@ Text bluep_version ID : 10 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 9 @@ -165,7 +173,7 @@ Text baud_rate ID : 18 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 10 @@ -175,7 +183,7 @@ Text framework ID : 20 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : Max. Text Size : 10 @@ -263,7 +271,8 @@ Timer tm_pageid Events Timer Event covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + covx charset,aux3.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\", \"charset\": \""+aux3.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 695c374..887c9cc 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 4d84ca8..2ff5263 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 448bb24..8b950f7 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ