added timer popup (add nextion2text)

This commit is contained in:
joBr99
2022-12-20 19:30:00 +00:00
committed by github-actions[bot]
parent c26cc91369
commit 4400728194
14 changed files with 3366 additions and 124 deletions

View File

@@ -51,7 +51,7 @@ Page cardAlarm
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
//b[sys0].pco=defaultFontColor
}
}
if(defaultBcoColor==0)

View File

@@ -1912,6 +1912,10 @@ Hotspot m0
{
page popupInSel
}
if(type1.txt=="timer")
{
page popupTimer
}
Hotspot m1
Attributes
@@ -1952,6 +1956,10 @@ Hotspot m1
{
page popupInSel
}
if(type2.txt=="timer")
{
page popupTimer
}
Hotspot m2
Attributes
@@ -1992,6 +2000,10 @@ Hotspot m2
{
page popupInSel
}
if(type3.txt=="timer")
{
page popupTimer
}
Hotspot m3
Attributes
@@ -2032,6 +2044,10 @@ Hotspot m3
{
page popupInSel
}
if(type4.txt=="timer")
{
page popupTimer
}
Hotspot mSpecial
Attributes
@@ -2323,7 +2339,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,"~",8
}
if(type1.txt=="button"||type1.txt=="input_sel")
if(type1.txt=="button"||type1.txt=="input_sel"||type1.txt=="timer")
{
vis bUp1,0
vis bStop1,0
@@ -2472,7 +2488,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="input_sel")
if(type2.txt=="button"||type2.txt=="input_sel"||type2.txt=="timer")
{
vis bUp2,0
vis bStop2,0
@@ -2621,7 +2637,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText3.txt,"~",20
}
if(type3.txt=="button"||type3.txt=="input_sel")
if(type3.txt=="button"||type3.txt=="input_sel"||type3.txt=="timer")
{
vis bUp3,0
vis bStop3,0
@@ -2770,7 +2786,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText4.txt,"~",26
}
if(type4.txt=="button"||type4.txt=="input_sel")
if(type4.txt=="button"||type4.txt=="input_sel"||type4.txt=="timer")
{
vis bUp4,0
vis bStop4,0
@@ -2876,10 +2892,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -516,6 +516,10 @@ Button bEntity1
{
page popupInSel
}
if(type1.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -579,6 +583,10 @@ Button bEntity2
{
page popupInSel
}
if(type2.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -642,6 +650,10 @@ Button bEntity3
{
page popupInSel
}
if(type3.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -705,6 +717,10 @@ Button bEntity4
{
page popupInSel
}
if(type4.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -768,6 +784,10 @@ Button bEntity5
{
page popupInSel
}
if(type5.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -831,6 +851,10 @@ Button bEntity6
{
page popupInSel
}
if(type6.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0

View File

@@ -18,6 +18,10 @@ cardChart
31 Component(s)
452 Line(s) of event code
296 Unique line(s) of event code
screensaver
47 Component(s)
411 Line(s) of event code
299 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
@@ -38,30 +42,30 @@ pageStartup
19 Component(s)
181 Line(s) of event code
129 Unique line(s) of event code
cardGrid
42 Component(s)
514 Line(s) of event code
293 Unique line(s) of event code
pageTest
21 Component(s)
66 Line(s) of event code
64 Unique line(s) of event code
screensaver
47 Component(s)
411 Line(s) of event code
299 Unique line(s) of event code
cardGrid
42 Component(s)
538 Line(s) of event code
300 Unique line(s) of event code
cardPower
43 Component(s)
439 Line(s) of event code
299 Unique line(s) of event code
cardAlarm
40 Component(s)
442 Line(s) of event code
262 Unique line(s) of event code
cardQR
32 Component(s)
425 Line(s) of event code
244 Unique line(s) of event code
cardAlarm
40 Component(s)
443 Line(s) of event code
263 Unique line(s) of event code
popupTimer
42 Component(s)
508 Line(s) of event code
247 Unique line(s) of event code
cardThermo
55 Component(s)
555 Line(s) of event code
@@ -72,11 +76,11 @@ cardMedia
325 Unique line(s) of event code
cardEntities
65 Component(s)
1169 Line(s) of event code
532 Unique line(s) of event code
1181 Line(s) of event code
535 Unique line(s) of event code
Total
18 Page(s)
636 Component(s)
7878 Line(s) of event code
2008 Unique line(s) of event code
19 Page(s)
678 Component(s)
8421 Line(s) of event code
2126 Unique line(s) of event code

File diff suppressed because it is too large Load Diff

View File

@@ -932,7 +932,7 @@ Text tTime
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 21:32PP
Text : 21:32
Max. Text Size : 15
Word wrap : disabled
Horizontal Spacing : 0