sync (add nextion2text)

This commit is contained in:
joBr99
2022-10-08 22:00:08 +00:00
committed by github-actions[bot]
parent f712b55111
commit ee6bc988d0
13 changed files with 55 additions and 231 deletions

View File

@@ -188,78 +188,6 @@
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ } │ }
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
├── cardMedia.txt
│ @@ -702,15 +702,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ 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
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -752,18 +751,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardQR.txt
│ @@ -653,15 +653,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ 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
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -703,18 +702,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardThermo.txt ├── cardThermo.txt
│ @@ -1089,15 +1089,14 @@ │ @@ -1089,15 +1089,14 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName

View File

@@ -1137,6 +1137,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -1186,6 +1187,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -956,6 +956,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -1005,6 +1006,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -20,16 +20,12 @@ popupFan
199 Unique line(s) of event code 199 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
389 Line(s) of event code 394 Line(s) of event code
210 Unique line(s) of event code 213 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
389 Line(s) of event code 389 Line(s) of event code
213 Unique line(s) of event code 213 Unique line(s) of event code
cardQR
32 Component(s)
404 Line(s) of event code
235 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
386 Line(s) of event code 386 Line(s) of event code
@@ -58,6 +54,10 @@ cardAlarm
40 Component(s) 40 Component(s)
422 Line(s) of event code 422 Line(s) of event code
255 Unique line(s) of event code 255 Unique line(s) of event code
cardQR
32 Component(s)
409 Line(s) of event code
238 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1132 Line(s) of event code 1132 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
482 Component(s) 482 Component(s)
5684 Line(s) of event code 5694 Line(s) of event code
1546 Unique line(s) of event code 1546 Unique line(s) of event code

View File

@@ -706,6 +706,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -755,6 +756,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -657,6 +657,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -706,6 +707,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -635,78 +635,6 @@
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ } │ }
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
├── cardMedia.txt
│ @@ -702,15 +702,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ 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
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -752,18 +751,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardQR.txt
│ @@ -653,15 +653,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ 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
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -703,18 +702,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardThermo.txt ├── cardThermo.txt
│ @@ -1089,15 +1089,14 @@ │ @@ -1089,15 +1089,14 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-08 21:40:20.817238068 +0000 +++ /dev/fd/62 2022-10-08 22:00:00.068849517 +0000
+rdAlarm.txt +rdAlarm.txt
+15 +784,14 @@ +15 +784,14 @@
+ //command format pageType,specialPageName + //command format pageType,specialPageName
@@ -103,78 +103,6 @@
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ } + }
+ if(tInstruction.txt=="date") + if(tInstruction.txt=="date")
+rdMedia.txt
+15 +702,14 @@
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ 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
+ bufferPos=0
+ if(tId.txt=="pageStartup")
+ {
+ page pageStartup
+ }
+18 +751,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+rdQR.txt
+15 +653,14 @@
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ 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
+ bufferPos=0
+ if(tId.txt=="pageStartup")
+ {
+ page pageStartup
+ }
+18 +702,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+rdThermo.txt +rdThermo.txt
+,15 +1089,14 @@ +,15 +1089,14 @@
+ //command format pageType,specialPageName + //command format pageType,specialPageName

View File

@@ -1137,6 +1137,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -1186,6 +1187,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -956,6 +956,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -1005,6 +1006,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -22,10 +22,6 @@ pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 167 Line(s) of event code
122 Unique line(s) of event code 122 Unique line(s) of event code
cardMedia
34 Component(s)
389 Line(s) of event code
210 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
389 Line(s) of event code 389 Line(s) of event code
@@ -40,8 +36,12 @@ cardGrid
278 Unique line(s) of event code 278 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
404 Line(s) of event code 409 Line(s) of event code
235 Unique line(s) of event code 238 Unique line(s) of event code
cardMedia
34 Component(s)
394 Line(s) of event code
213 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
342 Line(s) of event code 342 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
494 Component(s) 494 Component(s)
5907 Line(s) of event code 5917 Line(s) of event code
1620 Unique line(s) of event code 1620 Unique line(s) of event code

View File

@@ -706,6 +706,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -755,6 +756,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -657,6 +657,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 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 ... //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 payloadLength-1
bufferPos=0 bufferPos=0
@@ -706,6 +707,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1