From 823a1d85fde8f35af94820b7bc50659d8c22c5d3 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 19 Apr 2022 18:31:23 +0000 Subject: [PATCH] fix us-l sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 22 +++++++++ HMI/US/landscape/n2t-out-visual/Program.s.txt | 2 - .../n2t-out-visual/nspanel_US_L_Stats.txt | 16 +++---- .../landscape/n2t-out-visual/pageStartup.txt | 4 +- HMI/US/landscape/n2t-out/Program.s.txt | 2 - HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 44 +++++++++--------- HMI/US/portrait/diff-filtered.txt | 46 +++++++++---------- 8 files changed, 78 insertions(+), 60 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e69de29b..acf7f128 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -0,0 +1,22 @@ +diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt +--- HMI/n2t-out/Program.s.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-19 18:31:22.876138812 +0000 +@@ -11,6 +11,4 @@ + // dim value + int dimValue=40 + int dimValueNormal=100 +- // fix touch offset +- 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-19 18:31:22.068125874 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-19 18:31:22.876138812 +0000 +@@ -177,7 +177,7 @@ + recmod=1 + bauds=115200 + // startup event +- tSend.txt="event,startup,"+tVersion.txt+",eu" ++ tSend.txt="event,startup,"+tVersion.txt+",us-l" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/Program.s.txt b/HMI/US/landscape/n2t-out-visual/Program.s.txt index d9463ac7..f321685e 100644 --- a/HMI/US/landscape/n2t-out-visual/Program.s.txt +++ b/HMI/US/landscape/n2t-out-visual/Program.s.txt @@ -11,6 +11,4 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index aee99897..27ad01ed 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -1,7 +1,7 @@ Program.s 0 Component(s) - 11 Line(s) of event code - 11 Unique line(s) of event code + 10 Line(s) of event code + 10 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -34,14 +34,14 @@ cardThermo 41 Component(s) 442 Line(s) of event code 247 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 214 Unique line(s) of event code screensaver 35 Component(s) 292 Line(s) of event code @@ -54,5 +54,5 @@ cardEntities Total 12 Page(s) 343 Component(s) - 3687 Line(s) of event code - 1018 Unique line(s) of event code + 3686 Line(s) of event code + 1017 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 282eaf31..e4cb4d18 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -356,7 +356,7 @@ Text tMsg3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 40 y coordinate : 278 Width : 408 Height : 25 @@ -462,7 +462,7 @@ Button bSendStartup recmod=1 bauds=115200 // startup event - tSend.txt="event,startup,"+tVersion.txt+",eu" + tSend.txt="event,startup,"+tVersion.txt+",us-l" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/Program.s.txt b/HMI/US/landscape/n2t-out/Program.s.txt index d9463ac7..f321685e 100644 --- a/HMI/US/landscape/n2t-out/Program.s.txt +++ b/HMI/US/landscape/n2t-out/Program.s.txt @@ -11,6 +11,4 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index b8a4c0bb..7967ce9a 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -177,7 +177,7 @@ Button bSendStartup recmod=1 bauds=115200 // startup event - tSend.txt="event,startup,"+tVersion.txt+",eu" + tSend.txt="event,startup,"+tVersion.txt+",us-l" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3699f659..fd4dee4f 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-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:31:22.456132087 +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-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.456132087 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Variable (string) tSend Attributes diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:11:27.443306476 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:31:22.456132087 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -462,8 +462,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-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:31:22.456132087 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -511,8 +511,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:31:22.456132087 +0000 @@ -30,7 +30,7 @@ Attributes Scope : local @@ -523,8 +523,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt Variable (string) vaSpeakerList Attributes diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:31:22.456132087 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -535,8 +535,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Variable (string) va0 Attributes diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:31:22.456132087 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -556,8 +556,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:31:22.456132087 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -577,8 +577,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:31:22.456132087 +0000 @@ -59,8 +59,8 @@ Variable (string) entn Attributes @@ -591,8 +591,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Variable (int32) mode Attributes diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:31:22.456132087 +0000 @@ -46,8 +46,8 @@ Variable (string) entn Attributes @@ -605,8 +605,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt Text tEntity Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-19 18:11:27.067298484 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:11:27.439306391 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-19 18:31:22.068125874 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:31:22.456132087 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 81a2a5f4..76019b07 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-19 18:11:27.467306986 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:11:27.439306391 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-19 18:31:22.492132663 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:31:22.456132087 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -13,8 +13,8 @@ + + Variable (string) tSend + Attributes -+--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:11:27.443306476 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -54,8 +54,8 @@ + 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-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -103,8 +103,8 @@ + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -30,7 +30,7 @@ + Attributes + Scope : local @@ -115,8 +115,8 @@ + Variable (string) vaSpeakerList + Attributes +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -127,8 +127,8 @@ + Variable (string) va0 + Attributes +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -147,11 +147,11 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:31:22.456132087 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -59,8 +59,8 @@ + Variable (string) entn + Attributes @@ -164,8 +164,8 @@ + Variable (int32) mode + Attributes +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes @@ -178,8 +178,8 @@ + Text tEntity + Attributes +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-19 18:11:27.067298484 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:11:27.439306391 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-19 18:31:22.068125874 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:31:22.456132087 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0