From 75d652e402c89a301160c99d3e011f44eea3b4af Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 23 Jun 2023 18:14:55 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 19 +++++++++++++++ HMI/US/portrait/diff-eu-version.txt | 19 +++++++++++++++ HMI/US/portrait/diff-filtered.txt | 35 +++++++++++++++++++++------- HMI/n2t-out-visual/nspanel_Stats.txt | 10 ++++---- HMI/n2t-out-visual/screensaver2.txt | 4 ++++ HMI/n2t-out/screensaver2.txt | 4 ++++ 6 files changed, 78 insertions(+), 13 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 03337f12..55a1274d 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -268,3 +268,22 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 +│ @@ -824,18 +800,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5c337b29..5af43d85 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1842,3 +1842,22 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 +│ @@ -824,18 +800,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index ebb8a9ec..3c380e18 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-06-01 14:52:47.691403479 +0000 ++++ /dev/fd/62 2023-06-23 18:14:46.258673287 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,11 @@ @@ -586,13 +586,6 @@ + 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 +6 +25,28 @@ @@ -850,6 +843,13 @@ + 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 @@ @@ -1380,3 +1380,22 @@ + if(tAMPM.txt=="") + { + vis tAMPM,0 ++18 +800,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="timeout") ++ { ++ //set timeout to global var ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,sleepTimeout,0,0 ++ } diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f6315820..d099e6e6 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -50,6 +50,10 @@ cardChart 33 Component(s) 437 Line(s) of event code 296 Unique line(s) of event code +screensaver2 + 59 Component(s) + 362 Line(s) of event code + 255 Unique line(s) of event code cardAlarm 43 Component(s) 500 Line(s) of event code @@ -62,10 +66,6 @@ cardThermo 57 Component(s) 540 Line(s) of event code 319 Unique line(s) of event code -screensaver2 - 59 Component(s) - 358 Line(s) of event code - 253 Unique line(s) of event code cardMedia 59 Component(s) 649 Line(s) of event code @@ -94,5 +94,5 @@ cardEntities Total 22 Page(s) 850 Component(s) - 9944 Line(s) of event code + 9948 Line(s) of event code 2385 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt index 15978e51..3d825e69 100644 --- a/HMI/n2t-out-visual/screensaver2.txt +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -1661,6 +1661,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/screensaver2.txt b/HMI/n2t-out/screensaver2.txt index 9f5f5323..e902af87 100644 --- a/HMI/n2t-out/screensaver2.txt +++ b/HMI/n2t-out/screensaver2.txt @@ -828,6 +828,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") {