From 4deca379424cab6a1d7bc8c90cc03ee784fc3544 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 29 May 2022 11:37:55 +0000 Subject: [PATCH] sync us-p (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +- HMI/US/portrait/diff-eu-version.txt | 94 ++---------------- HMI/US/portrait/diff-filtered.txt | 96 +++---------------- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 8 ++ HMI/US/portrait/n2t-out-visual/cardThermo.txt | 8 ++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 18 ++-- HMI/US/portrait/n2t-out/cardGrid.txt | 8 ++ HMI/US/portrait/n2t-out/cardThermo.txt | 8 ++ 8 files changed, 66 insertions(+), 182 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index add089f7..76bfb6fb 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-29 11:14:46.568572153 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:14:47.428560992 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:37:54.549688631 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:14:47.428560992 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:37:54.549688631 +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 7c46570c..9b2ed7aa 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-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:14:46.984566754 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:37:54.005674370 +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-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:14:46.984566754 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:37:54.005674370 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -467,46 +467,9 @@ 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-05-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:14:46.984566754 +0000 -@@ -616,33 +616,25 @@ - if(tTmp.txt=="0") - { - vis bPrev,0 -- tsw mSwipePrev,0 -- tsw mSwipeUp,0 - } - if(tTmp.txt=="1") - { - vis bPrev,1 -- tsw mSwipePrev,1 -- tsw mSwipeUp,0 - bPrev.txt="" - } - if(tTmp.txt=="2") - { - vis bPrev,1 -- tsw mSwipePrev,0 -- tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") - { - vis bNext,0 -- tsw mSwipeNext,0 - } - if(tTmp.txt=="1") - { - vis bNext,1 -- tsw mSwipeNext,1 - bNext.txt="" - } - // get Type diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:14:46.984566754 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:37:54.005674370 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -516,46 +479,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:14:46.984566754 +0000 -@@ -889,33 +889,25 @@ - if(tTmp.txt=="0") - { - vis bPrev,0 -- tsw mSwipePrev,0 -- tsw mSwipeUp,0 - } - if(tTmp.txt=="1") - { - vis bPrev,1 -- tsw mSwipePrev,1 -- tsw mSwipeUp,0 - bPrev.txt="" - } - if(tTmp.txt=="2") - { - vis bPrev,1 -- tsw mSwipePrev,0 -- tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") - { - vis bNext,0 -- tsw mSwipeNext,0 - } - if(tTmp.txt=="1") - { - vis bNext,1 -- tsw mSwipeNext,1 - bNext.txt="" - } - //entity name diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:14:46.984566754 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:37:54.005674370 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -575,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-29 11:14:46.568572153 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:14:46.984566754 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-29 11:37:53.505660975 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:37:54.005674370 +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 deffa184..334d8c6c 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,87 +1,13 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 11:14:46.996566599 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:14:46.984566754 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:14:46.984566754 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 11:37:54.025674905 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-29 11:37:53.505660975 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:37:54.005674370 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:37:53.505660975 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:37:54.005674370 +0000 +@@ -1849,6 +2077,169 @@ -+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:14:46.984566754 +0000 -+@@ -616,33 +616,25 @@ -+ if(tTmp.txt=="0") -+ { -+ vis bPrev,0 -+- tsw mSwipePrev,0 -+- tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bPrev,1 -+- tsw mSwipePrev,1 -+- tsw mSwipeUp,0 -+ bPrev.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+- tsw mSwipePrev,0 -+- tsw mSwipeUp,1 -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+- tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+- tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ // get Type -+--- HMI/n2t-out/cardQR.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:14:46.984566754 +0000 -+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:14:46.984566754 +0000 -+@@ -889,33 +889,25 @@ -+ if(tTmp.txt=="0") -+ { -+ vis bPrev,0 -+- tsw mSwipePrev,0 -+- tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bPrev,1 -+- tsw mSwipePrev,1 -+- tsw mSwipeUp,0 -+ bPrev.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+- tsw mSwipePrev,0 -+- tsw mSwipeUp,1 -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+- tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+- tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ //entity name -+--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:14:46.984566754 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-29 11:14:46.568572153 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:14:46.984566754 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-29 11:37:53.505660975 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:37:54.005674370 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:37:53.505660975 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:37:54.005674370 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-29 11:37:53.505660975 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:37:54.005674370 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 5b6cdf96..f96db85a 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1080,25 +1080,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 4b911c19..dff61ab0 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1670,25 +1670,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name 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 7e34ecab..f6ce3b55 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 @@ -18,18 +18,14 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 256 Unique line(s) of event code popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code -cardGrid - 42 Component(s) - 427 Line(s) of event code - 250 Unique line(s) of event code -cardThermo - 56 Component(s) - 534 Line(s) of event code - 286 Unique line(s) of event code cardQR 30 Component(s) 359 Line(s) of event code @@ -38,6 +34,10 @@ cardMedia 33 Component(s) 346 Line(s) of event code 181 Unique line(s) of event code +cardThermo + 56 Component(s) + 542 Line(s) of event code + 292 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 416 Component(s) - 4645 Line(s) of event code + 4661 Line(s) of event code 1234 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index b3d143b3..90641005 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -616,25 +616,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 670ff0b6..4cf78ed9 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -889,25 +889,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name