From 16fc7cb7a672d02e07634d1dc148f5bd4a5e96f7 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 28 May 2022 05:17:02 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 20 ++++++++++---------- HMI/US/portrait/diff-eu-version.txt | 24 ++++++++++++------------ HMI/US/portrait/diff-filtered.txt | 26 +++++++++++++------------- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out-visual/screensaver.txt | 18 +++++++++--------- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index fd3da4a6..3176e100 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-05-28 05:04:50.360986275 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:04:51.228984325 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:17:01.093876698 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:04:51.232984331 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:17:01.093876698 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:04:51.228984325 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:17:01.093876698 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -33,8 +33,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:04:51.228984325 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:17:01.093876698 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:04:51.232984331 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:17:01.093876698 +0000 @@ -62,12 +62,6 @@ Text : Max. Text Size: 50 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 21ad70d6..fbeddc90 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-05-28 05:04:50.360986275 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:17:00.497876336 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:16:59.961876009 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:17:00.501876338 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:17:00.501876338 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:17:00.501876338 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +501,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-05-28 05:04:50.364986253 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:17:00.501876338 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -514,8 +514,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:17:00.501876338 +0000 @@ -471,22 +471,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 60af0e80..7be411a2 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,15 +1,15 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:04:50.800983931 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:17:00.521876350 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:17:00.497876336 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:16:59.961876009 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:17:00.501876338 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:17:00.501876338 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:17:00.501876338 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:17:00.501876338 +0000 +@@ -209,9 +209,6 @@ + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 @@ -20,6 +20,6 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:17:00.501876338 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index bf2c289b..197f58df 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code -screensaver - 37 Component(s) - 305 Line(s) of event code - 244 Unique line(s) of event code cardQR 30 Component(s) 363 Line(s) of event code @@ -38,6 +34,10 @@ popupShutter 20 Component(s) 244 Line(s) of event code 138 Unique line(s) of event code +screensaver + 37 Component(s) + 305 Line(s) of event code + 244 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index e6cb1130..c0e16c71 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -90,10 +90,10 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 4 - Width : 451 - Height : 150 + x coordinate : 37 + y coordinate : 0 + Width : 376 + Height : 154 Effect : load Effect Priority : 0 Effect Time : 300 @@ -120,9 +120,9 @@ Text tDate Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 38 + x coordinate : 0 y coordinate : 154 - Width : 375 + Width : 450 Height : 38 Effect : load Effect Priority : 0 @@ -421,7 +421,7 @@ Text tAMPM Send Component ID : disabled Opacity : 127 x coordinate : 343 - y coordinate : 52 + y coordinate : 49 Width : 104 Height : 57 Effect : load @@ -811,7 +811,7 @@ Text tIcon1 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 154 + y coordinate : 0 Width : 38 Height : 38 Effect : load @@ -841,7 +841,7 @@ Text tIcon2 Send Component ID : disabled Opacity : 127 x coordinate : 413 - y coordinate : 154 + y coordinate : 0 Width : 38 Height : 38 Effect : load