From eba3b0d9138df245a76ccf1f18b385cec3de8f72 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 4 Feb 2023 08:43:22 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 92 ++++++++++++------- HMI/US/portrait/diff-eu-version.txt | 36 -------- HMI/US/portrait/diff-filtered.txt | 52 ++--------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 12 +-- .../portrait/n2t-out-visual/screensaver.txt | 67 +++++++------- HMI/US/portrait/n2t-out/screensaver.txt | 37 ++++---- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +- HMI/n2t-out-visual/screensaver.txt | 43 +++++---- HMI/n2t-out/screensaver.txt | 43 +++++---- 9 files changed, 173 insertions(+), 217 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 39bbf2f3..10cc1423 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1037,39 +1037,63 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -494,15 +470,15 @@ -│ if(tTmp.txt!="") +│ @@ -590,42 +566,39 @@ +│ //tMainTextAlt2 +│ spstr strCommand.txt,tMainTextAlt2.txt,"~",36 +│ //tMainIconAlt2 +│ spstr strCommand.txt,tMainIconAlt2.txt,"~",33 +│ //tMainIconAlt2 Color +│ spstr strCommand.txt,tTmp.txt,"~",34 +│ covx tTmp.txt,tMainIconAlt2.pco,0,0 +│ - if(tMainTextAlt2.txt!="") +│ + if(tMainTextAlt2.txt!=""&&p0.w!=320) │ { -│ covx tTmp.txt,defaultFontColor,0,0 -│ } -│ } -│ if(tInstruction.txt=="time") -│ { -│ - click m0,1 -│ + //click m0,1 -│ //get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 -│ if(tAMPM.txt=="") +│ //value for tMRIcon, activate alternative layout +│ vis tMainIcon,0 +│ vis tMainText,0 +│ vis tMainTextAlt,1 +│ vis tMainIconAlt,1 +│ vis tMainTextAlt2,1 +│ vis tMainIconAlt2,1 +│ - if(p0.w!=320) +│ - { +│ - vis tForecast1,0 +│ - vis tF1Icon,0 +│ - vis tForecast1Val,0 +│ - //move forecast values to the right +│ - tForecast4.txt=tForecast3.txt +│ - tForecast3.txt=tForecast2.txt +│ - tForecast2.txt=tForecast1.txt +│ - tForecast4Val.txt=tForecast3Val.txt +│ - tForecast3Val.txt=tForecast2Val.txt +│ - tForecast2Val.txt=tForecast1Val.txt +│ - tF4Icon.txt=tF3Icon.txt +│ - tF3Icon.txt=tF2Icon.txt +│ - tF2Icon.txt=tF1Icon.txt +│ - tF4Icon.pco=tF3Icon.pco +│ - tF3Icon.pco=tF2Icon.pco +│ - tF2Icon.pco=tF1Icon.pco +│ - } +│ + vis tForecast1,0 +│ + vis tF1Icon,0 +│ + vis tForecast1Val,0 +│ + //move forecast values to the right +│ + tForecast4.txt=tForecast3.txt +│ + tForecast3.txt=tForecast2.txt +│ + tForecast2.txt=tForecast1.txt +│ + tForecast4Val.txt=tForecast3Val.txt +│ + tForecast3Val.txt=tForecast2Val.txt +│ + tForecast2Val.txt=tForecast1Val.txt +│ + tF4Icon.txt=tF3Icon.txt +│ + tF3Icon.txt=tF2Icon.txt +│ + tF2Icon.txt=tF1Icon.txt +│ + tF4Icon.pco=tF3Icon.pco +│ + tF3Icon.pco=tF2Icon.pco +│ + tF2Icon.pco=tF1Icon.pco +│ }else │ { -│ vis tAMPM,0 -│ @@ -745,18 +721,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ vis tMainTextAlt2,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2cc14a65..4aee352a 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1918,39 +1918,3 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -494,15 +470,15 @@ -│ if(tTmp.txt!="") -│ { -│ covx tTmp.txt,defaultFontColor,0,0 -│ } -│ } -│ if(tInstruction.txt=="time") -│ { -│ - click m0,1 -│ + //click m0,1 -│ //get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 -│ if(tAMPM.txt=="") -│ { -│ vis tAMPM,0 -│ @@ -745,18 +721,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0a63818e..54b9d8cf 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-02-03 17:56:15.794899421 +0000 ++++ /dev/fd/62 2023-02-04 08:43:13.965206960 +0000 +le list + +14,8 @@ +n.txt @@ -667,13 +667,6 @@ + { + tmSleep.en=0 + } -+ } -+ if(tInstruction.txt=="pageType") -+ { -+ sleepValue=0 -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 +18 +616,14 @@ + { + page pageStartup @@ -1144,6 +1137,13 @@ + { + tmSleep.en=0 + } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 +18 +669,14 @@ + { + page pageStartup @@ -1303,39 +1303,3 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +470,15 @@ -+ if(tTmp.txt!="") -+ { -+ covx tTmp.txt,defaultFontColor,0,0 -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ click m0,1 -+ //click m0,1 -+ //get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -+ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 -+ if(tAMPM.txt=="") -+ { -+ vis tAMPM,0 -+18 +721,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid 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 5f21db72..ad3f781a 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 @@ -58,10 +58,6 @@ cardQR 34 Component(s) 402 Line(s) of event code 234 Unique line(s) of event code -screensaver - 46 Component(s) - 418 Line(s) of event code - 298 Unique line(s) of event code cardThermo 57 Component(s) 532 Line(s) of event code @@ -74,6 +70,10 @@ cardPower 54 Component(s) 489 Line(s) of event code 330 Unique line(s) of event code +screensaver + 46 Component(s) + 421 Line(s) of event code + 302 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 753 Component(s) - 9207 Line(s) of event code - 2393 Unique line(s) of event code + 9210 Line(s) of event code + 2395 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 685dfbc8..e0ecfcda 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -644,7 +644,7 @@ Text tMainIcon Send Component ID : disabled Opacity : 127 x coordinate : 125 - y coordinate : 261 + y coordinate : 260 Width : 70 Height : 65 Effect : load @@ -673,10 +673,10 @@ Text tMainIconAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 58 + x coordinate : 47 y coordinate : 257 - Width : 50 - Height : 50 + Width : 70 + Height : 65 Effect : load Effect Priority : 0 Effect Time : 300 @@ -703,10 +703,10 @@ Text tMainIconAlt2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 214 + x coordinate : 203 y coordinate : 257 - Width : 50 - Height : 50 + Width : 70 + Height : 65 Effect : load Effect Priority : 0 Effect Time : 300 @@ -763,9 +763,9 @@ Text tMainTextAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 30 - y coordinate : 314 - Width : 105 + x coordinate : 0 + y coordinate : 325 + Width : 160 Height : 50 Effect : load Effect Priority : 0 @@ -776,7 +776,7 @@ Text tMainTextAlt Font ID : 3 Back. Color : 0 Font Color : 65535 - Horizontal Alignment : left + Horizontal Alignment : center Vertical Alignment : center Input Type : character Text : @@ -793,9 +793,9 @@ Text tMainTextAlt2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 187 - y coordinate : 314 - Width : 105 + x coordinate : 160 + y coordinate : 325 + Width : 160 Height : 50 Effect : load Effect Priority : 0 @@ -806,7 +806,7 @@ Text tMainTextAlt2 Font ID : 3 Back. Color : 0 Font Color : 65535 - Horizontal Alignment : left + Horizontal Alignment : center Vertical Alignment : center Input Type : character Text : @@ -1143,7 +1143,7 @@ Timer tmSerial //tMainIconAlt2 Color spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,tMainIconAlt2.pco,0,0 - if(tMainTextAlt2.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!="") { //value for tMRIcon, activate alternative layout vis tMainIcon,0 @@ -1152,22 +1152,25 @@ Timer tmSerial vis tMainIconAlt,1 vis tMainTextAlt2,1 vis tMainIconAlt2,1 - vis tForecast1,0 - vis tF1Icon,0 - vis tForecast1Val,0 - //move forecast values to the right - tForecast4.txt=tForecast3.txt - tForecast3.txt=tForecast2.txt - tForecast2.txt=tForecast1.txt - tForecast4Val.txt=tForecast3Val.txt - tForecast3Val.txt=tForecast2Val.txt - tForecast2Val.txt=tForecast1Val.txt - tF4Icon.txt=tF3Icon.txt - tF3Icon.txt=tF2Icon.txt - tF2Icon.txt=tF1Icon.txt - tF4Icon.pco=tF3Icon.pco - tF3Icon.pco=tF2Icon.pco - tF2Icon.pco=tF1Icon.pco + if(p0.w!=320) + { + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + } }else { vis tMainIcon,1 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index c635e0b8..e850716b 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -570,7 +570,7 @@ Timer tmSerial //tMainIconAlt2 Color spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,tMainIconAlt2.pco,0,0 - if(tMainTextAlt2.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!="") { //value for tMRIcon, activate alternative layout vis tMainIcon,0 @@ -579,22 +579,25 @@ Timer tmSerial vis tMainIconAlt,1 vis tMainTextAlt2,1 vis tMainIconAlt2,1 - vis tForecast1,0 - vis tF1Icon,0 - vis tForecast1Val,0 - //move forecast values to the right - tForecast4.txt=tForecast3.txt - tForecast3.txt=tForecast2.txt - tForecast2.txt=tForecast1.txt - tForecast4Val.txt=tForecast3Val.txt - tForecast3Val.txt=tForecast2Val.txt - tForecast2Val.txt=tForecast1Val.txt - tF4Icon.txt=tF3Icon.txt - tF3Icon.txt=tF2Icon.txt - tF2Icon.txt=tF1Icon.txt - tF4Icon.pco=tF3Icon.pco - tF3Icon.pco=tF2Icon.pco - tF2Icon.pco=tF1Icon.pco + if(p0.w!=320) + { + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + } }else { vis tMainIcon,1 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 3303c845..99447301 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -80,8 +80,8 @@ popupTimer 255 Unique line(s) of event code screensaver 47 Component(s) - 432 Line(s) of event code - 308 Unique line(s) of event code + 430 Line(s) of event code + 309 Unique line(s) of event code cardPower 54 Component(s) 504 Line(s) of event code @@ -90,5 +90,5 @@ cardPower Total 21 Page(s) 802 Component(s) - 9261 Line(s) of event code - 2332 Unique line(s) of event code + 9259 Line(s) of event code + 2334 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 9307e0b5..0d9ba84f 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1091,7 +1091,7 @@ Timer tmSerial } if(tInstruction.txt=="time") { - click m0,1 + //click m0,1 //get set time to global variable spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -1187,7 +1187,7 @@ Timer tmSerial //tMainIconAlt2 Color spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,tMainIconAlt2.pco,0,0 - if(tMainTextAlt2.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!="") { //value for tMRIcon, activate alternative layout vis tMainIcon,0 @@ -1196,22 +1196,25 @@ Timer tmSerial vis tMainIconAlt,1 vis tMainTextAlt2,1 vis tMainIconAlt2,1 - vis tForecast1,0 - vis tF1Icon,0 - vis tForecast1Val,0 - //move forecast values to the right - tForecast4.txt=tForecast3.txt - tForecast3.txt=tForecast2.txt - tForecast2.txt=tForecast1.txt - tForecast4Val.txt=tForecast3Val.txt - tForecast3Val.txt=tForecast2Val.txt - tForecast2Val.txt=tForecast1Val.txt - tF4Icon.txt=tF3Icon.txt - tF3Icon.txt=tF2Icon.txt - tF2Icon.txt=tF1Icon.txt - tF4Icon.pco=tF3Icon.pco - tF3Icon.pco=tF2Icon.pco - tF2Icon.pco=tF1Icon.pco + if(p0.w!=320) + { + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + } }else { vis tMainIcon,1 @@ -1342,10 +1345,6 @@ Timer tmSerial { page screensaver } - if(tId.txt=="screensaver2") - { - page screensaver2 - } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 2d60daca..e2342e92 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -498,7 +498,7 @@ Timer tmSerial } if(tInstruction.txt=="time") { - click m0,1 + //click m0,1 //get set time to global variable spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -594,7 +594,7 @@ Timer tmSerial //tMainIconAlt2 Color spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,tMainIconAlt2.pco,0,0 - if(tMainTextAlt2.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!="") { //value for tMRIcon, activate alternative layout vis tMainIcon,0 @@ -603,22 +603,25 @@ Timer tmSerial vis tMainIconAlt,1 vis tMainTextAlt2,1 vis tMainIconAlt2,1 - vis tForecast1,0 - vis tF1Icon,0 - vis tForecast1Val,0 - //move forecast values to the right - tForecast4.txt=tForecast3.txt - tForecast3.txt=tForecast2.txt - tForecast2.txt=tForecast1.txt - tForecast4Val.txt=tForecast3Val.txt - tForecast3Val.txt=tForecast2Val.txt - tForecast2Val.txt=tForecast1Val.txt - tF4Icon.txt=tF3Icon.txt - tF3Icon.txt=tF2Icon.txt - tF2Icon.txt=tF1Icon.txt - tF4Icon.pco=tF3Icon.pco - tF3Icon.pco=tF2Icon.pco - tF2Icon.pco=tF1Icon.pco + if(p0.w!=320) + { + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + } }else { vis tMainIcon,1 @@ -749,10 +752,6 @@ Timer tmSerial { page screensaver } - if(tId.txt=="screensaver2") - { - page screensaver2 - } if(tId.txt=="cardEntities") { page cardEntities