mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-14 08:58:17 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
18d9d9bf90
commit
eba3b0d913
@@ -1037,39 +1037,63 @@
|
|||||||
│ Disable release event after dragging: 0
|
│ Disable release event after dragging: 0
|
||||||
│ Send Component ID : disabled
|
│ Send Component ID : disabled
|
||||||
│ Associated Keyboard : none
|
│ Associated Keyboard : none
|
||||||
│ @@ -494,15 +470,15 @@
|
│ @@ -590,42 +566,39 @@
|
||||||
│ if(tTmp.txt!="")
|
│ //tMainTextAlt2
|
||||||
|
│ spstr strCommand.txt,tMainTextAlt2.txt,"~",36
|
||||||
|
│ //tMainIconAlt2
|
||||||
|
│ spstr strCommand.txt,tMainIconAlt2.txt,"~",33
|
||||||
|
│ //tMainIconAlt2 Color
|
||||||
|
│ spstr strCommand.txt,tTmp.txt,"~",34
|
||||||
|
│ covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||||
|
│ - if(tMainTextAlt2.txt!="")
|
||||||
|
│ + if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||||
│ {
|
│ {
|
||||||
│ covx tTmp.txt,defaultFontColor,0,0
|
│ //value for tMRIcon, activate alternative layout
|
||||||
│ }
|
│ vis tMainIcon,0
|
||||||
│ }
|
│ vis tMainText,0
|
||||||
│ if(tInstruction.txt=="time")
|
│ vis tMainTextAlt,1
|
||||||
│ {
|
│ vis tMainIconAlt,1
|
||||||
│ - click m0,1
|
│ vis tMainTextAlt2,1
|
||||||
│ + //click m0,1
|
│ vis tMainIconAlt2,1
|
||||||
│ //get set time to global variable
|
│ - if(p0.w!=320)
|
||||||
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
│ - {
|
||||||
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
│ - vis tForecast1,0
|
||||||
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
|
│ - vis tF1Icon,0
|
||||||
│ if(tAMPM.txt=="")
|
│ - vis tForecast1Val,0
|
||||||
|
│ - //move forecast values to the right
|
||||||
|
│ - tForecast4.txt=tForecast3.txt
|
||||||
|
│ - tForecast3.txt=tForecast2.txt
|
||||||
|
│ - tForecast2.txt=tForecast1.txt
|
||||||
|
│ - tForecast4Val.txt=tForecast3Val.txt
|
||||||
|
│ - tForecast3Val.txt=tForecast2Val.txt
|
||||||
|
│ - tForecast2Val.txt=tForecast1Val.txt
|
||||||
|
│ - tF4Icon.txt=tF3Icon.txt
|
||||||
|
│ - tF3Icon.txt=tF2Icon.txt
|
||||||
|
│ - tF2Icon.txt=tF1Icon.txt
|
||||||
|
│ - tF4Icon.pco=tF3Icon.pco
|
||||||
|
│ - tF3Icon.pco=tF2Icon.pco
|
||||||
|
│ - tF2Icon.pco=tF1Icon.pco
|
||||||
|
│ - }
|
||||||
|
│ + vis tForecast1,0
|
||||||
|
│ + vis tF1Icon,0
|
||||||
|
│ + vis tForecast1Val,0
|
||||||
|
│ + //move forecast values to the right
|
||||||
|
│ + tForecast4.txt=tForecast3.txt
|
||||||
|
│ + tForecast3.txt=tForecast2.txt
|
||||||
|
│ + tForecast2.txt=tForecast1.txt
|
||||||
|
│ + tForecast4Val.txt=tForecast3Val.txt
|
||||||
|
│ + tForecast3Val.txt=tForecast2Val.txt
|
||||||
|
│ + tForecast2Val.txt=tForecast1Val.txt
|
||||||
|
│ + tF4Icon.txt=tF3Icon.txt
|
||||||
|
│ + tF3Icon.txt=tF2Icon.txt
|
||||||
|
│ + tF2Icon.txt=tF1Icon.txt
|
||||||
|
│ + tF4Icon.pco=tF3Icon.pco
|
||||||
|
│ + tF3Icon.pco=tF2Icon.pco
|
||||||
|
│ + tF2Icon.pco=tF1Icon.pco
|
||||||
|
│ }else
|
||||||
│ {
|
│ {
|
||||||
│ vis tAMPM,0
|
│ vis tMainIcon,1
|
||||||
│ @@ -745,18 +721,14 @@
|
│ vis tMainIconAlt,0
|
||||||
│ {
|
│ vis tMainText,1
|
||||||
│ page pageStartup
|
│ vis tMainTextAlt,0
|
||||||
│ }
|
│ vis tMainTextAlt2,0
|
||||||
│ if(tId.txt=="screensaver")
|
|
||||||
│ {
|
|
||||||
│ page screensaver
|
|
||||||
│ }
|
|
||||||
│ - if(tId.txt=="screensaver2")
|
|
||||||
│ - {
|
|
||||||
│ - page screensaver2
|
|
||||||
│ - }
|
|
||||||
│ if(tId.txt=="cardEntities")
|
|
||||||
│ {
|
|
||||||
│ page cardEntities
|
|
||||||
│ }
|
|
||||||
│ if(tId.txt=="cardGrid")
|
|
||||||
│ {
|
|
||||||
│ page cardGrid
|
|
||||||
|
|||||||
@@ -1918,39 +1918,3 @@
|
|||||||
│ Disable release event after dragging: 0
|
│ Disable release event after dragging: 0
|
||||||
│ Send Component ID : disabled
|
│ Send Component ID : disabled
|
||||||
│ Associated Keyboard : none
|
│ Associated Keyboard : none
|
||||||
│ @@ -494,15 +470,15 @@
|
|
||||||
│ if(tTmp.txt!="")
|
|
||||||
│ {
|
|
||||||
│ covx tTmp.txt,defaultFontColor,0,0
|
|
||||||
│ }
|
|
||||||
│ }
|
|
||||||
│ if(tInstruction.txt=="time")
|
|
||||||
│ {
|
|
||||||
│ - click m0,1
|
|
||||||
│ + //click m0,1
|
|
||||||
│ //get set time to global variable
|
|
||||||
│ 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
|
|
||||||
│ @@ -745,18 +721,14 @@
|
|
||||||
│ {
|
|
||||||
│ page pageStartup
|
|
||||||
│ }
|
|
||||||
│ if(tId.txt=="screensaver")
|
|
||||||
│ {
|
|
||||||
│ page screensaver
|
|
||||||
│ }
|
|
||||||
│ - if(tId.txt=="screensaver2")
|
|
||||||
│ - {
|
|
||||||
│ - page screensaver2
|
|
||||||
│ - }
|
|
||||||
│ if(tId.txt=="cardEntities")
|
|
||||||
│ {
|
|
||||||
│ page cardEntities
|
|
||||||
│ }
|
|
||||||
│ if(tId.txt=="cardGrid")
|
|
||||||
│ {
|
|
||||||
│ page cardGrid
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
+++ /dev/fd/62 2023-02-03 17:56:15.794899421 +0000
|
+++ /dev/fd/62 2023-02-04 08:43:13.965206960 +0000
|
||||||
+le list
|
+le list
|
||||||
+ +14,8 @@
|
+ +14,8 @@
|
||||||
+n.txt
|
+n.txt
|
||||||
@@ -667,13 +667,6 @@
|
|||||||
+ {
|
+ {
|
||||||
+ tmSleep.en=0
|
+ tmSleep.en=0
|
||||||
+ }
|
+ }
|
||||||
+ }
|
|
||||||
+ if(tInstruction.txt=="pageType")
|
|
||||||
+ {
|
|
||||||
+ sleepValue=0
|
|
||||||
+ //command format pageType,specialPageName
|
|
||||||
+ //write name of speical page to tId
|
|
||||||
+ spstr strCommand.txt,tId.txt,"~",1
|
|
||||||
+18 +616,14 @@
|
+18 +616,14 @@
|
||||||
+ {
|
+ {
|
||||||
+ page pageStartup
|
+ page pageStartup
|
||||||
@@ -1144,6 +1137,13 @@
|
|||||||
+ {
|
+ {
|
||||||
+ tmSleep.en=0
|
+ tmSleep.en=0
|
||||||
+ }
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if(tInstruction.txt=="pageType")
|
||||||
|
+ {
|
||||||
|
+ sleepValue=0
|
||||||
|
+ //command format pageType,specialPageName
|
||||||
|
+ //write name of speical page to tId
|
||||||
|
+ spstr strCommand.txt,tId.txt,"~",1
|
||||||
+18 +669,14 @@
|
+18 +669,14 @@
|
||||||
+ {
|
+ {
|
||||||
+ page pageStartup
|
+ page pageStartup
|
||||||
@@ -1303,39 +1303,3 @@
|
|||||||
+ Disable release event after dragging: 0
|
+ Disable release event after dragging: 0
|
||||||
+ Send Component ID : disabled
|
+ Send Component ID : disabled
|
||||||
+ Associated Keyboard : none
|
+ Associated Keyboard : none
|
||||||
+15 +470,15 @@
|
|
||||||
+ if(tTmp.txt!="")
|
|
||||||
+ {
|
|
||||||
+ covx tTmp.txt,defaultFontColor,0,0
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if(tInstruction.txt=="time")
|
|
||||||
+ {
|
|
||||||
+ click m0,1
|
|
||||||
+ //click m0,1
|
|
||||||
+ //get set time to global variable
|
|
||||||
+ 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
|
|
||||||
+18 +721,14 @@
|
|
||||||
+ {
|
|
||||||
+ page pageStartup
|
|
||||||
+ }
|
|
||||||
+ if(tId.txt=="screensaver")
|
|
||||||
+ {
|
|
||||||
+ page screensaver
|
|
||||||
+ }
|
|
||||||
+ if(tId.txt=="screensaver2")
|
|
||||||
+ {
|
|
||||||
+ page screensaver2
|
|
||||||
+ }
|
|
||||||
+ if(tId.txt=="cardEntities")
|
|
||||||
+ {
|
|
||||||
+ page cardEntities
|
|
||||||
+ }
|
|
||||||
+ if(tId.txt=="cardGrid")
|
|
||||||
+ {
|
|
||||||
+ page cardGrid
|
|
||||||
|
|||||||
@@ -58,10 +58,6 @@ cardQR
|
|||||||
34 Component(s)
|
34 Component(s)
|
||||||
402 Line(s) of event code
|
402 Line(s) of event code
|
||||||
234 Unique line(s) of event code
|
234 Unique line(s) of event code
|
||||||
screensaver
|
|
||||||
46 Component(s)
|
|
||||||
418 Line(s) of event code
|
|
||||||
298 Unique line(s) of event code
|
|
||||||
cardThermo
|
cardThermo
|
||||||
57 Component(s)
|
57 Component(s)
|
||||||
532 Line(s) of event code
|
532 Line(s) of event code
|
||||||
@@ -74,6 +70,10 @@ cardPower
|
|||||||
54 Component(s)
|
54 Component(s)
|
||||||
489 Line(s) of event code
|
489 Line(s) of event code
|
||||||
330 Unique line(s) of event code
|
330 Unique line(s) of event code
|
||||||
|
screensaver
|
||||||
|
46 Component(s)
|
||||||
|
421 Line(s) of event code
|
||||||
|
302 Unique line(s) of event code
|
||||||
popupInSel
|
popupInSel
|
||||||
34 Component(s)
|
34 Component(s)
|
||||||
617 Line(s) of event code
|
617 Line(s) of event code
|
||||||
@@ -86,5 +86,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
20 Page(s)
|
20 Page(s)
|
||||||
753 Component(s)
|
753 Component(s)
|
||||||
9207 Line(s) of event code
|
9210 Line(s) of event code
|
||||||
2393 Unique line(s) of event code
|
2395 Unique line(s) of event code
|
||||||
|
|||||||
@@ -644,7 +644,7 @@ Text tMainIcon
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 125
|
x coordinate : 125
|
||||||
y coordinate : 261
|
y coordinate : 260
|
||||||
Width : 70
|
Width : 70
|
||||||
Height : 65
|
Height : 65
|
||||||
Effect : load
|
Effect : load
|
||||||
@@ -673,10 +673,10 @@ Text tMainIconAlt
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 58
|
x coordinate : 47
|
||||||
y coordinate : 257
|
y coordinate : 257
|
||||||
Width : 50
|
Width : 70
|
||||||
Height : 50
|
Height : 65
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -703,10 +703,10 @@ Text tMainIconAlt2
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 214
|
x coordinate : 203
|
||||||
y coordinate : 257
|
y coordinate : 257
|
||||||
Width : 50
|
Width : 70
|
||||||
Height : 50
|
Height : 65
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -763,9 +763,9 @@ Text tMainTextAlt
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 30
|
x coordinate : 0
|
||||||
y coordinate : 314
|
y coordinate : 325
|
||||||
Width : 105
|
Width : 160
|
||||||
Height : 50
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -776,7 +776,7 @@ Text tMainTextAlt
|
|||||||
Font ID : 3
|
Font ID : 3
|
||||||
Back. Color : 0
|
Back. Color : 0
|
||||||
Font Color : 65535
|
Font Color : 65535
|
||||||
Horizontal Alignment : left
|
Horizontal Alignment : center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text :
|
Text :
|
||||||
@@ -793,9 +793,9 @@ Text tMainTextAlt2
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 187
|
x coordinate : 160
|
||||||
y coordinate : 314
|
y coordinate : 325
|
||||||
Width : 105
|
Width : 160
|
||||||
Height : 50
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -806,7 +806,7 @@ Text tMainTextAlt2
|
|||||||
Font ID : 3
|
Font ID : 3
|
||||||
Back. Color : 0
|
Back. Color : 0
|
||||||
Font Color : 65535
|
Font Color : 65535
|
||||||
Horizontal Alignment : left
|
Horizontal Alignment : center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text :
|
Text :
|
||||||
@@ -1143,7 +1143,7 @@ Timer tmSerial
|
|||||||
//tMainIconAlt2 Color
|
//tMainIconAlt2 Color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",34
|
spstr strCommand.txt,tTmp.txt,"~",34
|
||||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
if(tMainTextAlt2.txt!="")
|
||||||
{
|
{
|
||||||
//value for tMRIcon, activate alternative layout
|
//value for tMRIcon, activate alternative layout
|
||||||
vis tMainIcon,0
|
vis tMainIcon,0
|
||||||
@@ -1152,22 +1152,25 @@ Timer tmSerial
|
|||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMainTextAlt2,1
|
vis tMainTextAlt2,1
|
||||||
vis tMainIconAlt2,1
|
vis tMainIconAlt2,1
|
||||||
vis tForecast1,0
|
if(p0.w!=320)
|
||||||
vis tF1Icon,0
|
{
|
||||||
vis tForecast1Val,0
|
vis tForecast1,0
|
||||||
//move forecast values to the right
|
vis tF1Icon,0
|
||||||
tForecast4.txt=tForecast3.txt
|
vis tForecast1Val,0
|
||||||
tForecast3.txt=tForecast2.txt
|
//move forecast values to the right
|
||||||
tForecast2.txt=tForecast1.txt
|
tForecast4.txt=tForecast3.txt
|
||||||
tForecast4Val.txt=tForecast3Val.txt
|
tForecast3.txt=tForecast2.txt
|
||||||
tForecast3Val.txt=tForecast2Val.txt
|
tForecast2.txt=tForecast1.txt
|
||||||
tForecast2Val.txt=tForecast1Val.txt
|
tForecast4Val.txt=tForecast3Val.txt
|
||||||
tF4Icon.txt=tF3Icon.txt
|
tForecast3Val.txt=tForecast2Val.txt
|
||||||
tF3Icon.txt=tF2Icon.txt
|
tForecast2Val.txt=tForecast1Val.txt
|
||||||
tF2Icon.txt=tF1Icon.txt
|
tF4Icon.txt=tF3Icon.txt
|
||||||
tF4Icon.pco=tF3Icon.pco
|
tF3Icon.txt=tF2Icon.txt
|
||||||
tF3Icon.pco=tF2Icon.pco
|
tF2Icon.txt=tF1Icon.txt
|
||||||
tF2Icon.pco=tF1Icon.pco
|
tF4Icon.pco=tF3Icon.pco
|
||||||
|
tF3Icon.pco=tF2Icon.pco
|
||||||
|
tF2Icon.pco=tF1Icon.pco
|
||||||
|
}
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
vis tMainIcon,1
|
vis tMainIcon,1
|
||||||
|
|||||||
@@ -570,7 +570,7 @@ Timer tmSerial
|
|||||||
//tMainIconAlt2 Color
|
//tMainIconAlt2 Color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",34
|
spstr strCommand.txt,tTmp.txt,"~",34
|
||||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
if(tMainTextAlt2.txt!="")
|
||||||
{
|
{
|
||||||
//value for tMRIcon, activate alternative layout
|
//value for tMRIcon, activate alternative layout
|
||||||
vis tMainIcon,0
|
vis tMainIcon,0
|
||||||
@@ -579,22 +579,25 @@ Timer tmSerial
|
|||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMainTextAlt2,1
|
vis tMainTextAlt2,1
|
||||||
vis tMainIconAlt2,1
|
vis tMainIconAlt2,1
|
||||||
vis tForecast1,0
|
if(p0.w!=320)
|
||||||
vis tF1Icon,0
|
{
|
||||||
vis tForecast1Val,0
|
vis tForecast1,0
|
||||||
//move forecast values to the right
|
vis tF1Icon,0
|
||||||
tForecast4.txt=tForecast3.txt
|
vis tForecast1Val,0
|
||||||
tForecast3.txt=tForecast2.txt
|
//move forecast values to the right
|
||||||
tForecast2.txt=tForecast1.txt
|
tForecast4.txt=tForecast3.txt
|
||||||
tForecast4Val.txt=tForecast3Val.txt
|
tForecast3.txt=tForecast2.txt
|
||||||
tForecast3Val.txt=tForecast2Val.txt
|
tForecast2.txt=tForecast1.txt
|
||||||
tForecast2Val.txt=tForecast1Val.txt
|
tForecast4Val.txt=tForecast3Val.txt
|
||||||
tF4Icon.txt=tF3Icon.txt
|
tForecast3Val.txt=tForecast2Val.txt
|
||||||
tF3Icon.txt=tF2Icon.txt
|
tForecast2Val.txt=tForecast1Val.txt
|
||||||
tF2Icon.txt=tF1Icon.txt
|
tF4Icon.txt=tF3Icon.txt
|
||||||
tF4Icon.pco=tF3Icon.pco
|
tF3Icon.txt=tF2Icon.txt
|
||||||
tF3Icon.pco=tF2Icon.pco
|
tF2Icon.txt=tF1Icon.txt
|
||||||
tF2Icon.pco=tF1Icon.pco
|
tF4Icon.pco=tF3Icon.pco
|
||||||
|
tF3Icon.pco=tF2Icon.pco
|
||||||
|
tF2Icon.pco=tF1Icon.pco
|
||||||
|
}
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
vis tMainIcon,1
|
vis tMainIcon,1
|
||||||
|
|||||||
@@ -80,8 +80,8 @@ popupTimer
|
|||||||
255 Unique line(s) of event code
|
255 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
47 Component(s)
|
47 Component(s)
|
||||||
432 Line(s) of event code
|
430 Line(s) of event code
|
||||||
308 Unique line(s) of event code
|
309 Unique line(s) of event code
|
||||||
cardPower
|
cardPower
|
||||||
54 Component(s)
|
54 Component(s)
|
||||||
504 Line(s) of event code
|
504 Line(s) of event code
|
||||||
@@ -90,5 +90,5 @@ cardPower
|
|||||||
Total
|
Total
|
||||||
21 Page(s)
|
21 Page(s)
|
||||||
802 Component(s)
|
802 Component(s)
|
||||||
9261 Line(s) of event code
|
9259 Line(s) of event code
|
||||||
2332 Unique line(s) of event code
|
2334 Unique line(s) of event code
|
||||||
|
|||||||
@@ -1091,7 +1091,7 @@ Timer tmSerial
|
|||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
click m0,1
|
//click m0,1
|
||||||
//get set time to global variable
|
//get set time to global variable
|
||||||
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||||
@@ -1187,7 +1187,7 @@ Timer tmSerial
|
|||||||
//tMainIconAlt2 Color
|
//tMainIconAlt2 Color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",34
|
spstr strCommand.txt,tTmp.txt,"~",34
|
||||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
if(tMainTextAlt2.txt!="")
|
||||||
{
|
{
|
||||||
//value for tMRIcon, activate alternative layout
|
//value for tMRIcon, activate alternative layout
|
||||||
vis tMainIcon,0
|
vis tMainIcon,0
|
||||||
@@ -1196,22 +1196,25 @@ Timer tmSerial
|
|||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMainTextAlt2,1
|
vis tMainTextAlt2,1
|
||||||
vis tMainIconAlt2,1
|
vis tMainIconAlt2,1
|
||||||
vis tForecast1,0
|
if(p0.w!=320)
|
||||||
vis tF1Icon,0
|
{
|
||||||
vis tForecast1Val,0
|
vis tForecast1,0
|
||||||
//move forecast values to the right
|
vis tF1Icon,0
|
||||||
tForecast4.txt=tForecast3.txt
|
vis tForecast1Val,0
|
||||||
tForecast3.txt=tForecast2.txt
|
//move forecast values to the right
|
||||||
tForecast2.txt=tForecast1.txt
|
tForecast4.txt=tForecast3.txt
|
||||||
tForecast4Val.txt=tForecast3Val.txt
|
tForecast3.txt=tForecast2.txt
|
||||||
tForecast3Val.txt=tForecast2Val.txt
|
tForecast2.txt=tForecast1.txt
|
||||||
tForecast2Val.txt=tForecast1Val.txt
|
tForecast4Val.txt=tForecast3Val.txt
|
||||||
tF4Icon.txt=tF3Icon.txt
|
tForecast3Val.txt=tForecast2Val.txt
|
||||||
tF3Icon.txt=tF2Icon.txt
|
tForecast2Val.txt=tForecast1Val.txt
|
||||||
tF2Icon.txt=tF1Icon.txt
|
tF4Icon.txt=tF3Icon.txt
|
||||||
tF4Icon.pco=tF3Icon.pco
|
tF3Icon.txt=tF2Icon.txt
|
||||||
tF3Icon.pco=tF2Icon.pco
|
tF2Icon.txt=tF1Icon.txt
|
||||||
tF2Icon.pco=tF1Icon.pco
|
tF4Icon.pco=tF3Icon.pco
|
||||||
|
tF3Icon.pco=tF2Icon.pco
|
||||||
|
tF2Icon.pco=tF1Icon.pco
|
||||||
|
}
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
vis tMainIcon,1
|
vis tMainIcon,1
|
||||||
@@ -1342,10 +1345,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page screensaver
|
page screensaver
|
||||||
}
|
}
|
||||||
if(tId.txt=="screensaver2")
|
|
||||||
{
|
|
||||||
page screensaver2
|
|
||||||
}
|
|
||||||
if(tId.txt=="cardEntities")
|
if(tId.txt=="cardEntities")
|
||||||
{
|
{
|
||||||
page cardEntities
|
page cardEntities
|
||||||
|
|||||||
@@ -498,7 +498,7 @@ Timer tmSerial
|
|||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
click m0,1
|
//click m0,1
|
||||||
//get set time to global variable
|
//get set time to global variable
|
||||||
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||||
@@ -594,7 +594,7 @@ Timer tmSerial
|
|||||||
//tMainIconAlt2 Color
|
//tMainIconAlt2 Color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",34
|
spstr strCommand.txt,tTmp.txt,"~",34
|
||||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
if(tMainTextAlt2.txt!="")
|
||||||
{
|
{
|
||||||
//value for tMRIcon, activate alternative layout
|
//value for tMRIcon, activate alternative layout
|
||||||
vis tMainIcon,0
|
vis tMainIcon,0
|
||||||
@@ -603,22 +603,25 @@ Timer tmSerial
|
|||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMainTextAlt2,1
|
vis tMainTextAlt2,1
|
||||||
vis tMainIconAlt2,1
|
vis tMainIconAlt2,1
|
||||||
vis tForecast1,0
|
if(p0.w!=320)
|
||||||
vis tF1Icon,0
|
{
|
||||||
vis tForecast1Val,0
|
vis tForecast1,0
|
||||||
//move forecast values to the right
|
vis tF1Icon,0
|
||||||
tForecast4.txt=tForecast3.txt
|
vis tForecast1Val,0
|
||||||
tForecast3.txt=tForecast2.txt
|
//move forecast values to the right
|
||||||
tForecast2.txt=tForecast1.txt
|
tForecast4.txt=tForecast3.txt
|
||||||
tForecast4Val.txt=tForecast3Val.txt
|
tForecast3.txt=tForecast2.txt
|
||||||
tForecast3Val.txt=tForecast2Val.txt
|
tForecast2.txt=tForecast1.txt
|
||||||
tForecast2Val.txt=tForecast1Val.txt
|
tForecast4Val.txt=tForecast3Val.txt
|
||||||
tF4Icon.txt=tF3Icon.txt
|
tForecast3Val.txt=tForecast2Val.txt
|
||||||
tF3Icon.txt=tF2Icon.txt
|
tForecast2Val.txt=tForecast1Val.txt
|
||||||
tF2Icon.txt=tF1Icon.txt
|
tF4Icon.txt=tF3Icon.txt
|
||||||
tF4Icon.pco=tF3Icon.pco
|
tF3Icon.txt=tF2Icon.txt
|
||||||
tF3Icon.pco=tF2Icon.pco
|
tF2Icon.txt=tF1Icon.txt
|
||||||
tF2Icon.pco=tF1Icon.pco
|
tF4Icon.pco=tF3Icon.pco
|
||||||
|
tF3Icon.pco=tF2Icon.pco
|
||||||
|
tF2Icon.pco=tF1Icon.pco
|
||||||
|
}
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
vis tMainIcon,1
|
vis tMainIcon,1
|
||||||
@@ -749,10 +752,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page screensaver
|
page screensaver
|
||||||
}
|
}
|
||||||
if(tId.txt=="screensaver2")
|
|
||||||
{
|
|
||||||
page screensaver2
|
|
||||||
}
|
|
||||||
if(tId.txt=="cardEntities")
|
if(tId.txt=="cardEntities")
|
||||||
{
|
{
|
||||||
page cardEntities
|
page cardEntities
|
||||||
|
|||||||
Reference in New Issue
Block a user