sync (add nextion2text)

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

View File

@@ -12,42 +12,6 @@
│ - // fix touch offset │ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020 │ - lcd_dev fffb 0002 0000 0020
│ - page pageStartup │ - 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
│ }
│ }
│ }
├── pageStartup.txt ├── pageStartup.txt
│ @@ -173,15 +173,15 @@ │ @@ -173,15 +173,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10
@@ -66,38 +30,3 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ @@ -302,15 +302,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=="cardThermo")
│ {
│ page cardThermo
│ }
│ @@ -347,18 +346,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }

View File

@@ -1370,6 +1370,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
@@ -1419,6 +1420,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

@@ -6,10 +6,6 @@ pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
231 Line(s) of event code 231 Line(s) of event code
@@ -30,6 +26,10 @@ popupShutter
25 Component(s) 25 Component(s)
394 Line(s) of event code 394 Line(s) of event code
216 Unique line(s) of event code 216 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
125 Unique line(s) of event code
pageTest pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
@@ -38,14 +38,14 @@ cardGrid
42 Component(s) 42 Component(s)
474 Line(s) of event code 474 Line(s) of event code
281 Unique line(s) of event code 281 Unique line(s) of event code
cardAlarm
40 Component(s)
427 Line(s) of event code
258 Unique line(s) of event code
cardPower cardPower
43 Component(s) 43 Component(s)
420 Line(s) of event code 420 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
cardAlarm
40 Component(s)
422 Line(s) of event code
255 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
409 Line(s) of event code 409 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
482 Component(s) 482 Component(s)
5734 Line(s) of event code 5744 Line(s) of event code
1546 Unique line(s) of event code 1546 Unique line(s) of event code

View File

@@ -601,6 +601,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
@@ -645,6 +646,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

@@ -788,6 +788,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
@@ -837,6 +838,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

@@ -306,6 +306,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
@@ -350,6 +351,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

@@ -14,42 +14,6 @@
│ + // fix touch offset (Removed for US version) │ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup │ 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 ├── cardEntities.txt
│ @@ -61,14 +61,24 @@ │ @@ -61,14 +61,24 @@
│ vis tIcon4,0 │ vis tIcon4,0

View File

@@ -1,40 +1,4 @@
+++ /dev/fd/62 2022-10-08 22:37:22.226531609 +0000 +++ /dev/fd/62 2022-10-08 22:48:53.818299279 +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
+ }
+ }
+ }
+,26 +2059,174 @@ +,26 +2059,174 @@
+ //save second arg if there's one + //save second arg if there's one
+ spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,"~",2

View File

@@ -1370,6 +1370,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
@@ -1419,6 +1420,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

@@ -46,14 +46,14 @@ cardMedia
34 Component(s) 34 Component(s)
394 Line(s) of event code 394 Line(s) of event code
213 Unique 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 screensaver
38 Component(s) 38 Component(s)
338 Line(s) of event code 338 Line(s) of event code
262 Unique 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 cardThermo
52 Component(s) 52 Component(s)
585 Line(s) of event code 585 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
494 Component(s) 494 Component(s)
5947 Line(s) of event code 5952 Line(s) of event code
1620 Unique 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 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
@@ -837,6 +838,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