sync (add nextion2text)

This commit is contained in:
joBr99
2022-10-08 22:48:59 +00:00
committed by github-actions[bot]
parent ca07494161
commit c06fd3ace0
11 changed files with 45 additions and 158 deletions

View File

@@ -14,42 +14,6 @@
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
├── cardAlarm.txt
│ @@ -784,15 +784,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
│ }
│ @@ -834,18 +833,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardEntities.txt
│ @@ -61,14 +61,24 @@
│ vis tIcon4,0

View File

@@ -1,40 +1,4 @@
+++ /dev/fd/62 2022-10-08 22:37:22.226531609 +0000
+rdAlarm.txt
+15 +784,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 +833,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+++ /dev/fd/62 2022-10-08 22:48:53.818299279 +0000
+,26 +2059,174 @@
+ //save second arg if there's one
+ spstr strCommand.txt,tTmp.txt,"~",2

View File

@@ -1370,6 +1370,7 @@ Timer tmSerial
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
@@ -1419,6 +1420,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -46,14 +46,14 @@ cardMedia
34 Component(s)
394 Line(s) of event code
213 Unique line(s) of event code
cardAlarm
40 Component(s)
422 Line(s) of event code
255 Unique line(s) of event code
screensaver
38 Component(s)
338 Line(s) of event code
262 Unique line(s) of event code
cardAlarm
40 Component(s)
427 Line(s) of event code
258 Unique line(s) of event code
cardThermo
52 Component(s)
585 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total
15 Page(s)
494 Component(s)
5947 Line(s) of event code
5952 Line(s) of event code
1620 Unique line(s) of event code

View File

@@ -788,6 +788,7 @@ Timer tmSerial
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
@@ -837,6 +838,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1