From a1da74d32b1e2bd595d734995b528e48b53b4c3c Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 9 Dec 2022 23:39:37 +0000 Subject: [PATCH] sync us-l (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 144 +----------------- HMI/US/landscape/n2t-out-visual/cardChart.txt | 4 +- HMI/US/landscape/n2t-out-visual/cardGrid.txt | 4 - .../n2t-out-visual/nspanel_US_L_Stats.txt | 28 ++-- .../landscape/n2t-out-visual/popupInSel.txt | 84 ++++++++++ HMI/US/landscape/n2t-out/cardChart.txt | 4 +- HMI/US/landscape/n2t-out/cardGrid.txt | 4 - HMI/US/landscape/n2t-out/popupInSel.txt | 84 ++++++++++ HMI/US/portrait/diff-filtered.txt | 2 +- 9 files changed, 190 insertions(+), 168 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 802097bc..aabbc5e4 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -15,17 +15,15 @@ │ - page pageStartup │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/landscape/n2t-out/cardChart.txt -│ @@ -175,16 +175,16 @@ -│ Send Component ID : disabled +│ @@ -176,15 +176,15 @@ │ State : unpressed │ Text :  │ Max. Text Size : 10 │ │ Events │ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardChart," +│ tSend.txt="event,buttonPress2,cardChart," │ - if(bPrev.txt=="") -│ + tSend.txt="event,buttonPress2,cardPower," │ + if(bNext.txt=="") │ { │ tSend.txt+="bHome" @@ -34,43 +32,6 @@ │ tSend.txt+="bNext" │ } │ //send calc crc -│ @@ -207,15 +207,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardChart," -│ + tSend.txt="event,buttonPress2,cardAlarm," -│ if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/landscape/n2t-out/cardGrid.txt -│ @@ -609,14 +609,18 @@ -│ { -│ page popupLight -│ } -│ if(tTmp.txt=="fan") -│ { -│ page popupFan -│ } -│ + if(tTmp.txt=="input_sel") -│ + { -│ + page popupInSel -│ + } -│ -│ Timer tmSerial -│ Attributes -│ Scope : local -│ Period (ms): 50 -│ Enabled : yes │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ @@ -113,106 +74,7 @@ │ } │ --- HMI/n2t-out/popupInSel.txt ├── +++ HMI/US/landscape/n2t-out/popupInSel.txt -│ @@ -632,98 +632,14 @@ -│ { -│ bMode11.pco=1374 -│ } -│ if(bMode12.txt==vaModeCur.txt) -│ { -│ bMode12.pco=1374 -│ } -│ - if(bMode1.txt=="") -│ - { -│ - vis bMode1,0 -│ - }else -│ - { -│ - vis bMode1,1 -│ - } -│ - if(bMode2.txt=="") -│ - { -│ - vis bMode2,0 -│ - }else -│ - { -│ - vis bMode2,1 -│ - } -│ - if(bMode3.txt=="") -│ - { -│ - vis bMode3,0 -│ - }else -│ - { -│ - vis bMode3,1 -│ - } -│ - if(bMode4.txt=="") -│ - { -│ - vis bMode4,0 -│ - }else -│ - { -│ - vis bMode4,1 -│ - } -│ - if(bMode5.txt=="") -│ - { -│ - vis bMode5,0 -│ - }else -│ - { -│ - vis bMode5,1 -│ - } -│ - if(bMode6.txt=="") -│ - { -│ - vis bMode6,0 -│ - }else -│ - { -│ - vis bMode6,1 -│ - } -│ - if(bMode7.txt=="") -│ - { -│ - vis bMode7,0 -│ - }else -│ - { -│ - vis bMode7,1 -│ - } -│ - if(bMode8.txt=="") -│ - { -│ - vis bMode8,0 -│ - }else -│ - { -│ - vis bMode8,1 -│ - } -│ - if(bMode9.txt=="") -│ - { -│ - vis bMode9,0 -│ - }else -│ - { -│ - vis bMode9,1 -│ - } -│ - if(bMode10.txt=="") -│ - { -│ - vis bMode10,0 -│ - }else -│ - { -│ - vis bMode10,1 -│ - } -│ - if(bMode11.txt=="") -│ - { -│ - vis bMode11,0 -│ - }else -│ - { -│ - vis bMode11,1 -│ - } -│ - if(bMode12.txt=="") -│ - { -│ - vis bMode12,0 -│ - }else -│ - { -│ - vis bMode12,1 -│ - } -│ -│ Timer tmCooldown -│ Attributes -│ Scope : local -│ Period (ms): 100 -│ Enabled : no -│ -│ @@ -977,14 +893,18 @@ +│ @@ -977,14 +977,18 @@ │ { │ page cardQR │ } diff --git a/HMI/US/landscape/n2t-out-visual/cardChart.txt b/HMI/US/landscape/n2t-out-visual/cardChart.txt index c7d19373..94f29e45 100644 --- a/HMI/US/landscape/n2t-out-visual/cardChart.txt +++ b/HMI/US/landscape/n2t-out-visual/cardChart.txt @@ -280,7 +280,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardPower," + tSend.txt="event,buttonPress2,cardChart," if(bNext.txt=="") { tSend.txt+="bHome" @@ -334,7 +334,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," + tSend.txt="event,buttonPress2,cardChart," if(bPrev.txt=="") { tSend.txt+="bUp" diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 3b4992f1..c9960673 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1058,10 +1058,6 @@ Timer tmLP { page popupFan } - if(tTmp.txt=="input_sel") - { - page popupInSel - } Timer tmSerial Attributes 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 615572bb..82bef759 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 @@ -10,14 +10,14 @@ pageTest 15 Component(s) 15 Line(s) of event code 15 Unique line(s) of event code +cardChart + 31 Component(s) + 452 Line(s) of event code + 296 Unique line(s) of event code pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code -cardChart - 31 Component(s) - 452 Line(s) of event code - 297 Unique line(s) of event code popupNotify 19 Component(s) 257 Line(s) of event code @@ -38,6 +38,10 @@ popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code +popupInSel + 34 Component(s) + 617 Line(s) of event code + 295 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -46,10 +50,6 @@ cardThermo 53 Component(s) 612 Line(s) of event code 318 Unique line(s) of event code -popupInSel - 34 Component(s) - 533 Line(s) of event code - 259 Unique line(s) of event code cardEntities 65 Component(s) 1169 Line(s) of event code @@ -66,17 +66,17 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -cardGrid - 42 Component(s) - 518 Line(s) of event code - 294 Unique line(s) of event code cardMedia 57 Component(s) 660 Line(s) of event code 325 Unique line(s) of event code +cardGrid + 42 Component(s) + 514 Line(s) of event code + 293 Unique line(s) of event code Total 18 Page(s) 626 Component(s) - 7791 Line(s) of event code - 1950 Unique line(s) of event code + 7871 Line(s) of event code + 1986 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupInSel.txt b/HMI/US/landscape/n2t-out-visual/popupInSel.txt index b0bef33a..85221f6e 100644 --- a/HMI/US/landscape/n2t-out-visual/popupInSel.txt +++ b/HMI/US/landscape/n2t-out-visual/popupInSel.txt @@ -1014,6 +1014,90 @@ Button bModeNext { bMode12.pco=1374 } + if(bMode1.txt=="") + { + vis bMode1,0 + }else + { + vis bMode1,1 + } + if(bMode2.txt=="") + { + vis bMode2,0 + }else + { + vis bMode2,1 + } + if(bMode3.txt=="") + { + vis bMode3,0 + }else + { + vis bMode3,1 + } + if(bMode4.txt=="") + { + vis bMode4,0 + }else + { + vis bMode4,1 + } + if(bMode5.txt=="") + { + vis bMode5,0 + }else + { + vis bMode5,1 + } + if(bMode6.txt=="") + { + vis bMode6,0 + }else + { + vis bMode6,1 + } + if(bMode7.txt=="") + { + vis bMode7,0 + }else + { + vis bMode7,1 + } + if(bMode8.txt=="") + { + vis bMode8,0 + }else + { + vis bMode8,1 + } + if(bMode9.txt=="") + { + vis bMode9,0 + }else + { + vis bMode9,1 + } + if(bMode10.txt=="") + { + vis bMode10,0 + }else + { + vis bMode10,1 + } + if(bMode11.txt=="") + { + vis bMode11,0 + }else + { + vis bMode11,1 + } + if(bMode12.txt=="") + { + vis bMode12,0 + }else + { + vis bMode12,1 + } Timer tmCooldown Attributes diff --git a/HMI/US/landscape/n2t-out/cardChart.txt b/HMI/US/landscape/n2t-out/cardChart.txt index 35290529..9de54bcd 100644 --- a/HMI/US/landscape/n2t-out/cardChart.txt +++ b/HMI/US/landscape/n2t-out/cardChart.txt @@ -179,7 +179,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardPower," + tSend.txt="event,buttonPress2,cardChart," if(bNext.txt=="") { tSend.txt+="bHome" @@ -211,7 +211,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," + tSend.txt="event,buttonPress2,cardChart," if(bPrev.txt=="") { tSend.txt+="bUp" diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 6ce43ce9..2244d8ee 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -613,10 +613,6 @@ Timer tmLP { page popupFan } - if(tTmp.txt=="input_sel") - { - page popupInSel - } Timer tmSerial Attributes diff --git a/HMI/US/landscape/n2t-out/popupInSel.txt b/HMI/US/landscape/n2t-out/popupInSel.txt index d984cb27..e826acbd 100644 --- a/HMI/US/landscape/n2t-out/popupInSel.txt +++ b/HMI/US/landscape/n2t-out/popupInSel.txt @@ -636,6 +636,90 @@ Button bModeNext { bMode12.pco=1374 } + if(bMode1.txt=="") + { + vis bMode1,0 + }else + { + vis bMode1,1 + } + if(bMode2.txt=="") + { + vis bMode2,0 + }else + { + vis bMode2,1 + } + if(bMode3.txt=="") + { + vis bMode3,0 + }else + { + vis bMode3,1 + } + if(bMode4.txt=="") + { + vis bMode4,0 + }else + { + vis bMode4,1 + } + if(bMode5.txt=="") + { + vis bMode5,0 + }else + { + vis bMode5,1 + } + if(bMode6.txt=="") + { + vis bMode6,0 + }else + { + vis bMode6,1 + } + if(bMode7.txt=="") + { + vis bMode7,0 + }else + { + vis bMode7,1 + } + if(bMode8.txt=="") + { + vis bMode8,0 + }else + { + vis bMode8,1 + } + if(bMode9.txt=="") + { + vis bMode9,0 + }else + { + vis bMode9,1 + } + if(bMode10.txt=="") + { + vis bMode10,0 + }else + { + vis bMode10,1 + } + if(bMode11.txt=="") + { + vis bMode11,0 + }else + { + vis bMode11,1 + } + if(bMode12.txt=="") + { + vis bMode12,0 + }else + { + vis bMode12,1 + } Timer tmCooldown Attributes diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 70b9a01b..6231ed80 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-09 23:24:02.124789871 +0000 ++++ /dev/fd/62 2022-12-09 23:39:29.754086326 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt