From e1900e2da4fe5c8da8473008f7dd076b1288a5f1 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 23 Jul 2022 09:22:28 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 48 +++++++++---------- HMI/US/portrait/diff-eu-version.txt | 45 ++++------------- HMI/US/portrait/diff-filtered.txt | 46 ++++-------------- HMI/US/portrait/n2t-out-visual/cardQR.txt | 19 ++++++++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 12 ++--- HMI/US/portrait/n2t-out/cardQR.txt | 19 ++++++++ 6 files changed, 85 insertions(+), 104 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6542dfb5..28af713f 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-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:22:24.763458526 +0000 @@ -11,9 +11,4 @@ // dim value int dimValue=40 @@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:22:24.767458577 +0000 @@ -37,25 +37,6 @@ vis tCode,0 vis bPrev,0 @@ -60,8 +60,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:22:23.839446557 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:22:24.767458577 +0000 @@ -65,26 +65,6 @@ vis nNum4,0 vis bPrev,0 @@ -153,8 +153,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:22:24.767458577 +0000 @@ -36,15 +36,6 @@ vis tEntity6,0 vis bPrev,0 @@ -202,8 +202,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:22:24.763458526 +0000 @@ -21,21 +21,6 @@ vis t5,0 vis bPrev,0 @@ -246,8 +246,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:22:24.767458577 +0000 @@ -32,25 +32,6 @@ vis bText2,0 tsw m0,0 @@ -294,8 +294,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:22:24.767458577 +0000 @@ -41,21 +41,6 @@ vis xTempDest1,0 vis bPrev,0 @@ -338,8 +338,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:22:24.767458577 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -370,8 +370,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt { Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/popupLight.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:22:24.767458577 +0000 @@ -50,29 +50,6 @@ vis t0,0 vis pColorWheel,0 @@ -422,8 +422,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:22:24.767458577 +0000 @@ -12,24 +12,12 @@ Events @@ -469,8 +469,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:22:24.767458577 +0000 @@ -40,40 +40,6 @@ prints sys0,2 prints tSend.txt,0 @@ -638,8 +638,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:17:39.867944253 +0000 +--- HMI/n2t-out/screensaver.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:22:24.767458577 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 6619be94..a2eb8618 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-07-23 09:17:38.939933095 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:17:39.403938674 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:22:24.299452515 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -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-07-23 09:17:38.939933095 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:17:39.403938674 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:22:23.839446557 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:22:24.299452515 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -302,8 +302,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:17:39.403938674 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:22:24.299452515 +0000 @@ -932,10 +932,6 @@ { page popupLight @@ -315,38 +315,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt TouchCap tc0 Attributes -diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:17:39.403938674 +0000 -@@ -32,25 +32,6 @@ - vis bText2,0 - tsw m0,0 - tsw m1,0 -- cardQR.bco=defaultBcoColor -- for(sys0=0;sys0<32;sys0++) -- { -- if(b[sys0].type==98||b[sys0].type==116) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].pco=defaultFontColor -- } -- if(b[sys0].type==53&&defaultBcoColor==6371) -- { -- b[sys0].pic=1 -- b[sys0].pic2=2 -- } -- if(b[sys0].type==53&&defaultBcoColor==0) -- { -- b[sys0].pic=10 -- b[sys0].pic2=11 -- } -- } - - Variable (string) strCommand - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-07-23 09:17:38.939933095 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:17:39.403938674 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:22:24.299452515 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 75181763..d735bfb5 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:17:39.415938818 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:17:38.939933095 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:17:39.403938674 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:22:24.315452723 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-07-23 09:22:23.835446505 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:22:24.299452515 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:17:38.939933095 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:17:39.403938674 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:22:23.839446557 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:22:24.299452515 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -31,8 +31,8 @@ ++ } + +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:17:38.939933095 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:17:39.403938674 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:22:24.299452515 +0000 +@@ -932,10 +932,6 @@ + { + page popupLight @@ -43,33 +43,5 @@ +- } + + TouchCap tc0 -+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:17:39.403938674 +0000 -+@@ -32,25 +32,6 @@ -+ vis bText2,0 -+ tsw m0,0 -+ tsw m1,0 -+- cardQR.bco=defaultBcoColor -+- for(sys0=0;sys0<32;sys0++) -+- { -+- if(b[sys0].type==98||b[sys0].type==116) -+- { -+- b[sys0].bco=defaultBcoColor -+- b[sys0].pco=defaultFontColor -+- } -+- if(b[sys0].type==53&&defaultBcoColor==6371) -+- { -+- b[sys0].pic=1 -+- b[sys0].pic2=2 -+- } -+- if(b[sys0].type==53&&defaultBcoColor==0) -+- { -+- b[sys0].pic=10 -+- b[sys0].pic2=11 -+- } -+- } -+ -+ Variable (string) strCommand -+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:17:38.939933095 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:17:39.403938674 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:22:24.299452515 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index e913c7f0..24bcdf2e 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -40,6 +40,25 @@ Page cardQR vis bText2,0 tsw m0,0 tsw m1,0 + cardQR.bco=defaultBcoColor + for(sys0=0;sys0<32;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==6371) + { + b[sys0].pic=1 + b[sys0].pic2=2 + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } Variable (string) strCommand Attributes diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index fd92ded5..cd61ee26 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -22,10 +22,6 @@ cardMedia 34 Component(s) 388 Line(s) of event code 209 Unique line(s) of event code -cardQR - 32 Component(s) - 384 Line(s) of event code - 223 Unique line(s) of event code cardGrid 42 Component(s) 458 Line(s) of event code @@ -42,6 +38,10 @@ popupShutter 25 Component(s) 388 Line(s) of event code 211 Unique line(s) of event code +cardQR + 32 Component(s) + 403 Line(s) of event code + 234 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code @@ -62,5 +62,5 @@ cardThermo Total 14 Page(s) 444 Component(s) - 5257 Line(s) of event code - 1363 Unique line(s) of event code + 5276 Line(s) of event code + 1368 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 3dc5d4ca..62ad8746 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -32,6 +32,25 @@ Page cardQR vis bText2,0 tsw m0,0 tsw m1,0 + cardQR.bco=defaultBcoColor + for(sys0=0;sys0<32;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==6371) + { + b[sys0].pic=1 + b[sys0].pic2=2 + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } Variable (string) strCommand Attributes