From 49668a739b39c3f5e8f88b9c3ac4251cc3b2fd77 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Mon, 23 Jan 2023 17:04:24 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 31 ++++++++++++------- HMI/US/portrait/diff-filtered.txt | 2 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 +++--- .../portrait/n2t-out-visual/screensaver.txt | 14 +++++---- HMI/US/portrait/n2t-out/screensaver.txt | 14 +++++---- HMI/n2t-out-visual/nspanel_Stats.txt | 4 +-- HMI/n2t-out-visual/screensaver.txt | 14 +++++---- HMI/n2t-out/screensaver.txt | 14 +++++---- 8 files changed, 60 insertions(+), 43 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e9c676e6..5fccdd4d 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1399,16 +1399,18 @@ │ spstr strCommand.txt,tTmp.txt,"~",2 │ covx tTmp.txt,tIcon1.pco,0,0 │ //statusIcon2 -│ @@ -540,95 +522,91 @@ +│ @@ -536,101 +518,95 @@ +│ if(tTmp.txt!="") +│ { +│ tIcon2.font=3 +│ } │ } │ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ { -│ vis tMainIcon,1 -│ vis tMainIconAlt,0 -│ vis tMainText,1 -│ vis tMainTextAlt,0 -│ - vis tMainTextAlt2,0 -│ - vis tMainIconAlt2,0 +│ + vis tMainIcon,1 +│ + vis tMainIconAlt,0 +│ + vis tMainText,1 +│ + vis tMainTextAlt,0 │ + vis tMRIcon,0 │ + vis tMR,0 │ //tMainIcon @@ -1509,6 +1511,7 @@ │ - tF4Icon.pco=tF3Icon.pco │ - tF3Icon.pco=tF2Icon.pco │ - tF2Icon.pco=tF1Icon.pco +│ - }else │ + } │ + //tMR │ + spstr strCommand.txt,tMR.txt,"~",16 @@ -1527,7 +1530,13 @@ │ + } │ + spstr strCommand.txt,tTmp.txt,"~",22 │ + if(tTmp.txt!="") -│ + { +│ { +│ - vis tMainIcon,1 +│ - vis tMainIconAlt,0 +│ - vis tMainText,1 +│ - vis tMainTextAlt,0 +│ - vis tMainTextAlt2,0 +│ - vis tMainIconAlt2,0 │ + tIcon2.font=3 │ } │ } @@ -1536,7 +1545,7 @@ │ spstr strCommand.txt,tTmp.txt,"~",1 │ covx tTmp.txt,tTime.bco,0,0 │ if(tTime.bco!=screensaver.bco) -│ @@ -636,16 +614,17 @@ +│ @@ -638,16 +614,17 @@ │ screensaver.bco=tTime.bco │ tAMPM.bco=tTime.bco │ tDate.bco=tTime.bco @@ -1556,7 +1565,7 @@ │ tF1Icon.bco=tTime.bco │ tForecast2.bco=tTime.bco │ tForecast2Val.bco=tTime.bco -│ @@ -661,42 +640,56 @@ +│ @@ -663,42 +640,56 @@ │ spstr strCommand.txt,tTmp.txt,"~",2 │ covx tTmp.txt,tTime.pco,0,0 │ spstr strCommand.txt,tTmp.txt,"~",3 @@ -1627,7 +1636,7 @@ │ tForecast3.pco=tForecast2.pco │ tForecast2.pco=tForecast1.pco │ } -│ @@ -791,24 +784,14 @@ +│ @@ -793,24 +784,14 @@ │ { │ page cardPower │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c127995c..5c503a01 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 16:53:32.157856011 +0000 ++++ /dev/fd/62 2023-01-23 17:04:15.689928965 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt 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 2e5dcd17..98188464 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 @@ -26,6 +26,10 @@ cardQR 34 Component(s) 402 Line(s) of event code 234 Unique line(s) of event code +screensaver + 46 Component(s) + 419 Line(s) of event code + 300 Unique line(s) of event code pageStartup 19 Component(s) 200 Line(s) of event code @@ -46,10 +50,6 @@ cardThermo 57 Component(s) 532 Line(s) of event code 315 Unique line(s) of event code -screensaver - 46 Component(s) - 417 Line(s) of event code - 300 Unique line(s) of event code cardChart 33 Component(s) 429 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 747 Component(s) - 9229 Line(s) of event code + 9231 Line(s) of event code 2382 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 743ce970..1730d9d3 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1089,12 +1089,6 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMainTextAlt2,0 - vis tMainIconAlt2,0 //tMainIcon spstr strCommand.txt,tMainIcon.txt,"~",3 tMainIconAlt.txt=tMainIcon.txt @@ -1174,6 +1168,14 @@ Timer tmSerial tF4Icon.pco=tF3Icon.pco tF3Icon.pco=tF2Icon.pco tF2Icon.pco=tF1Icon.pco + }else + { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMainTextAlt2,0 + vis tMainIconAlt2,0 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index cf91bb30..ea549132 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -516,12 +516,6 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMainTextAlt2,0 - vis tMainIconAlt2,0 //tMainIcon spstr strCommand.txt,tMainIcon.txt,"~",3 tMainIconAlt.txt=tMainIcon.txt @@ -601,6 +595,14 @@ Timer tmSerial tF4Icon.pco=tF3Icon.pco tF3Icon.pco=tF2Icon.pco tF2Icon.pco=tF1Icon.pco + }else + { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMainTextAlt2,0 + vis tMainIconAlt2,0 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5eb2fb21..839c9cf5 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -48,7 +48,7 @@ cardAlarm 269 Unique line(s) of event code screensaver 47 Component(s) - 426 Line(s) of event code + 428 Line(s) of event code 307 Unique line(s) of event code popupInSel 34 Component(s) @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 737 Component(s) - 8818 Line(s) of event code + 8820 Line(s) of event code 2271 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index b8e27b44..864708a2 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1133,12 +1133,6 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMainTextAlt2,0 - vis tMainIconAlt2,0 //tMainIcon spstr strCommand.txt,tMainIcon.txt,"~",3 tMainIconAlt.txt=tMainIcon.txt @@ -1218,6 +1212,14 @@ Timer tmSerial tF4Icon.pco=tF3Icon.pco tF3Icon.pco=tF2Icon.pco tF2Icon.pco=tF1Icon.pco + }else + { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMainTextAlt2,0 + vis tMainIconAlt2,0 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 144f861d..3162871a 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -540,12 +540,6 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMainTextAlt2,0 - vis tMainIconAlt2,0 //tMainIcon spstr strCommand.txt,tMainIcon.txt,"~",3 tMainIconAlt.txt=tMainIcon.txt @@ -625,6 +619,14 @@ Timer tmSerial tF4Icon.pco=tF3Icon.pco tF3Icon.pco=tF2Icon.pco tF2Icon.pco=tF1Icon.pco + }else + { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMainTextAlt2,0 + vis tMainIconAlt2,0 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")