fixed pageType command for popupLight page (add nextion2text)

This commit is contained in:
joBr99
2022-03-13 09:16:22 +00:00
committed by GitHub Actions
parent f097b767a5
commit 6fb86d8bb0
6 changed files with 35 additions and 18 deletions

View File

@@ -2326,6 +2326,8 @@ Timer tmSerial
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
if(tId.txt=="cardEntities")
{
//yay, we are already on the correct page

View File

@@ -764,6 +764,10 @@ Timer tmSerial
//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
if(tId.txt=="cardMedia")
{
//yay, we are already on the correct page
@@ -773,6 +777,11 @@ Timer tmSerial
udelete payloadLength-1
bufferPos=0
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="cardEntities")
{
page cardEntities

View File

@@ -889,6 +889,8 @@ Timer tmSerial
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
if(tId.txt=="cardThermo")
{
//yay, we are already on the correct page

View File

@@ -14,6 +14,10 @@ pageTest
12 Component(s)
12 Line(s) of event code
12 Unique line(s) of event code
screensaver
25 Component(s)
146 Line(s) of event code
116 Unique line(s) of event code
pageSwipeTest
18 Component(s)
62 Line(s) of event code
@@ -22,18 +26,14 @@ popupNotify
15 Component(s)
143 Line(s) of event code
95 Unique line(s) of event code
screensaver
25 Component(s)
145 Line(s) of event code
115 Unique line(s) of event code
cardThermo
27 Component(s)
200 Line(s) of event code
119 Unique line(s) of event code
cardMedia
22 Component(s)
219 Line(s) of event code
114 Unique line(s) of event code
pageStartup
19 Component(s)
134 Line(s) of event code
104 Unique line(s) of event code
135 Line(s) of event code
105 Unique line(s) of event code
popupLight
27 Component(s)
296 Line(s) of event code
@@ -42,17 +42,17 @@ popupShutter
19 Component(s)
148 Line(s) of event code
84 Unique line(s) of event code
cardMedia
22 Component(s)
212 Line(s) of event code
109 Unique line(s) of event code
cardThermo
27 Component(s)
201 Line(s) of event code
120 Unique line(s) of event code
cardEntities
55 Component(s)
823 Line(s) of event code
312 Unique line(s) of event code
824 Line(s) of event code
313 Unique line(s) of event code
Total
12 Page(s)
258 Component(s)
2240 Line(s) of event code
577 Unique line(s) of event code
2251 Line(s) of event code
578 Unique line(s) of event code

View File

@@ -581,6 +581,8 @@ Timer tmSerial
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
//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

View File

@@ -732,6 +732,8 @@ Timer tmSerial
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
//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
bufferPos=0