preserve sleep also on page type command (add nextion2text)

This commit is contained in:
joBr99
2022-03-20 18:58:43 +00:00
committed by GitHub Actions
parent ffb06aa8e9
commit 701e7cffe7
3 changed files with 23 additions and 11 deletions

View File

@@ -14,10 +14,14 @@ cardMedia
22 Component(s) 22 Component(s)
210 Line(s) of event code 210 Line(s) of event code
116 Unique line(s) of event code 116 Unique line(s) of event code
popupNotify pageStartup
16 Component(s) 19 Component(s)
167 Line(s) of event code 146 Line(s) of event code
111 Unique line(s) of event code 111 Unique line(s) of event code
popupNotify
17 Component(s)
172 Line(s) of event code
114 Unique line(s) of event code
pageSwipeTest pageSwipeTest
18 Component(s) 18 Component(s)
62 Line(s) of event code 62 Line(s) of event code
@@ -30,10 +34,6 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
pageStartup
19 Component(s)
146 Line(s) of event code
111 Unique line(s) of event code
screensaver screensaver
25 Component(s) 25 Component(s)
173 Line(s) of event code 173 Line(s) of event code
@@ -61,6 +61,6 @@ popupLight
Total Total
14 Page(s) 14 Page(s)
342 Component(s) 343 Component(s)
3170 Line(s) of event code 3175 Line(s) of event code
787 Unique line(s) of event code 790 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 8 Text : 9
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -40,6 +40,12 @@ Variable (string) entn
Text : Text :
Max. Text Size: 30 Max. Text Size: 30
Variable (int32) vaOldSleepT
Attributes
ID : 16
Scope: local
Value: 0
Text tSend Text tSend
Attributes Attributes
ID : 3 ID : 3
@@ -271,6 +277,7 @@ Button b0
Events Events
Touch Press Event Touch Press Event
sleepTimeout=vaOldSleepT.val
//page open event //page open event
// event,pageOpen,cardEntities,pageNumber // event,pageOpen,cardEntities,pageNumber
// craft command // craft command
@@ -323,6 +330,7 @@ Button b2
Events Events
Touch Press Event Touch Press Event
sleepTimeout=vaOldSleepT.val
//craft command //craft command
tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes" tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes"
//send calc crc //send calc crc
@@ -371,6 +379,7 @@ Button b1
Events Events
Touch Press Event Touch Press Event
sleepTimeout=vaOldSleepT.val
//craft command //craft command
tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no" tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no"
//send calc crc //send calc crc
@@ -493,6 +502,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"|",9 spstr strCommand.txt,tTmp.txt,"|",9
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tText.pco=sys0 tText.pco=sys0
//preserve old sleepTimeout
vaOldSleepT.val=sleepTimeout
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"|",9 spstr strCommand.txt,tTmp.txt,"|",9
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -523,6 +534,7 @@ Timer tmSerial
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
sleepTimeout=vaOldSleepT.val
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,",",1 spstr strCommand.txt,tId.txt,",",1