From 3efe659c2ee9968cb6d085075e1b33386cdd5618 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Mon, 23 Jan 2023 17:28:52 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 25 +++++++++-- HMI/US/portrait/diff-eu-version.txt | 40 +++++++++-------- HMI/US/portrait/diff-filtered.txt | 44 ++++++++++--------- HMI/US/portrait/n2t-out-visual/cardMedia.txt | 2 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 ++--- HMI/US/portrait/n2t-out/cardMedia.txt | 2 +- HMI/n2t-out-visual/cardMedia.txt | 2 +- HMI/n2t-out-visual/cardPower.txt | 4 ++ HMI/n2t-out-visual/nspanel_Stats.txt | 18 ++++---- HMI/n2t-out/cardMedia.txt | 2 +- HMI/n2t-out/cardPower.txt | 4 ++ 11 files changed, 92 insertions(+), 61 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5fccdd4d..b1b5e65d 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -544,7 +544,7 @@ │ vis bEntity5,0 │ vis bEntity6,0 │ cardMedia.bco=defaultBcoColor -│ - for(sys0=0;sys0<52;sys0++) +│ - for(sys0=0;sys0<54;sys0++) │ + for(sys0=0;sys0<34;sys0++) │ { │ if(b[sys0].type==98||b[sys0].type==116) @@ -824,11 +824,11 @@ │ + if(sys0>h3.maxval) │ + { │ + h3.val=h3.minval -│ + } +│ } │ + if(sys0h4.maxval) @@ -1072,6 +1072,25 @@ │ vis h5,1 │ }else │ { +│ @@ -891,18 +785,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt │ @@ -602,19 +602,19 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 34112d41..c845e023 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1047,25 +1047,27 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -25,15 +25,15 @@ -│ vis bEntity1,0 -│ vis bEntity2,0 -│ vis bEntity3,0 -│ vis bEntity4,0 -│ vis bEntity5,0 -│ vis bEntity6,0 -│ cardMedia.bco=defaultBcoColor -│ - for(sys0=0;sys0<52;sys0++) -│ + for(sys0=0;sys0<34;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ } -│ } +│ --- HMI/n2t-out/cardPower.txt +├── +++ HMI/US/portrait/n2t-out/cardPower.txt +│ @@ -891,18 +891,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt │ @@ -602,19 +602,19 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 5c503a01..b45ee337 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-23 17:04:15.689928965 +0000 ++++ /dev/fd/62 2023-01-23 17:28:44.671366324 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -54,13 +54,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +186,26 @@ +e (string) type6 @@ -466,25 +466,27 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } -+I/n2t-out/cardMedia.txt -++ HMI/US/portrait/n2t-out/cardMedia.txt -+5 +25,15 @@ -+ vis bEntity1,0 -+ vis bEntity2,0 -+ vis bEntity3,0 -+ vis bEntity4,0 -+ vis bEntity5,0 -+ vis bEntity6,0 -+ cardMedia.bco=defaultBcoColor -+ for(sys0=0;sys0<52;sys0++) -+ for(sys0=0;sys0<34;sys0++) -+ { -+ if(b[sys0].type==98||b[sys0].type==116) -+ { -+ b[sys0].bco=defaultBcoColor -+ b[sys0].pco=defaultFontColor -+ } -+ } ++I/n2t-out/cardPower.txt +++ HMI/US/portrait/n2t-out/cardPower.txt ++18 +891,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") +I/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt +19 +602,19 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index c90d64f3..04e4f894 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -37,7 +37,7 @@ Page cardMedia vis bEntity5,0 vis bEntity6,0 cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<34;sys0++) + for(sys0=0;sys0<54;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 98188464..01c43a50 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 @@ -50,6 +50,10 @@ cardThermo 57 Component(s) 532 Line(s) of event code 315 Unique line(s) of event code +cardMedia + 59 Component(s) + 641 Line(s) of event code + 318 Unique line(s) of event code cardChart 33 Component(s) 429 Line(s) of event code @@ -58,10 +62,6 @@ cardLChart 33 Component(s) 408 Line(s) of event code 268 Unique line(s) of event code -cardMedia - 59 Component(s) - 641 Line(s) of event code - 318 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code @@ -87,4 +87,4 @@ Total 20 Page(s) 747 Component(s) 9231 Line(s) of event code - 2382 Unique line(s) of event code + 2383 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 6e9c51c4..6db7cb92 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -29,7 +29,7 @@ Page cardMedia vis bEntity5,0 vis bEntity6,0 cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<34;sys0++) + for(sys0=0;sys0<54;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index b0cd5f6a..99b5dbf2 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -37,7 +37,7 @@ Page cardMedia vis bEntity5,0 vis bEntity6,0 cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<52;sys0++) + for(sys0=0;sys0<54;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index 2736e913..9f1c0a91 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1463,6 +1463,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 839c9cf5..cf894264 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -30,10 +30,10 @@ pageTest 26 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code -cardMedia - 59 Component(s) - 641 Line(s) of event code - 318 Unique line(s) of event code +cardPower + 48 Component(s) + 487 Line(s) of event code + 326 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -62,10 +62,10 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code -cardPower - 48 Component(s) - 483 Line(s) of event code - 324 Unique line(s) of event code +cardMedia + 59 Component(s) + 641 Line(s) of event code + 318 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 737 Component(s) - 8820 Line(s) of event code + 8824 Line(s) of event code 2271 Unique line(s) of event code diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index cf1c1763..6db7cb92 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -29,7 +29,7 @@ Page cardMedia vis bEntity5,0 vis bEntity6,0 cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<52;sys0++) + for(sys0=0;sys0<54;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index 99e977d4..adea13c4 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -895,6 +895,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") {