diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8c3489ed..b727571f 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -23,6 +23,34 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup +├── cardPower.txt +│ @@ -42,22 +42,19 @@ +│ for(sys0=0;sys0<43;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ - if(defaultBcoColor==0) +│ + if(b[sys0].type==1) +│ { +│ - if(b[sys0].type==1) +│ - { +│ - b[sys0].pic=19 +│ - b[sys0].pic1=19 +│ - b[sys0].pic2=15 +│ - } +│ + b[sys0].pic=19 +│ + b[sys0].pic1=19 +│ + b[sys0].pic2=15 +│ } +│ } +│ +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : ├── cardThermo.txt │ @@ -779,30 +779,14 @@ │ crcputs tSend.txt,0 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 c6d370b1..74b7b09f 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 @@ -6,6 +6,10 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +pageStartup + 19 Component(s) + 172 Line(s) of event code + 125 Unique line(s) of event code popupNotify 19 Component(s) 253 Line(s) of event code @@ -26,10 +30,6 @@ popupShutter 25 Component(s) 394 Line(s) of event code 216 Unique line(s) of event code -pageStartup - 19 Component(s) - 172 Line(s) of event code - 125 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 8d6299b6..bc79cb88 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 42 + Text : 43 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index eafec548..0636cabd 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 42 + Text : 43 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 61b9d5e2..c08dc9cc 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-16 08:26:34.101954953 +0000 ++++ /dev/fd/62 2022-10-23 14:41:10.580318674 +0000 ++9,8 @@ +tify.txt +utter.txt diff --git a/HMI/US/portrait/n2t-out-visual/cardPower.txt b/HMI/US/portrait/n2t-out-visual/cardPower.txt index f63ac5c9..98d68ff4 100644 --- a/HMI/US/portrait/n2t-out-visual/cardPower.txt +++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt @@ -54,11 +54,14 @@ Page cardPower b[sys0].bco=defaultBcoColor b[sys0].pco=defaultFontColor } - if(b[sys0].type==1) + if(defaultBcoColor==0) { - b[sys0].pic=19 - b[sys0].pic1=19 - b[sys0].pic2=15 + if(b[sys0].type==1) + { + b[sys0].pic=19 + b[sys0].pic1=19 + b[sys0].pic2=15 + } } } @@ -629,7 +632,7 @@ Slider h1 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : horizontal + Direction : vertical Fill : image Cursor width : auto Cursor height : 255 @@ -654,7 +657,7 @@ Slider h4 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : horizontal + Direction : vertical Fill : image Cursor width : auto Cursor height : 255 @@ -704,7 +707,7 @@ Slider h2 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : horizontal + Direction : vertical Fill : image Cursor width : auto Cursor height : 255 @@ -729,7 +732,7 @@ Slider h5 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : horizontal + Direction : vertical Fill : image Cursor width : auto Cursor height : 255 @@ -754,7 +757,7 @@ Slider h3 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : horizontal + Direction : vertical Fill : image Cursor width : auto Cursor height : 255 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 6c9729d0..cfb9ed7b 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 @@ -14,10 +14,10 @@ popupFan 27 Component(s) 347 Line(s) of event code 202 Unique line(s) of event code -pageStartup - 19 Component(s) - 172 Line(s) of event code - 125 Unique line(s) of event code +cardPower + 43 Component(s) + 423 Line(s) of event code + 293 Unique line(s) of event code popupShutter 25 Component(s) 394 Line(s) of event code @@ -26,10 +26,10 @@ popupLight 27 Component(s) 391 Line(s) of event code 214 Unique line(s) of event code -cardPower - 43 Component(s) - 420 Line(s) of event code - 292 Unique line(s) of event code +pageStartup + 19 Component(s) + 172 Line(s) of event code + 125 Unique line(s) of event code cardGrid 42 Component(s) 474 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 496 Component(s) - 5983 Line(s) of event code - 1629 Unique line(s) of event code + 5986 Line(s) of event code + 1631 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index f0854003..e0e757f4 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 42 + Text : 43 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt index acf224b5..d8c35161 100644 --- a/HMI/US/portrait/n2t-out/cardPower.txt +++ b/HMI/US/portrait/n2t-out/cardPower.txt @@ -46,11 +46,14 @@ Page cardPower b[sys0].bco=defaultBcoColor b[sys0].pco=defaultFontColor } - if(b[sys0].type==1) + if(defaultBcoColor==0) { - b[sys0].pic=19 - b[sys0].pic1=19 - b[sys0].pic2=15 + if(b[sys0].type==1) + { + b[sys0].pic=19 + b[sys0].pic1=19 + b[sys0].pic2=15 + } } } diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index f3abf5c2..3bc12fe2 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 42 + Text : 43 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index bcf0d424..8b2e1e30 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -54,11 +54,14 @@ Page cardPower b[sys0].bco=defaultBcoColor b[sys0].pco=defaultFontColor } - if(b[sys0].type==1) + if(defaultBcoColor==0) { - b[sys0].pic=19 - b[sys0].pic1=19 - b[sys0].pic2=15 + if(b[sys0].type==1) + { + b[sys0].pic=19 + b[sys0].pic1=19 + b[sys0].pic2=15 + } } } diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 2cd54231..5e377402 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,6 @@ popupThermo 24 Component(s) 294 Line(s) of event code 175 Unique line(s) of event code -pageStartup - 19 Component(s) - 172 Line(s) of event code - 125 Unique line(s) of event code popupNotify 19 Component(s) 253 Line(s) of event code @@ -34,6 +30,10 @@ popupFan 27 Component(s) 347 Line(s) of event code 202 Unique line(s) of event code +pageStartup + 19 Component(s) + 172 Line(s) of event code + 125 Unique line(s) of event code cardQR 32 Component(s) 409 Line(s) of event code @@ -50,10 +50,6 @@ screensaver 38 Component(s) 350 Line(s) of event code 266 Unique line(s) of event code -cardPower - 43 Component(s) - 420 Line(s) of event code - 292 Unique line(s) of event code cardThermo 53 Component(s) 588 Line(s) of event code @@ -66,9 +62,13 @@ cardEntities 65 Component(s) 1137 Line(s) of event code 522 Unique line(s) of event code +cardPower + 43 Component(s) + 423 Line(s) of event code + 293 Unique line(s) of event code Total 16 Page(s) 515 Component(s) - 6128 Line(s) of event code - 1588 Unique line(s) of event code + 6131 Line(s) of event code + 1590 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index e2006fb4..e8521679 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 42 + Text : 43 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index acf224b5..d8c35161 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -46,11 +46,14 @@ Page cardPower b[sys0].bco=defaultBcoColor b[sys0].pco=defaultFontColor } - if(b[sys0].type==1) + if(defaultBcoColor==0) { - b[sys0].pic=19 - b[sys0].pic1=19 - b[sys0].pic2=15 + if(b[sys0].type==1) + { + b[sys0].pic=19 + b[sys0].pic1=19 + b[sys0].pic2=15 + } } } diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 30484653..529d134b 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 42 + Text : 43 Max. Text Size : 10 Picture p0