bump to 41 and fix color on screensaver (add nextion2text)

This commit is contained in:
joBr99
2022-08-29 19:17:36 +00:00
committed by github-actions[bot]
parent 331e170d78
commit 326773947d
16 changed files with 99 additions and 155 deletions

View File

@@ -18,10 +18,6 @@ popupLight
27 Component(s)
386 Line(s) of event code
211 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
cardMedia
34 Component(s)
388 Line(s) of event code
@@ -42,10 +38,10 @@ cardQR
32 Component(s)
403 Line(s) of event code
234 Unique line(s) of event code
screensaver
38 Component(s)
332 Line(s) of event code
257 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
cardGrid
42 Component(s)
462 Line(s) of event code
@@ -54,6 +50,10 @@ cardAlarm
40 Component(s)
421 Line(s) of event code
254 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
cardThermo
53 Component(s)
580 Line(s) of event code
@@ -62,5 +62,5 @@ cardThermo
Total
14 Page(s)
444 Component(s)
5363 Line(s) of event code
1425 Unique line(s) of event code
5372 Line(s) of event code
1431 Unique line(s) of event code

View File

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

View File

@@ -1075,9 +1075,6 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
@@ -1174,6 +1171,18 @@ Timer tmSerial
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMRIcon.txt!=""&&p0.w!=320)
{
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco
tForecast4.pco=tForecast3.pco
tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco
}
}
if(tInstruction.txt=="notify")
{