mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-23 13:02:14 +01:00
moved time and date to pageicons (add nextion2text)
This commit is contained in:
joBr99
GitHub Actions
@@ -10,6 +10,7 @@ Program.s
|
||||
int sleepValue=0
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
// fix touch offset
|
||||
lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
|
||||
@@ -1113,12 +1113,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -2620,12 +2620,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -1202,12 +1202,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -973,12 +973,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -1388,12 +1388,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
Program.s
|
||||
0 Component(s)
|
||||
10 Line(s) of event code
|
||||
10 Unique line(s) of event code
|
||||
11 Line(s) of event code
|
||||
11 Unique line(s) of event code
|
||||
pageIcons
|
||||
5 Component(s)
|
||||
7 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 Unique line(s) of event code
|
||||
pageTest
|
||||
@@ -22,34 +22,34 @@ popupShutter
|
||||
19 Component(s)
|
||||
178 Line(s) of event code
|
||||
101 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
285 Line(s) of event code
|
||||
181 Unique line(s) of event code
|
||||
cardGrid
|
||||
39 Component(s)
|
||||
397 Line(s) of event code
|
||||
233 Unique line(s) of event code
|
||||
screensaver
|
||||
30 Component(s)
|
||||
182 Line(s) of event code
|
||||
132 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
287 Line(s) of event code
|
||||
148 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
screensaver
|
||||
28 Component(s)
|
||||
182 Line(s) of event code
|
||||
132 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
285 Line(s) of event code
|
||||
181 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
414 Line(s) of event code
|
||||
226 Unique line(s) of event code
|
||||
cardGrid
|
||||
39 Component(s)
|
||||
397 Line(s) of event code
|
||||
233 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
939 Line(s) of event code
|
||||
@@ -58,5 +58,5 @@ cardEntities
|
||||
Total
|
||||
13 Page(s)
|
||||
350 Component(s)
|
||||
3403 Line(s) of event code
|
||||
3404 Line(s) of event code
|
||||
921 Unique line(s) of event code
|
||||
|
||||
@@ -18,6 +18,20 @@ Page pageIcons
|
||||
Fill : solid color
|
||||
Back. Color : 65535
|
||||
|
||||
Variable (string) vaTime
|
||||
Attributes
|
||||
ID : 5
|
||||
Scope : global
|
||||
Text :
|
||||
Max. Text Size: 15
|
||||
|
||||
Variable (string) vaDate
|
||||
Attributes
|
||||
ID : 6
|
||||
Scope : global
|
||||
Text :
|
||||
Max. Text Size: 30
|
||||
|
||||
Text tIcons
|
||||
Attributes
|
||||
ID : 2
|
||||
|
||||
@@ -556,12 +556,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -887,12 +887,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -507,12 +507,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
|
||||
@@ -606,12 +606,12 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,screensaver.vaTime.txt,",",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,screensaver.vaDate.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -27,13 +27,13 @@ Page screensaver
|
||||
vis p0,0
|
||||
//load gloabl time string from pageIcons
|
||||
//tTime.txt=vaTime.txt
|
||||
spstr vaTime.txt,tTime.txt,"?",0
|
||||
spstr vaTime.txt,tAMPM.txt,"?",1
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
|
||||
if(tAMPM.txt=="")
|
||||
{
|
||||
vis tAMPM,0
|
||||
}
|
||||
tDate.txt=vaDate.txt
|
||||
tDate.txt=pageIcons.vaDate.txt
|
||||
dim=dimValue
|
||||
vis tSend,0
|
||||
//page open event
|
||||
@@ -66,30 +66,16 @@ Variable (string) strCommand
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
|
||||
Variable (string) vaTime
|
||||
Attributes
|
||||
ID : 9
|
||||
Scope : global
|
||||
Text :
|
||||
Max. Text Size: 15
|
||||
|
||||
Variable (string) vaDate
|
||||
Attributes
|
||||
ID : 10
|
||||
Scope : global
|
||||
Text :
|
||||
Max. Text Size: 30
|
||||
|
||||
Variable (string) tId
|
||||
Attributes
|
||||
ID : 21
|
||||
ID : 19
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 25
|
||||
|
||||
Variable (int32) vaTap
|
||||
Attributes
|
||||
ID : 29
|
||||
ID : 27
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
@@ -215,7 +201,7 @@ Text tDate
|
||||
|
||||
Text tSend
|
||||
Attributes
|
||||
ID : 11
|
||||
ID : 9
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -245,7 +231,7 @@ Text tSend
|
||||
|
||||
Text tMainIcon
|
||||
Attributes
|
||||
ID : 12
|
||||
ID : 10
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -275,7 +261,7 @@ Text tMainIcon
|
||||
|
||||
Text tMainText
|
||||
Attributes
|
||||
ID : 13
|
||||
ID : 11
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -305,7 +291,7 @@ Text tMainText
|
||||
|
||||
Text tForecast1
|
||||
Attributes
|
||||
ID : 14
|
||||
ID : 12
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -335,7 +321,7 @@ Text tForecast1
|
||||
|
||||
Text tForecast1Val
|
||||
Attributes
|
||||
ID : 15
|
||||
ID : 13
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -365,7 +351,7 @@ Text tForecast1Val
|
||||
|
||||
Text tF1Icon
|
||||
Attributes
|
||||
ID : 16
|
||||
ID : 14
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -395,7 +381,7 @@ Text tF1Icon
|
||||
|
||||
Text tForecast2
|
||||
Attributes
|
||||
ID : 17
|
||||
ID : 15
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -425,7 +411,7 @@ Text tForecast2
|
||||
|
||||
Text tF2Icon
|
||||
Attributes
|
||||
ID : 18
|
||||
ID : 16
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -455,7 +441,7 @@ Text tF2Icon
|
||||
|
||||
Text tForecast2Val
|
||||
Attributes
|
||||
ID : 19
|
||||
ID : 17
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -485,7 +471,7 @@ Text tForecast2Val
|
||||
|
||||
Text t10
|
||||
Attributes
|
||||
ID : 20
|
||||
ID : 18
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -515,7 +501,7 @@ Text t10
|
||||
|
||||
Text tAMPM
|
||||
Attributes
|
||||
ID : 22
|
||||
ID : 20
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -545,7 +531,7 @@ Text tAMPM
|
||||
|
||||
Text tForecast3Val
|
||||
Attributes
|
||||
ID : 23
|
||||
ID : 21
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -575,7 +561,7 @@ Text tForecast3Val
|
||||
|
||||
Text tF3Icon
|
||||
Attributes
|
||||
ID : 24
|
||||
ID : 22
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -605,7 +591,7 @@ Text tF3Icon
|
||||
|
||||
Text tForecast3
|
||||
Attributes
|
||||
ID : 25
|
||||
ID : 23
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -635,7 +621,7 @@ Text tForecast3
|
||||
|
||||
Text tForecast4
|
||||
Attributes
|
||||
ID : 26
|
||||
ID : 24
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -665,7 +651,7 @@ Text tForecast4
|
||||
|
||||
Text tF4Icon
|
||||
Attributes
|
||||
ID : 27
|
||||
ID : 25
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -695,7 +681,7 @@ Text tF4Icon
|
||||
|
||||
Text tForecast4Val
|
||||
Attributes
|
||||
ID : 28
|
||||
ID : 26
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -807,9 +793,9 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
//get set time to global variable
|
||||
spstr strCommand.txt,vaTime.txt,",",1
|
||||
spstr vaTime.txt,tTime.txt,"?",0
|
||||
spstr vaTime.txt,tAMPM.txt,"?",1
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
|
||||
if(tAMPM.txt=="")
|
||||
{
|
||||
vis tAMPM,0
|
||||
@@ -818,8 +804,8 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
//get set date to global variable
|
||||
spstr strCommand.txt,vaDate.txt,"?",1
|
||||
tDate.txt=vaDate.txt
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
tDate.txt=pageIcons.vaDate.txt
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
@@ -939,7 +925,7 @@ TouchCap tc0
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
dim=100
|
||||
dim=dimValueNormal
|
||||
vaTap.val+=1
|
||||
covx vaTap.val,tTmp.txt,0,0
|
||||
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
|
||||
@@ -954,6 +940,4 @@ TouchCap tc0
|
||||
prints sys0,2
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
//dim=100
|
||||
//page originPage.val
|
||||
|
||||
|
||||
Reference in New Issue
Block a user