added am/pm on screensaver (add nextion2text)

This commit is contained in:
joBr99
2022-03-25 15:31:46 +00:00
committed by GitHub Actions
parent 811ad68f37
commit a689e0190b
2 changed files with 52 additions and 11 deletions

View File

@@ -51,12 +51,12 @@ popupLight
306 Line(s) of event code 306 Line(s) of event code
167 Unique line(s) of event code 167 Unique line(s) of event code
screensaver screensaver
25 Component(s) 26 Component(s)
166 Line(s) of event code 176 Line(s) of event code
121 Unique line(s) of event code 127 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
329 Component(s) 330 Component(s)
3033 Line(s) of event code 3043 Line(s) of event code
806 Unique line(s) of event code 812 Unique line(s) of event code

View File

@@ -27,7 +27,13 @@ Page screensaver
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
}
tDate.txt=vaDate.txt tDate.txt=vaDate.txt
dim=dimValue dim=dimValue
vis tSend,0 vis tSend,0
@@ -68,7 +74,7 @@ Variable (string) vaTime
ID : 10 ID : 10
Scope : global Scope : global
Text : Text :
Max. Text Size: 10 Max. Text Size: 15
Variable (string) vaDate Variable (string) vaDate
Attributes Attributes
@@ -199,7 +205,7 @@ Text tTime
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 21:32 Text : 21:32
Max. Text Size : 10 Max. Text Size : 15
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -594,6 +600,36 @@ Text t10
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tAMPM
Attributes
ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 343
y coordinate : 48
Width : 104
Height : 57
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : PM
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -679,7 +715,12 @@ Timer tmSerial
{ {
//get set time to global variable //get set time to global variable
spstr strCommand.txt,vaTime.txt,",",1 spstr strCommand.txt,vaTime.txt,",",1
tTime.txt=vaTime.txt spstr vaTime.txt,tTime.txt,"?",0
spstr vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="")
{
vis tAMPM,0
}
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {