mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-11 23:57:42 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
30a96f3571
commit
acb18db3f0
@@ -2193,7 +2193,7 @@
|
||||
│ }
|
||||
│ --- HMI/n2t-out/screensaver.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
|
||||
│ @@ -29,29 +29,20 @@
|
||||
│ @@ -29,28 +29,19 @@
|
||||
│ }
|
||||
│ tDate.txt=pageIcons.vaDate.txt
|
||||
│ dim=dimValue
|
||||
@@ -2208,21 +2208,21 @@
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ Max. Text Size: 200
|
||||
│
|
||||
│ - Max. Text Size: 400
|
||||
│ -
|
||||
│ -Variable (string) strTmp
|
||||
│ - Attributes
|
||||
│ - Scope : local
|
||||
│ - Text :
|
||||
│ - Max. Text Size: 2
|
||||
│ -
|
||||
│ + Max. Text Size: 200
|
||||
│
|
||||
│ Variable (string) tId
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ Max. Text Size: 25
|
||||
│
|
||||
│ Variable (string) tInstruction
|
||||
│ @@ -103,35 +94,14 @@
|
||||
│ Value: 0
|
||||
│
|
||||
@@ -2259,7 +2259,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -294,55 +264,65 @@
|
||||
│ @@ -294,65 +264,65 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -2289,7 +2289,7 @@
|
||||
│ Text :
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
│ -Text tMainText
|
||||
│ -Text tMainIconAlt2
|
||||
│ +Text tMainIcon
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -2300,17 +2300,18 @@
|
||||
│ Text :
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
│ -Text tMainTextAlt
|
||||
│ -Text tMainText
|
||||
│ +Text tMainIconAlt
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 10
|
||||
│ +
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ Text :
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
│ -Text tMainTextAlt
|
||||
│ +Text tMainText
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -2330,23 +2331,60 @@
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ Text :
|
||||
│ @@ -456,15 +436,14 @@
|
||||
│ {
|
||||
│ // crc is okay
|
||||
│ @@ -468,14 +438,15 @@
|
||||
│ // here is the location where acual code should be
|
||||
│ // write command to variable strCommand
|
||||
│ ucopy strCommand.txt,4,payloadLength-5,0
|
||||
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||
│ spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
│ - click m0,1
|
||||
│ if(tInstruction.txt=="wake")
|
||||
│ {
|
||||
│ //dim=100
|
||||
│ + //dim=100
|
||||
│ click tc0,1
|
||||
│ }
|
||||
│ if(tInstruction.txt=="dimmode")
|
||||
│ {
|
||||
│ @@ -537,15 +516,16 @@
|
||||
│ // get value
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ covx tTmp.txt,dimValue,0,0
|
||||
│ @@ -494,15 +465,14 @@
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
│ covx tTmp.txt,defaultFontColor,0,0
|
||||
│ }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="time")
|
||||
│ {
|
||||
│ - 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
|
||||
│ @@ -513,14 +483,20 @@
|
||||
│ }
|
||||
│ if(tInstruction.txt=="date")
|
||||
│ {
|
||||
│ //get set date to global variable
|
||||
│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
|
||||
│ tDate.txt=pageIcons.vaDate.txt
|
||||
│ }
|
||||
│ + if(tInstruction.txt=="timeout")
|
||||
│ + {
|
||||
│ + //set timeout to global var
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ + covx tTmp.txt,sleepTimeout,0,0
|
||||
│ + }
|
||||
│ if(tInstruction.txt=="statusUpdate")
|
||||
│ {
|
||||
│ //statusIcon1
|
||||
│ spstr strCommand.txt,tIcon1.txt,"~",1
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",2
|
||||
│ covx tTmp.txt,tIcon1.pco,0,0
|
||||
│ //statusIcon2
|
||||
│ @@ -540,109 +516,109 @@
|
||||
│ }
|
||||
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
│ {
|
||||
@@ -2355,25 +2393,77 @@
|
||||
│ vis tMainText,1
|
||||
│ vis tMainTextAlt,0
|
||||
│ - vis tMainTextAlt2,0
|
||||
│ - vis tMainIconAlt2,0
|
||||
│ + vis tMRIcon,0
|
||||
│ + vis tMR,0
|
||||
│ //tMainIcon
|
||||
│ spstr strCommand.txt,tMainIcon.txt,"~",1
|
||||
│ - spstr strCommand.txt,tMainIcon.txt,"~",3
|
||||
│ + spstr strCommand.txt,tMainIcon.txt,"~",1
|
||||
│ tMainIconAlt.txt=tMainIcon.txt
|
||||
│ - //tMainIcon Color
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",4
|
||||
│ - covx tTmp.txt,tMainIcon.pco,0,0
|
||||
│ - tMainIconAlt.pco=tMainIcon.pco
|
||||
│ //tMainText
|
||||
│ spstr strCommand.txt,tMainText.txt,"~",2
|
||||
│ - spstr strCommand.txt,tMainText.txt,"~",6
|
||||
│ + spstr strCommand.txt,tMainText.txt,"~",2
|
||||
│ tMainTextAlt.txt=tMainText.txt
|
||||
│ //tForecast1
|
||||
│ @@ -569,53 +549,76 @@
|
||||
│ - spstr strCommand.txt,tForecast1.txt,"~",11
|
||||
│ + spstr strCommand.txt,tForecast1.txt,"~",3
|
||||
│ //tF1Icon
|
||||
│ - spstr strCommand.txt,tF1Icon.txt,"~",9
|
||||
│ - //tF1Icon Color
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",10
|
||||
│ - covx tTmp.txt,tF1Icon.pco,0,0
|
||||
│ + spstr strCommand.txt,tF1Icon.txt,"~",4
|
||||
│ //tForecast1Val
|
||||
│ - spstr strCommand.txt,tForecast1Val.txt,"~",12
|
||||
│ + spstr strCommand.txt,tForecast1Val.txt,"~",5
|
||||
│ //tForecast2
|
||||
│ - spstr strCommand.txt,tForecast2.txt,"~",17
|
||||
│ + spstr strCommand.txt,tForecast2.txt,"~",6
|
||||
│ //tF2Icon
|
||||
│ - spstr strCommand.txt,tF2Icon.txt,"~",15
|
||||
│ - //tF2Icon Color
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",16
|
||||
│ - covx tTmp.txt,tF2Icon.pco,0,0
|
||||
│ + spstr strCommand.txt,tF2Icon.txt,"~",7
|
||||
│ //tForecast2Val
|
||||
│ - spstr strCommand.txt,tForecast2Val.txt,"~",18
|
||||
│ + spstr strCommand.txt,tForecast2Val.txt,"~",8
|
||||
│ //tForecast3
|
||||
│ - spstr strCommand.txt,tForecast3.txt,"~",23
|
||||
│ + spstr strCommand.txt,tForecast3.txt,"~",9
|
||||
│ //tF3Icon
|
||||
│ - spstr strCommand.txt,tF3Icon.txt,"~",21
|
||||
│ - //tF3Icon Color
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ - covx tTmp.txt,tF3Icon.pco,0,0
|
||||
│ + spstr strCommand.txt,tF3Icon.txt,"~",10
|
||||
│ //tForecast3Val
|
||||
│ - spstr strCommand.txt,tForecast3Val.txt,"~",24
|
||||
│ + spstr strCommand.txt,tForecast3Val.txt,"~",11
|
||||
│ //tForecast4
|
||||
│ spstr strCommand.txt,tForecast4.txt,"~",12
|
||||
│ - spstr strCommand.txt,tForecast4.txt,"~",29
|
||||
│ + spstr strCommand.txt,tForecast4.txt,"~",12
|
||||
│ //tF4Icon
|
||||
│ spstr strCommand.txt,tF4Icon.txt,"~",13
|
||||
│ - spstr strCommand.txt,tF4Icon.txt,"~",27
|
||||
│ - //tF4Icon Color
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",28
|
||||
│ - covx tTmp.txt,tF4Icon.pco,0,0
|
||||
│ + spstr strCommand.txt,tF4Icon.txt,"~",13
|
||||
│ //tForecast4Val
|
||||
│ spstr strCommand.txt,tForecast4Val.txt,"~",14
|
||||
│ - spstr strCommand.txt,tForecast4Val.txt,"~",30
|
||||
│ + spstr strCommand.txt,tForecast4Val.txt,"~",14
|
||||
│ //alternative layout
|
||||
│ - //tMainTextAlt2
|
||||
│ - spstr strCommand.txt,tMainTextAlt2.txt,"~",15
|
||||
│ - 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!=""&&p0.w!=320)
|
||||
│ + //tMRIcon
|
||||
│ + spstr strCommand.txt,tMRIcon.txt,"~",15
|
||||
@@ -2385,6 +2475,7 @@
|
||||
│ vis tMainTextAlt,1
|
||||
│ vis tMainIconAlt,1
|
||||
│ - vis tMainTextAlt2,1
|
||||
│ - vis tMainIconAlt2,1
|
||||
│ + vis tMRIcon,1
|
||||
│ + vis tMR,1
|
||||
│ vis tForecast1,0
|
||||
@@ -2436,6 +2527,7 @@
|
||||
│ tMainIconAlt.bco=tTime.bco
|
||||
│ tMainTextAlt.bco=tTime.bco
|
||||
│ - tMainTextAlt2.bco=tTime.bco
|
||||
│ - tMainIconAlt2.bco=tTime.bco
|
||||
│ + tMRIcon.bco=tTime.bco
|
||||
│ + tMR.bco=tTime.bco
|
||||
│ + tMRIcon.bco=tTime.bco
|
||||
@@ -2446,28 +2538,95 @@
|
||||
│ tF1Icon.bco=tTime.bco
|
||||
│ tForecast2.bco=tTime.bco
|
||||
│ tForecast2Val.bco=tTime.bco
|
||||
│ @@ -663,20 +666,20 @@
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",17
|
||||
│ covx tTmp.txt,tForecast3Val.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",18
|
||||
│ covx tTmp.txt,tForecast4Val.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",19
|
||||
│ covx tTmp.txt,t10.bco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",20
|
||||
│ @@ -658,42 +634,56 @@
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",2
|
||||
│ covx tTmp.txt,tTime.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",3
|
||||
│ covx tTmp.txt,tAMPM.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",4
|
||||
│ covx tTmp.txt,tDate.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",5
|
||||
│ + covx tTmp.txt,tMainIcon.pco,0,0
|
||||
│ + tMainIconAlt.pco=tMainIcon.pco
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",6
|
||||
│ covx tTmp.txt,tMainText.pco,0,0
|
||||
│ tMainTextAlt.pco=tMainText.pco
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",6
|
||||
│ - covx tTmp.txt,tForecast1.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",7
|
||||
│ - covx tTmp.txt,tForecast2.pco,0,0
|
||||
│ + covx tTmp.txt,tForecast1.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",8
|
||||
│ - covx tTmp.txt,tForecast3.pco,0,0
|
||||
│ + covx tTmp.txt,tForecast2.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",9
|
||||
│ - covx tTmp.txt,tForecast4.pco,0,0
|
||||
│ + covx tTmp.txt,tForecast3.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",10
|
||||
│ - covx tTmp.txt,tForecast1Val.pco,0,0
|
||||
│ + covx tTmp.txt,tForecast4.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",11
|
||||
│ - covx tTmp.txt,tForecast2Val.pco,0,0
|
||||
│ + covx tTmp.txt,tF1Icon.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",12
|
||||
│ - covx tTmp.txt,tForecast3Val.pco,0,0
|
||||
│ + covx tTmp.txt,tF2Icon.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",13
|
||||
│ - covx tTmp.txt,tForecast4Val.pco,0,0
|
||||
│ + covx tTmp.txt,tF3Icon.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",14
|
||||
│ - covx tTmp.txt,t10.bco,0,0
|
||||
│ + covx tTmp.txt,tF4Icon.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",15
|
||||
│ - covx tTmp.txt,tMainTextAlt2.pco,0,0
|
||||
│ - //spstr strCommand.txt,tTmp.txt,"~",21
|
||||
│ - //spstr strCommand.txt,tTmp.txt,"~",16
|
||||
│ - //covx tTmp.txt,tMR.pco,0,0
|
||||
│ + covx tTmp.txt,tForecast1Val.pco,0,0
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",16
|
||||
│ + covx tTmp.txt,tForecast2Val.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",17
|
||||
│ + covx tTmp.txt,tForecast3Val.pco,0,0
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",18
|
||||
│ + covx tTmp.txt,tForecast4Val.pco,0,0
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",19
|
||||
│ + covx tTmp.txt,t10.bco,0,0
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",20
|
||||
│ + covx tTmp.txt,tMRIcon.pco,0,0
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",21
|
||||
│ + covx tTmp.txt,tMR.pco,0,0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ covx tTmp.txt,tTimeAdd.pco,0,0
|
||||
│ - if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||
│ + if(tMRIcon.txt!=""&&p0.w!=320)
|
||||
│ {
|
||||
│ tF4Icon.pco=tF3Icon.pco
|
||||
│ tF3Icon.pco=tF2Icon.pco
|
||||
│ tF2Icon.pco=tF1Icon.pco
|
||||
│ + tF4Icon.pco=tF3Icon.pco
|
||||
│ + tF3Icon.pco=tF2Icon.pco
|
||||
│ + tF2Icon.pco=tF1Icon.pco
|
||||
│ tForecast4Val.pco=tForecast3Val.pco
|
||||
│ tForecast3Val.pco=tForecast2Val.pco
|
||||
│ tForecast2Val.pco=tForecast1Val.pco
|
||||
│ tForecast4.pco=tForecast3.pco
|
||||
│ tForecast3.pco=tForecast2.pco
|
||||
│ tForecast2.pco=tForecast1.pco
|
||||
│ }
|
||||
│ @@ -789,20 +779,14 @@
|
||||
│ page cardPower
|
||||
│ }
|
||||
│ if(tId.txt=="cardChart")
|
||||
│ {
|
||||
│ page cardChart
|
||||
│ }
|
||||
│ }
|
||||
│ - if(tInstruction.txt=="timeout")
|
||||
│ - {
|
||||
│ - //set timeout to global var
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ - covx tTmp.txt,sleepTimeout,0,0
|
||||
│ - }
|
||||
│ // end of user code
|
||||
│ udelete payloadLength-1
|
||||
│ bufferPos=0
|
||||
│ }
|
||||
│ }
|
||||
│ }
|
||||
│ }
|
||||
|
||||
Reference in New Issue
Block a user