diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 403c62cd..144c9fdf 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -781,106 +781,6 @@ │ if(tId.txt=="cardGrid") │ { │ page cardGrid -│ --- HMI/n2t-out/popupInSel.txt -├── +++ HMI/US/portrait/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 │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,29 +29,20 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 169f8131..c6efaaaa 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-19 15:04:38.562549259 +0000 ++++ /dev/fd/62 2022-12-19 15:52:45.018563481 +0000 +le list + +12,8 @@ +t.txt @@ -137,106 +137,6 @@ + if(tId.txt=="cardGrid") + { + page cardGrid -+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 +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +9 +29,20 @@ 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 8c96318b..0de12016 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 @@ -26,10 +26,6 @@ cardChart 32 Component(s) 453 Line(s) of event code 297 Unique line(s) of event code -popupInSel - 34 Component(s) - 533 Line(s) of event code - 259 Unique line(s) of event code pageStartup 19 Component(s) 181 Line(s) of event code @@ -74,9 +70,13 @@ cardThermo 55 Component(s) 555 Line(s) of event code 322 Unique line(s) of event code +popupInSel + 34 Component(s) + 617 Line(s) of event code + 295 Unique line(s) of event code Total 18 Page(s) 640 Component(s) - 7971 Line(s) of event code - 2029 Unique line(s) of event code + 8055 Line(s) of event code + 2065 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupInSel.txt b/HMI/US/portrait/n2t-out-visual/popupInSel.txt index 1d77fded..0898a0ea 100644 --- a/HMI/US/portrait/n2t-out-visual/popupInSel.txt +++ b/HMI/US/portrait/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/portrait/n2t-out/popupInSel.txt b/HMI/US/portrait/n2t-out/popupInSel.txt index d984cb27..e826acbd 100644 --- a/HMI/US/portrait/n2t-out/popupInSel.txt +++ b/HMI/US/portrait/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