diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 008162a6..802097bc 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -113,7 +113,106 @@ │ } │ --- HMI/n2t-out/popupInSel.txt ├── +++ HMI/US/landscape/n2t-out/popupInSel.txt -│ @@ -893,14 +893,18 @@ +│ @@ -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 @@ │ { │ page cardQR │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index cb9fad5d..405472fb 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -755,7 +755,106 @@ │ } │ --- HMI/n2t-out/popupInSel.txt ├── +++ HMI/US/portrait/n2t-out/popupInSel.txt -│ @@ -893,14 +893,18 @@ +│ @@ -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 @@ │ { │ page cardQR │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7de43005..70b9a01b 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 22:07:37.117380516 +0000 ++++ /dev/fd/62 2022-12-09 23:24:02.124789871 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -111,6 +111,105 @@ + } +I/n2t-out/popupInSel.txt ++ HMI/US/portrait/n2t-out/popupInSel.txt ++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 ++ } ++ ++mCooldown ++ributes ++ Scope : local ++ Period (ms): 100 ++ Enabled : no ++ +14 +893,18 @@ + { + page cardQR diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f80fbd40..c79c64e2 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,14 +26,14 @@ pageTest 23 Component(s) 73 Line(s) of event code 69 Unique line(s) of event code -popupInSel - 34 Component(s) - 529 Line(s) of event code - 257 Unique line(s) of event code cardChart 31 Component(s) 452 Line(s) of event code 296 Unique line(s) of event code +popupInSel + 34 Component(s) + 613 Line(s) of event code + 293 Unique line(s) of event code cardGrid 42 Component(s) 514 Line(s) of event code @@ -78,5 +78,5 @@ cardEntities Total 18 Page(s) 636 Component(s) - 7825 Line(s) of event code - 1973 Unique line(s) of event code + 7909 Line(s) of event code + 2009 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupInSel.txt b/HMI/n2t-out-visual/popupInSel.txt index 35b11a78..360dd007 100644 --- a/HMI/n2t-out-visual/popupInSel.txt +++ b/HMI/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/n2t-out/popupInSel.txt b/HMI/n2t-out/popupInSel.txt index 37f29287..848b0860 100644 --- a/HMI/n2t-out/popupInSel.txt +++ b/HMI/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