mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-21 13:44:45 +01:00
sync (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
495bd5e8e9
commit
e20a453b64
@@ -32,25 +32,6 @@
|
||||
│ crcputs sys0,2
|
||||
│ crcputs tSend.txt,0
|
||||
│ //send cmd
|
||||
│ @@ -320,18 +320,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
|
||||
│ --- HMI/n2t-out/screensaver.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
@@ -107,85 +88,6 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -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)
|
||||
│ {
|
||||
│ //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 tMainIcon,1
|
||||
│ vis tMainIconAlt,0
|
||||
│ vis tMainText,1
|
||||
│ vis tMainTextAlt,0
|
||||
│ vis tMainTextAlt2,0
|
||||
│ @@ -748,14 +721,18 @@
|
||||
│ {
|
||||
│ 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
|
||||
│ --- HMI/n2t-out/screensaver2.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
|
||||
Reference in New Issue
Block a user