From db9ecff3b7b64a46df44fd72cb3aa9558af81850 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 4 Apr 2022 19:12:55 +0000 Subject: [PATCH] Add support for Unicode over serial (#122) (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++--- HMI/US/portrait/diff-eu-version.txt | 44 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 118c179c..2c10828e 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 19:04:00.029180759 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 19:12:54.651948984 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 19:04:00.029180759 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 19:12:54.651948984 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 82dc62b5..1b50c380 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-04 19:12:54.171945204 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-04 19:12:54.171945204 +0000 @@ -113,7 +113,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -34,8 +34,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-04 19:03:59.257172004 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-04 19:12:53.679941329 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-04 19:12:54.175945235 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -848,8 +848,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-04 19:12:54.171945204 +0000 @@ -574,7 +574,7 @@ if(tInstruction.txt=="entityUpd") { @@ -1032,8 +1032,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt } } diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-04 19:12:54.171945204 +0000 @@ -540,7 +540,9 @@ //entity name spstr strCommand.txt,entn.txt,"~",3 @@ -1057,8 +1057,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt spstr strCommand.txt,tSpeaker.txt,"~",9 if(tSpeaker.txt!="") diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-04 19:03:59.257172004 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-04 19:12:53.679941329 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-04 19:12:54.171945204 +0000 @@ -646,7 +646,7 @@ if(tInstruction.txt=="entityUpd") { @@ -1302,8 +1302,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt vis bt8,1 } diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-04 19:12:54.171945204 +0000 @@ -22,6 +22,16 @@ Text : Max. Text Size: 35 @@ -1323,8 +1323,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Scope : global Only in HMI/US/portrait/n2t-out: pageSerialTest.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-04 19:12:54.171945204 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1353,8 +1353,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/pageTest.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-04 19:12:54.171945204 +0000 @@ -35,6 +35,20 @@ Touch Press Event page cardEntities @@ -1395,8 +1395,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt - bauds=115200 - diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-04 19:12:54.171945204 +0000 @@ -442,7 +442,9 @@ if(tInstruction.txt=="entityUpdateDetail") { @@ -1409,8 +1409,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // change icon color spstr strCommand.txt,tTmp.txt,"~",2 diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-04 19:03:59.253171959 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-04 19:03:59.649176449 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-04 19:12:53.675941297 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-04 19:12:54.171945204 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0