From 193546d1ed5b77e724f6951e3374fcbffd051ba0 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 25 Feb 2024 11:03:17 +0000 Subject: [PATCH] fixes #1179 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 19 ------------------- HMI/US/portrait/diff-eu-version.txt | 19 ------------------- HMI/US/portrait/diff-filtered.txt | 21 +-------------------- HMI/n2t-out-visual/nspanel_Stats.txt | 10 +++++----- HMI/n2t-out-visual/screensaver2.txt | 4 ++++ HMI/n2t-out/screensaver2.txt | 4 ++++ 6 files changed, 14 insertions(+), 63 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 26794cc3..cabe3fd0 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -543,22 +543,3 @@ │ spstr strCommand.txt,tNotifyText.txt,"~",2 │ if(tNotifyHead.txt!=""||tNotifyText.txt!="") │ { -│ @@ -952,14 +812,18 @@ -│ { -│ 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 95a3919c..3ba10e42 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2486,22 +2486,3 @@ │ spstr strCommand.txt,tNotifyText.txt,"~",2 │ if(tNotifyHead.txt!=""||tNotifyText.txt!="") │ { -│ @@ -952,14 +800,18 @@ -│ { -│ 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 dea1f8ea..8b16ef69 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2024-02-25 10:48:00.364779879 +0000 ++++ /dev/fd/62 2024-02-25 11:03:09.634837907 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -2028,22 +2028,3 @@ + spstr strCommand.txt,tNotifyText.txt,"~",2 + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { -+14 +800,18 @@ -+ { -+ 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 4d04ffa5..d03330b0 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -66,10 +66,6 @@ cardThermo 57 Component(s) 550 Line(s) of event code 320 Unique line(s) of event code -screensaver2 - 64 Component(s) - 424 Line(s) of event code - 264 Unique line(s) of event code popupInSel 34 Component(s) 621 Line(s) of event code @@ -90,6 +86,10 @@ popupThermo 44 Component(s) 523 Line(s) of event code 276 Unique line(s) of event code +screensaver2 + 64 Component(s) + 428 Line(s) of event code + 266 Unique line(s) of event code cardEntities 67 Component(s) 1205 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 881 Component(s) - 10774 Line(s) of event code + 10778 Line(s) of event code 2466 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt index f555bdb2..7494ef35 100644 --- a/HMI/n2t-out-visual/screensaver2.txt +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -1794,6 +1794,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 c4105037..7b806ffd 100644 --- a/HMI/n2t-out/screensaver2.txt +++ b/HMI/n2t-out/screensaver2.txt @@ -956,6 +956,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") {