From d4433d989c4fb84d20977bd18746636a02eaea1d Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Wed, 21 Dec 2022 20:15:32 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/portrait/diff-eu-version.txt | 116 +---------------- HMI/US/portrait/diff-filtered.txt | 118 +----------------- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 24 ++++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 +- HMI/US/portrait/n2t-out/cardGrid.txt | 24 ++++ 5 files changed, 56 insertions(+), 236 deletions(-) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 91ba9e15..2dd12a42 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -999,121 +999,7 @@ │ spstr strCommand.txt,tId.txt,"~",1 │ --- HMI/n2t-out/cardGrid.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid.txt -│ @@ -258,18 +258,14 @@ -│ { -│ page popupShutter -│ } -│ if(type1.txt=="input_sel") -│ { -│ page popupInSel -│ } -│ - if(type1.txt=="timer") -│ - { -│ - page popupTimer -│ - } -│ -│ Touch Release Event -│ tmLP.en=0 -│ tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -303,18 +299,14 @@ -│ { -│ page popupShutter -│ } -│ if(type2.txt=="input_sel") -│ { -│ page popupInSel -│ } -│ - if(type2.txt=="timer") -│ - { -│ - page popupTimer -│ - } -│ -│ Touch Release Event -│ tmLP.en=0 -│ tSend.txt="event,buttonPress2,"+entn2.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -348,18 +340,14 @@ -│ { -│ page popupShutter -│ } -│ if(type3.txt=="input_sel") -│ { -│ page popupInSel -│ } -│ - if(type3.txt=="timer") -│ - { -│ - page popupTimer -│ - } -│ -│ Touch Release Event -│ tmLP.en=0 -│ tSend.txt="event,buttonPress2,"+entn3.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -393,18 +381,14 @@ -│ { -│ page popupShutter -│ } -│ if(type4.txt=="input_sel") -│ { -│ page popupInSel -│ } -│ - if(type4.txt=="timer") -│ - { -│ - page popupTimer -│ - } -│ -│ Touch Release Event -│ tmLP.en=0 -│ tSend.txt="event,buttonPress2,"+entn4.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -438,18 +422,14 @@ -│ { -│ page popupShutter -│ } -│ if(type5.txt=="input_sel") -│ { -│ page popupInSel -│ } -│ - if(type5.txt=="timer") -│ - { -│ - page popupTimer -│ - } -│ -│ Touch Release Event -│ tmLP.en=0 -│ tSend.txt="event,buttonPress2,"+entn5.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -483,18 +463,14 @@ -│ { -│ page popupShutter -│ } -│ if(type6.txt=="input_sel") -│ { -│ page popupInSel -│ } -│ - if(type6.txt=="timer") -│ - { -│ - page popupTimer -│ - } -│ -│ Touch Release Event -│ tmLP.en=0 -│ tSend.txt="event,buttonPress2,"+entn6.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -633,14 +609,18 @@ +│ @@ -633,14 +633,18 @@ │ { │ page popupLight │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f51c79b1..4d33a8c6 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-21 20:02:53.423928525 +0000 ++++ /dev/fd/62 2022-12-21 20:15:25.252534958 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -406,121 +406,7 @@ + } +I/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt -+18 +258,14 @@ -+ { -+ page popupShutter -+ } -+ if(type1.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type1.txt=="timer") -+ { -+ page popupTimer -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn1.txt+",button" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+18 +299,14 @@ -+ { -+ page popupShutter -+ } -+ if(type2.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type2.txt=="timer") -+ { -+ page popupTimer -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn2.txt+",button" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+18 +340,14 @@ -+ { -+ page popupShutter -+ } -+ if(type3.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type3.txt=="timer") -+ { -+ page popupTimer -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn3.txt+",button" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+18 +381,14 @@ -+ { -+ page popupShutter -+ } -+ if(type4.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type4.txt=="timer") -+ { -+ page popupTimer -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn4.txt+",button" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+18 +422,14 @@ -+ { -+ page popupShutter -+ } -+ if(type5.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type5.txt=="timer") -+ { -+ page popupTimer -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn5.txt+",button" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+18 +463,14 @@ -+ { -+ page popupShutter -+ } -+ if(type6.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type6.txt=="timer") -+ { -+ page popupTimer -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn6.txt+",button" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+14 +609,18 @@ ++14 +633,18 @@ + { + page popupLight + } diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index a8b24eb3..9d95aa15 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -516,6 +516,10 @@ Button bEntity1 { page popupInSel } + if(type1.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -579,6 +583,10 @@ Button bEntity2 { page popupInSel } + if(type2.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -642,6 +650,10 @@ Button bEntity3 { page popupInSel } + if(type3.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -705,6 +717,10 @@ Button bEntity4 { page popupInSel } + if(type4.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -768,6 +784,10 @@ Button bEntity5 { page popupInSel } + if(type5.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -831,6 +851,10 @@ Button bEntity6 { page popupInSel } + if(type6.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 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 d51ee34a..0d6e1e1d 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 @@ -30,10 +30,6 @@ pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code -cardGrid - 42 Component(s) - 518 Line(s) of event code - 294 Unique line(s) of event code popupShutter 25 Component(s) 398 Line(s) of event code @@ -46,6 +42,10 @@ cardPower 43 Component(s) 439 Line(s) of event code 299 Unique line(s) of event code +cardGrid + 42 Component(s) + 542 Line(s) of event code + 301 Unique line(s) of event code cardMedia 57 Component(s) 660 Line(s) of event code @@ -82,5 +82,5 @@ cardEntities Total 19 Page(s) 693 Component(s) - 8806 Line(s) of event code + 8830 Line(s) of event code 2253 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 6ce43ce9..fd520cee 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -262,6 +262,10 @@ Button bEntity1 { page popupInSel } + if(type1.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -303,6 +307,10 @@ Button bEntity2 { page popupInSel } + if(type2.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -344,6 +352,10 @@ Button bEntity3 { page popupInSel } + if(type3.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -385,6 +397,10 @@ Button bEntity4 { page popupInSel } + if(type4.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -426,6 +442,10 @@ Button bEntity5 { page popupInSel } + if(type5.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0 @@ -467,6 +487,10 @@ Button bEntity6 { page popupInSel } + if(type6.txt=="timer") + { + page popupTimer + } Touch Release Event tmLP.en=0