changed timeout page exit on popup pages (add nextion2text)

This commit is contained in:
joBr99
2022-03-22 15:34:05 +00:00
committed by GitHub Actions
parent ffa9f6b17a
commit 1eb00d8559
4 changed files with 23 additions and 12 deletions

View File

@@ -10,10 +10,14 @@ pageSerialTest
13 Component(s) 13 Component(s)
48 Line(s) of event code 48 Line(s) of event code
43 Unique line(s) of event code 43 Unique line(s) of event code
popupShutter
19 Component(s)
195 Line(s) of event code
107 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
179 Line(s) of event code 180 Line(s) of event code
118 Unique line(s) of event code 119 Unique line(s) of event code
cardMedia cardMedia
22 Component(s) 22 Component(s)
200 Line(s) of event code 200 Line(s) of event code
@@ -22,6 +26,10 @@ pageSwipeTest
18 Component(s) 18 Component(s)
62 Line(s) of event code 62 Line(s) of event code
44 Unique line(s) of event code 44 Unique line(s) of event code
popupLight
26 Component(s)
352 Line(s) of event code
170 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
@@ -30,10 +38,6 @@ pageStartup
19 Component(s) 19 Component(s)
146 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
popupShutter
19 Component(s)
194 Line(s) of event code
106 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
@@ -46,10 +50,6 @@ cardThermo
42 Component(s) 42 Component(s)
412 Line(s) of event code 412 Line(s) of event code
221 Unique line(s) of event code 221 Unique line(s) of event code
popupLight
26 Component(s)
343 Line(s) of event code
165 Unique line(s) of event code
cardEntities cardEntities
54 Component(s) 54 Component(s)
808 Line(s) of event code 808 Line(s) of event code
@@ -62,5 +62,5 @@ cardAlarm
Total Total
14 Page(s) 14 Page(s)
349 Component(s) 349 Component(s)
3261 Line(s) of event code 3272 Line(s) of event code
823 Unique line(s) of event code 828 Unique line(s) of event code

View File

@@ -789,6 +789,7 @@ Timer tmSleep
screensaver.originPage.val=dp screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0
} }
} }
@@ -881,6 +882,7 @@ Timer tmSerial
vis hTempSlider,0 vis hTempSlider,0
vis t3,0 vis t3,0
vis t4,0 vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown // mode == 1 is temp controls currently shown
if(mode.val==1) if(mode.val==1)
{ {
@@ -890,6 +892,7 @@ Timer tmSerial
} }
}else if(tTmp.txt=="unknown") // temp supported, but not in color mode }else if(tTmp.txt=="unknown") // temp supported, but not in color mode
{ {
mode_temp.val=1
// mode == 1 is temp controls currently shown // mode == 1 is temp controls currently shown
if(mode.val==1) if(mode.val==1)
{ {
@@ -899,6 +902,7 @@ Timer tmSerial
} }
}else }else
{ {
mode_temp.val=0
vis hTempSlider,1 vis hTempSlider,1
vis t3,1 vis t3,1
vis t4,1 vis t4,1
@@ -917,10 +921,15 @@ Timer tmSerial
{ {
vis t0,0 vis t0,0
vis bColor,0 vis bColor,0
vis pColorWheel,0
}else }else
{ {
vis t0,1 vis t0,1
vis bColor,1 vis bColor,1
if(mode.val==0)
{
vis pColorWheel,1
}
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")

View File

@@ -411,6 +411,7 @@ Timer tmSleep
screensaver.originPage.val=dp screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0
} }
} }

View File

@@ -564,6 +564,7 @@ Timer tmSleep
screensaver.originPage.val=dp screensaver.originPage.val=dp
sleepValue=0 sleepValue=0
click b0,1 click b0,1
click b0,0
} }
} }