mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-22 22:18:38 +01:00
sync (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
0090b1c92b
commit
ed5ec37ff3
@@ -353,71 +353,6 @@
|
||||
│ crcputs sys0,2
|
||||
│ crcputs tSend.txt,0
|
||||
│ //send cmd
|
||||
│ @@ -306,52 +306,47 @@
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",2
|
||||
│ //save third arg if there's one
|
||||
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
|
||||
│ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
|
||||
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
│ udelete payloadLength-1
|
||||
│ bufferPos=0
|
||||
│ - if(tId.txt=="pageStartup")
|
||||
│ + if(tId.txt=="cardThermo")
|
||||
│ {
|
||||
│ - page pageStartup
|
||||
│ + page cardThermo
|
||||
│ }
|
||||
│ if(tId.txt=="screensaver")
|
||||
│ {
|
||||
│ page screensaver
|
||||
│ }
|
||||
│ - if(tId.txt=="cardEntities")
|
||||
│ - {
|
||||
│ - page cardEntities
|
||||
│ - }
|
||||
│ - if(tId.txt=="cardGrid")
|
||||
│ - {
|
||||
│ - page cardGrid
|
||||
│ - }
|
||||
│ if(tId.txt=="popupLight")
|
||||
│ {
|
||||
│ pageIcons.tTmp1.txt=tTmp.txt
|
||||
│ page popupLight
|
||||
│ }
|
||||
│ - if(tId.txt=="popupShutter")
|
||||
│ + if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ - pageIcons.tTmp1.txt=tTmp.txt
|
||||
│ - page popupShutter
|
||||
│ + page cardEntities
|
||||
│ }
|
||||
│ - if(tId.txt=="popupNotify")
|
||||
│ + if(tId.txt=="pageStartup")
|
||||
│ {
|
||||
│ - page popupNotify
|
||||
│ + page pageStartup
|
||||
│ }
|
||||
│ - if(tId.txt=="cardThermo")
|
||||
│ + if(tId.txt=="popupNotify")
|
||||
│ {
|
||||
│ - page cardThermo
|
||||
│ + page popupNotify
|
||||
│ }
|
||||
│ if(tId.txt=="cardMedia")
|
||||
│ {
|
||||
│ page cardMedia
|
||||
│ }
|
||||
│ + if(tId.txt=="cardGrid")
|
||||
│ + {
|
||||
│ + page cardGrid
|
||||
│ + }
|
||||
│ if(tId.txt=="cardAlarm")
|
||||
│ {
|
||||
│ page cardAlarm
|
||||
│ }
|
||||
│ if(tId.txt=="cardQR")
|
||||
│ {
|
||||
│ page cardQR
|
||||
├── screensaver.txt
|
||||
│ @@ -252,25 +252,25 @@
|
||||
│ Attributes
|
||||
@@ -464,90 +399,3 @@
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ @@ -474,16 +474,14 @@
|
||||
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
|
||||
│ if(tAMPM.txt=="")
|
||||
│ {
|
||||
│ vis tAMPM,0
|
||||
│ }
|
||||
│ spstr strCommand.txt,tTimeAdd.txt,"~",2
|
||||
│ - ref tIcon1
|
||||
│ - ref tIcon2
|
||||
│ }
|
||||
│ if(tInstruction.txt=="date")
|
||||
│ {
|
||||
│ //get set date to global variable
|
||||
│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
|
||||
│ tDate.txt=pageIcons.vaDate.txt
|
||||
│ }
|
||||
│ @@ -691,53 +689,48 @@
|
||||
│ spstr strCommand.txt,tId.txt,"~",1
|
||||
│ //save second arg if there's one
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",2
|
||||
│ //save third arg if there's one
|
||||
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
|
||||
│ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
|
||||
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
│ - udelete payloadLength-1
|
||||
│ + udelete u[2]+3
|
||||
│ bufferPos=0
|
||||
│ - if(tId.txt=="pageStartup")
|
||||
│ - {
|
||||
│ - page pageStartup
|
||||
│ - }
|
||||
│ - if(tId.txt=="screensaver")
|
||||
│ + if(tId.txt=="popupLight")
|
||||
│ {
|
||||
│ - page screensaver
|
||||
│ + pageIcons.tTmp1.txt=tTmp.txt
|
||||
│ + page popupLight
|
||||
│ }
|
||||
│ - if(tId.txt=="cardEntities")
|
||||
│ + if(tId.txt=="pageStartup")
|
||||
│ {
|
||||
│ - page cardEntities
|
||||
│ + page pageStartup
|
||||
│ }
|
||||
│ - if(tId.txt=="cardGrid")
|
||||
│ + if(tId.txt=="cardThermo")
|
||||
│ {
|
||||
│ - page cardGrid
|
||||
│ + page cardThermo
|
||||
│ }
|
||||
│ - if(tId.txt=="popupLight")
|
||||
│ + if(tId.txt=="cardMedia")
|
||||
│ {
|
||||
│ - pageIcons.tTmp1.txt=tTmp.txt
|
||||
│ - page popupLight
|
||||
│ + page cardMedia
|
||||
│ }
|
||||
│ - if(tId.txt=="popupShutter")
|
||||
│ + if(tId.txt=="pageStartup")
|
||||
│ {
|
||||
│ - pageIcons.tTmp1.txt=tTmp.txt
|
||||
│ - page popupShutter
|
||||
│ + page pageStartup
|
||||
│ }
|
||||
│ if(tId.txt=="popupNotify")
|
||||
│ {
|
||||
│ page popupNotify
|
||||
│ }
|
||||
│ - if(tId.txt=="cardThermo")
|
||||
│ + if(tId.txt=="cardGrid")
|
||||
│ {
|
||||
│ - page cardThermo
|
||||
│ + page cardGrid
|
||||
│ }
|
||||
│ - if(tId.txt=="cardMedia")
|
||||
│ + if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ - page cardMedia
|
||||
│ + page cardEntities
|
||||
│ }
|
||||
│ if(tId.txt=="cardAlarm")
|
||||
│ {
|
||||
│ page cardAlarm
|
||||
│ }
|
||||
│ if(tId.txt=="cardQR")
|
||||
│ {
|
||||
|
||||
@@ -14,14 +14,14 @@ popupNotify
|
||||
19 Component(s)
|
||||
253 Line(s) of event code
|
||||
164 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
172 Line(s) of event code
|
||||
125 Unique line(s) of event code
|
||||
cardAlarm
|
||||
40 Component(s)
|
||||
439 Line(s) of event code
|
||||
261 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
177 Line(s) of event code
|
||||
127 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
394 Line(s) of event code
|
||||
@@ -60,8 +60,8 @@ popupThermo
|
||||
272 Unique line(s) of event code
|
||||
screensaver
|
||||
45 Component(s)
|
||||
389 Line(s) of event code
|
||||
288 Unique line(s) of event code
|
||||
396 Line(s) of event code
|
||||
294 Unique line(s) of event code
|
||||
popupInSel
|
||||
34 Component(s)
|
||||
529 Line(s) of event code
|
||||
@@ -74,5 +74,5 @@ cardEntities
|
||||
Total
|
||||
17 Page(s)
|
||||
571 Component(s)
|
||||
7191 Line(s) of event code
|
||||
1809 Unique line(s) of event code
|
||||
7203 Line(s) of event code
|
||||
1810 Unique line(s) of event code
|
||||
|
||||
@@ -605,39 +605,44 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="cardThermo")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page cardThermo
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
|
||||
@@ -578,7 +578,7 @@ Text tIcon1
|
||||
Opacity : 127
|
||||
x coordinate : 16
|
||||
y coordinate : 0
|
||||
Width : 38
|
||||
Width : 85
|
||||
Height : 38
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
@@ -589,7 +589,7 @@ Text tIcon1
|
||||
Font ID : 1
|
||||
Back. Color : 0
|
||||
Font Color : 17299
|
||||
Horizontal Alignment : center
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
@@ -606,9 +606,9 @@ Text tIcon2
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 429
|
||||
x coordinate : 393
|
||||
y coordinate : 0
|
||||
Width : 38
|
||||
Width : 85
|
||||
Height : 38
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
@@ -619,7 +619,7 @@ Text tIcon2
|
||||
Font ID : 1
|
||||
Back. Color : 0
|
||||
Font Color : 17299
|
||||
Horizontal Alignment : center
|
||||
Horizontal Alignment : right
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
@@ -1050,6 +1050,8 @@ Timer tmSerial
|
||||
vis tAMPM,0
|
||||
}
|
||||
spstr strCommand.txt,tTimeAdd.txt,"~",2
|
||||
ref tIcon1
|
||||
ref tIcon2
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
@@ -1265,16 +1267,37 @@ Timer tmSerial
|
||||
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
|
||||
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete u[2]+3
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
@@ -1284,22 +1307,6 @@ Timer tmSerial
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
|
||||
@@ -310,39 +310,44 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="cardThermo")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page cardThermo
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
|
||||
@@ -478,6 +478,8 @@ Timer tmSerial
|
||||
vis tAMPM,0
|
||||
}
|
||||
spstr strCommand.txt,tTimeAdd.txt,"~",2
|
||||
ref tIcon1
|
||||
ref tIcon2
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
@@ -693,16 +695,37 @@ Timer tmSerial
|
||||
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
|
||||
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete u[2]+3
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
@@ -712,22 +735,6 @@ Timer tmSerial
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
|
||||
Reference in New Issue
Block a user