From 1e0fe0ee8d9bb98582f1090f3119072e67963a5e Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 20 May 2023 14:50:42 +0000 Subject: [PATCH] fix alt bg color (add nextion2text) --- HMI/US/landscape/n2t-out-visual/cardGrid2.txt | 2 +- .../n2t-out-visual/nspanel_US_L_Stats.txt | 10 ++++---- HMI/US/landscape/n2t-out/cardGrid2.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 9 +++++-- HMI/US/portrait/diff-filtered.txt | 25 +++++++++++-------- HMI/US/portrait/n2t-out-visual/cardGrid2.txt | 2 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 ++++---- HMI/US/portrait/n2t-out/cardGrid2.txt | 2 +- HMI/n2t-out-visual/cardGrid2.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 10 ++++---- HMI/n2t-out/cardGrid2.txt | 2 +- 11 files changed, 43 insertions(+), 33 deletions(-) diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid2.txt b/HMI/US/landscape/n2t-out-visual/cardGrid2.txt index 2900a8ee..4643921c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid2.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid2.txt @@ -48,7 +48,7 @@ Page cardGrid2 vis bPrev,0 vis bNext,0 cardGrid2.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { 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 aca5b558..a4f3fa33 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 @@ -62,6 +62,10 @@ screensaver 46 Component(s) 435 Line(s) of event code 309 Unique line(s) of event code +cardGrid2 + 52 Component(s) + 611 Line(s) of event code + 319 Unique line(s) of event code cardLChart 33 Component(s) 402 Line(s) of event code @@ -78,10 +82,6 @@ screensaver2 58 Component(s) 348 Line(s) of event code 245 Unique line(s) of event code -cardGrid2 - 52 Component(s) - 611 Line(s) of event code - 319 Unique line(s) of event code cardPower 54 Component(s) 527 Line(s) of event code @@ -95,4 +95,4 @@ Total 22 Page(s) 847 Component(s) 9920 Line(s) of event code - 2359 Unique line(s) of event code + 2360 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardGrid2.txt b/HMI/US/landscape/n2t-out/cardGrid2.txt index cb0f2065..b98ced5d 100644 --- a/HMI/US/landscape/n2t-out/cardGrid2.txt +++ b/HMI/US/landscape/n2t-out/cardGrid2.txt @@ -40,7 +40,7 @@ Page cardGrid2 vis bPrev,0 vis bNext,0 cardGrid2.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 24310757..1fbbad2a 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1030,7 +1030,7 @@ │ spstr strCommand.txt,tId.txt,"~",1 │ --- HMI/n2t-out/cardGrid2.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid2.txt -│ @@ -25,22 +25,24 @@ +│ @@ -25,26 +25,28 @@ │ vis bEntity2,0 │ vis bEntity3,0 │ vis bEntity4,0 @@ -1051,10 +1051,15 @@ │ vis bPrev,0 │ vis bNext,0 │ cardGrid2.bco=defaultBcoColor -│ for(sys0=0;sys0<42;sys0++) +│ - for(sys0=0;sys0<48;sys0++) +│ + for(sys0=0;sys0<50;sys0++) │ { │ if(b[sys0].type==98||b[sys0].type==116) │ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ } │ @@ -93,14 +95,20 @@ │ │ Variable (string) entn8 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fd701c58..98fc30e1 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-05-20 13:06:19.296059656 +0000 ++++ /dev/fd/62 2023-05-20 14:50:34.059646337 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,11 @@ @@ -586,9 +586,16 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardGrid2.txt ++ HMI/US/portrait/n2t-out/cardGrid2.txt -+2 +25,24 @@ ++6 +25,28 @@ + vis bEntity2,0 + vis bEntity3,0 + vis bEntity4,0 @@ -609,10 +616,15 @@ + vis bPrev,0 + vis bNext,0 + cardGrid2.bco=defaultBcoColor -+ for(sys0=0;sys0<42;sys0++) ++ for(sys0=0;sys0<48;sys0++) ++ for(sys0=0;sys0<50;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { ++ b[sys0].bco=defaultBcoColor ++ b[sys0].pco=defaultFontColor ++ } ++ } +4 +95,20 @@ + +e (string) entn8 @@ -784,13 +796,6 @@ + spstr strCommand.txt,tEntity9.txt,"~",66 + vis tEntity9,1 + } -+ } -+ if(tInstruction.txt=="pageType") -+ { -+ sleepValue=0 -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt +6 +45,16 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid2.txt b/HMI/US/portrait/n2t-out-visual/cardGrid2.txt index 8a73b366..006167f6 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid2.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid2.txt @@ -50,7 +50,7 @@ Page cardGrid2 vis bPrev,0 vis bNext,0 cardGrid2.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) + for(sys0=0;sys0<50;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { 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 bcdb1803..0f612596 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,14 +14,14 @@ popupNotify 19 Component(s) 267 Line(s) of event code 172 Unique line(s) of event code -cardGrid2 - 56 Component(s) - 657 Line(s) of event code - 332 Unique line(s) of event code popupTimer 42 Component(s) 516 Line(s) of event code 257 Unique line(s) of event code +cardGrid2 + 56 Component(s) + 657 Line(s) of event code + 332 Unique line(s) of event code popupFan 27 Component(s) 355 Line(s) of event code @@ -95,4 +95,4 @@ Total 22 Page(s) 862 Component(s) 10360 Line(s) of event code - 2491 Unique line(s) of event code + 2492 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardGrid2.txt b/HMI/US/portrait/n2t-out/cardGrid2.txt index bba268bd..4b60e256 100644 --- a/HMI/US/portrait/n2t-out/cardGrid2.txt +++ b/HMI/US/portrait/n2t-out/cardGrid2.txt @@ -42,7 +42,7 @@ Page cardGrid2 vis bPrev,0 vis bNext,0 cardGrid2.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) + for(sys0=0;sys0<50;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out-visual/cardGrid2.txt b/HMI/n2t-out-visual/cardGrid2.txt index 2900a8ee..4643921c 100644 --- a/HMI/n2t-out-visual/cardGrid2.txt +++ b/HMI/n2t-out-visual/cardGrid2.txt @@ -48,7 +48,7 @@ Page cardGrid2 vis bPrev,0 vis bNext,0 cardGrid2.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6032c2a4..5e28a4b6 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -50,10 +50,6 @@ cardChart 33 Component(s) 437 Line(s) of event code 296 Unique line(s) of event code -cardGrid2 - 52 Component(s) - 611 Line(s) of event code - 319 Unique line(s) of event code cardAlarm 43 Component(s) 500 Line(s) of event code @@ -78,6 +74,10 @@ popupInSel 34 Component(s) 621 Line(s) of event code 297 Unique line(s) of event code +cardGrid2 + 52 Component(s) + 611 Line(s) of event code + 319 Unique line(s) of event code popupTimer 42 Component(s) 516 Line(s) of event code @@ -95,4 +95,4 @@ Total 22 Page(s) 850 Component(s) 9940 Line(s) of event code - 2368 Unique line(s) of event code + 2369 Unique line(s) of event code diff --git a/HMI/n2t-out/cardGrid2.txt b/HMI/n2t-out/cardGrid2.txt index cb0f2065..b98ced5d 100644 --- a/HMI/n2t-out/cardGrid2.txt +++ b/HMI/n2t-out/cardGrid2.txt @@ -40,7 +40,7 @@ Page cardGrid2 vis bPrev,0 vis bNext,0 cardGrid2.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) {