mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
2bea2aa6bc
commit
395b5cd562
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 06:20:45.196459256 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-24 14:34:14.623688759 +0000
|
||||||
@@ -11,6 +11,4 @@
|
@@ -11,6 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
|||||||
- lcd_dev fffb 0002 0000 0020
|
- lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 06:20:45.196459256 +0000
|
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-24 14:34:14.627688805 +0000
|
||||||
@@ -34,7 +34,7 @@
|
@@ -34,7 +34,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
|||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 06:20:45.196459256 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-24 14:34:14.627688805 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
@@ -32,3 +32,41 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
|||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
|
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||||
|
--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
|
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-24 14:34:14.627688805 +0000
|
||||||
|
@@ -468,9 +468,6 @@
|
||||||
|
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
|
||||||
|
@@ -509,10 +506,8 @@
|
||||||
|
covx tTmp.txt,tDate.pco,0,0
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
|
covx tTmp.txt,tMainIcon.pco,0,0
|
||||||
|
- tMainIconAlt.pco=tMainIcon.pco
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",6
|
||||||
|
covx tTmp.txt,tMainText.pco,0,0
|
||||||
|
- tMainTextAlt.pco=tMainText.pco
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
covx tTmp.txt,tForecast1.pco,0,0
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",8
|
||||||
|
@@ -540,8 +535,12 @@
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
|
covx tTmp.txt,t10.bco,0,0
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",20
|
||||||
|
- covx tTmp.txt,tMRIcon.pco,0,0
|
||||||
|
+ covx tTmp.txt,tMainIconAlt.pco,0,0
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",21
|
||||||
|
+ covx tTmp.txt,tMainTextAlt.pco,0,0
|
||||||
|
+ spstr strCommand.txt,tTmp.txt,"~",22
|
||||||
|
+ covx tTmp.txt,tMRIcon.pco,0,0
|
||||||
|
+ spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
|
covx tTmp.txt,tMR.pco,0,0
|
||||||
|
}
|
||||||
|
if(tInstruction.txt=="notify")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
|||||||
+ //lcd_dev fffb 0002 0000 0020
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
@@ -34,7 +34,7 @@
|
@@ -34,7 +34,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
|||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
@@ -142,7 +142,7 @@
|
@@ -142,7 +142,7 @@
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
@@ -500,3 +500,29 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
|
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||||
|
--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
|
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
|
@@ -455,22 +455,6 @@
|
||||||
|
vis tMainIconAlt,1
|
||||||
|
vis tMRIcon,1
|
||||||
|
vis tMR,1
|
||||||
|
- 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
|
||||||
|
}
|
||||||
|
//tMR
|
||||||
|
spstr strCommand.txt,tMR.txt,"~",16
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 06:20:44.752453318 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-24 14:34:14.183683629 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000
|
||||||
+ Hotspot mSwipeNext
|
+ Hotspot mSwipeNext
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
+@@ -1892,6 +2120,169 @@
|
+@@ -1892,6 +2120,169 @@
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
++ }else if(tTmp.txt=="enable")
|
++ }else if(tTmp.txt=="enable")
|
||||||
++ spstr tId.txt,bDown5.txt,"|",2
|
++ spstr tId.txt,bDown5.txt,"|",2
|
||||||
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
+--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
|
+--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000
|
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
+@@ -34,7 +34,7 @@
|
+@@ -34,7 +34,7 @@
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
@@ -43,5 +43,31 @@
|
|||||||
+
|
+
|
||||||
+ Variable (string) entn
|
+ Variable (string) entn
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
|
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||||
|
+--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000
|
||||||
|
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000
|
||||||
|
+@@ -455,22 +455,6 @@
|
||||||
|
+ vis tMainIconAlt,1
|
||||||
|
+ vis tMRIcon,1
|
||||||
|
+ vis tMR,1
|
||||||
|
+- 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
|
||||||
|
+ }
|
||||||
|
+ //tMR
|
||||||
|
+ spstr strCommand.txt,tMR.txt,"~",16
|
||||||
|
|||||||
@@ -44,8 +44,8 @@ cardMedia
|
|||||||
179 Unique line(s) of event code
|
179 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
35 Component(s)
|
35 Component(s)
|
||||||
296 Line(s) of event code
|
282 Line(s) of event code
|
||||||
237 Unique line(s) of event code
|
223 Unique line(s) of event code
|
||||||
popupShutter
|
popupShutter
|
||||||
20 Component(s)
|
20 Component(s)
|
||||||
244 Line(s) of event code
|
244 Line(s) of event code
|
||||||
@@ -58,5 +58,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
13 Page(s)
|
13 Page(s)
|
||||||
414 Component(s)
|
414 Component(s)
|
||||||
4688 Line(s) of event code
|
4674 Line(s) of event code
|
||||||
1239 Unique line(s) of event code
|
1225 Unique line(s) of event code
|
||||||
|
|||||||
@@ -653,7 +653,7 @@ 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 : 203
|
x coordinate : 184
|
||||||
y coordinate : 249
|
y coordinate : 249
|
||||||
Width : 105
|
Width : 105
|
||||||
Height : 41
|
Height : 41
|
||||||
@@ -683,7 +683,7 @@ 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 : 100
|
x coordinate : 44
|
||||||
y coordinate : 260
|
y coordinate : 260
|
||||||
Width : 100
|
Width : 100
|
||||||
Height : 65
|
Height : 65
|
||||||
@@ -713,7 +713,7 @@ Text tMRIcon
|
|||||||
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 : 201
|
x coordinate : 182
|
||||||
y coordinate : 304
|
y coordinate : 304
|
||||||
Width : 40
|
Width : 40
|
||||||
Height : 34
|
Height : 34
|
||||||
@@ -743,7 +743,7 @@ Text tMR
|
|||||||
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 : 243
|
x coordinate : 224
|
||||||
y coordinate : 309
|
y coordinate : 309
|
||||||
Width : 61
|
Width : 61
|
||||||
Height : 20
|
Height : 20
|
||||||
@@ -774,7 +774,7 @@ Text tNotifyHead
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 0
|
x coordinate : 0
|
||||||
y coordinate : 240
|
y coordinate : 236
|
||||||
Width : 320
|
Width : 320
|
||||||
Height : 58
|
Height : 58
|
||||||
Effect : load
|
Effect : load
|
||||||
@@ -804,7 +804,7 @@ Text tNotifyText
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 0
|
x coordinate : 0
|
||||||
y coordinate : 298
|
y coordinate : 294
|
||||||
Width : 320
|
Width : 320
|
||||||
Height : 58
|
Height : 58
|
||||||
Effect : load
|
Effect : load
|
||||||
@@ -979,19 +979,6 @@ Timer tmSerial
|
|||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMRIcon,1
|
vis tMRIcon,1
|
||||||
vis tMR,1
|
vis tMR,1
|
||||||
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
|
|
||||||
}
|
}
|
||||||
//tMR
|
//tMR
|
||||||
spstr strCommand.txt,tMR.txt,"~",16
|
spstr strCommand.txt,tMR.txt,"~",16
|
||||||
@@ -1030,8 +1017,10 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,tDate.pco,0,0
|
covx tTmp.txt,tDate.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",5
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
covx tTmp.txt,tMainIcon.pco,0,0
|
covx tTmp.txt,tMainIcon.pco,0,0
|
||||||
|
tMainIconAlt.pco=tMainIcon.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",6
|
spstr strCommand.txt,tTmp.txt,"~",6
|
||||||
covx tTmp.txt,tMainText.pco,0,0
|
covx tTmp.txt,tMainText.pco,0,0
|
||||||
|
tMainTextAlt.pco=tMainText.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
covx tTmp.txt,tForecast1.pco,0,0
|
covx tTmp.txt,tForecast1.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
spstr strCommand.txt,tTmp.txt,"~",8
|
||||||
@@ -1059,12 +1048,8 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,"~",19
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
covx tTmp.txt,t10.bco,0,0
|
covx tTmp.txt,t10.bco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
spstr strCommand.txt,tTmp.txt,"~",20
|
||||||
covx tTmp.txt,tMainIconAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",21
|
|
||||||
covx tTmp.txt,tMainTextAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",22
|
|
||||||
covx tTmp.txt,tMRIcon.pco,0,0
|
covx tTmp.txt,tMRIcon.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",21
|
||||||
covx tTmp.txt,tMR.pco,0,0
|
covx tTmp.txt,tMR.pco,0,0
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="notify")
|
if(tInstruction.txt=="notify")
|
||||||
|
|||||||
@@ -455,19 +455,6 @@ Timer tmSerial
|
|||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMRIcon,1
|
vis tMRIcon,1
|
||||||
vis tMR,1
|
vis tMR,1
|
||||||
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
|
|
||||||
}
|
}
|
||||||
//tMR
|
//tMR
|
||||||
spstr strCommand.txt,tMR.txt,"~",16
|
spstr strCommand.txt,tMR.txt,"~",16
|
||||||
@@ -506,8 +493,10 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,tDate.pco,0,0
|
covx tTmp.txt,tDate.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",5
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
covx tTmp.txt,tMainIcon.pco,0,0
|
covx tTmp.txt,tMainIcon.pco,0,0
|
||||||
|
tMainIconAlt.pco=tMainIcon.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",6
|
spstr strCommand.txt,tTmp.txt,"~",6
|
||||||
covx tTmp.txt,tMainText.pco,0,0
|
covx tTmp.txt,tMainText.pco,0,0
|
||||||
|
tMainTextAlt.pco=tMainText.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
covx tTmp.txt,tForecast1.pco,0,0
|
covx tTmp.txt,tForecast1.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
spstr strCommand.txt,tTmp.txt,"~",8
|
||||||
@@ -535,12 +524,8 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,"~",19
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
covx tTmp.txt,t10.bco,0,0
|
covx tTmp.txt,t10.bco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
spstr strCommand.txt,tTmp.txt,"~",20
|
||||||
covx tTmp.txt,tMainIconAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",21
|
|
||||||
covx tTmp.txt,tMainTextAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",22
|
|
||||||
covx tTmp.txt,tMRIcon.pco,0,0
|
covx tTmp.txt,tMRIcon.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",21
|
||||||
covx tTmp.txt,tMR.pco,0,0
|
covx tTmp.txt,tMR.pco,0,0
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="notify")
|
if(tInstruction.txt=="notify")
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ popupNotify
|
|||||||
125 Unique line(s) of event code
|
125 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
35 Component(s)
|
35 Component(s)
|
||||||
296 Line(s) of event code
|
297 Line(s) of event code
|
||||||
237 Unique line(s) of event code
|
238 Unique line(s) of event code
|
||||||
popupLight
|
popupLight
|
||||||
27 Component(s)
|
27 Component(s)
|
||||||
345 Line(s) of event code
|
345 Line(s) of event code
|
||||||
@@ -58,5 +58,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
13 Page(s)
|
13 Page(s)
|
||||||
402 Component(s)
|
402 Component(s)
|
||||||
4459 Line(s) of event code
|
4460 Line(s) of event code
|
||||||
1168 Unique line(s) of event code
|
1169 Unique line(s) of event code
|
||||||
|
|||||||
@@ -992,6 +992,9 @@ Timer tmSerial
|
|||||||
tF4Icon.txt=tF3Icon.txt
|
tF4Icon.txt=tF3Icon.txt
|
||||||
tF3Icon.txt=tF2Icon.txt
|
tF3Icon.txt=tF2Icon.txt
|
||||||
tF2Icon.txt=tF1Icon.txt
|
tF2Icon.txt=tF1Icon.txt
|
||||||
|
tF4Icon.pco=tF3Icon.pco
|
||||||
|
tF3Icon.pco=tF2Icon.pco
|
||||||
|
tF2Icon.pco=tF1Icon.pco
|
||||||
}
|
}
|
||||||
//tMR
|
//tMR
|
||||||
spstr strCommand.txt,tMR.txt,"~",16
|
spstr strCommand.txt,tMR.txt,"~",16
|
||||||
@@ -1030,8 +1033,10 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,tDate.pco,0,0
|
covx tTmp.txt,tDate.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",5
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
covx tTmp.txt,tMainIcon.pco,0,0
|
covx tTmp.txt,tMainIcon.pco,0,0
|
||||||
|
tMainIconAlt.pco=tMainIcon.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",6
|
spstr strCommand.txt,tTmp.txt,"~",6
|
||||||
covx tTmp.txt,tMainText.pco,0,0
|
covx tTmp.txt,tMainText.pco,0,0
|
||||||
|
tMainTextAlt.pco=tMainText.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
covx tTmp.txt,tForecast1.pco,0,0
|
covx tTmp.txt,tForecast1.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
spstr strCommand.txt,tTmp.txt,"~",8
|
||||||
@@ -1059,12 +1064,8 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,"~",19
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
covx tTmp.txt,t10.bco,0,0
|
covx tTmp.txt,t10.bco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
spstr strCommand.txt,tTmp.txt,"~",20
|
||||||
covx tTmp.txt,tMainIconAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",21
|
|
||||||
covx tTmp.txt,tMainTextAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",22
|
|
||||||
covx tTmp.txt,tMRIcon.pco,0,0
|
covx tTmp.txt,tMRIcon.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",21
|
||||||
covx tTmp.txt,tMR.pco,0,0
|
covx tTmp.txt,tMR.pco,0,0
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="notify")
|
if(tInstruction.txt=="notify")
|
||||||
|
|||||||
@@ -468,6 +468,9 @@ Timer tmSerial
|
|||||||
tF4Icon.txt=tF3Icon.txt
|
tF4Icon.txt=tF3Icon.txt
|
||||||
tF3Icon.txt=tF2Icon.txt
|
tF3Icon.txt=tF2Icon.txt
|
||||||
tF2Icon.txt=tF1Icon.txt
|
tF2Icon.txt=tF1Icon.txt
|
||||||
|
tF4Icon.pco=tF3Icon.pco
|
||||||
|
tF3Icon.pco=tF2Icon.pco
|
||||||
|
tF2Icon.pco=tF1Icon.pco
|
||||||
}
|
}
|
||||||
//tMR
|
//tMR
|
||||||
spstr strCommand.txt,tMR.txt,"~",16
|
spstr strCommand.txt,tMR.txt,"~",16
|
||||||
@@ -506,8 +509,10 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,tDate.pco,0,0
|
covx tTmp.txt,tDate.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",5
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
covx tTmp.txt,tMainIcon.pco,0,0
|
covx tTmp.txt,tMainIcon.pco,0,0
|
||||||
|
tMainIconAlt.pco=tMainIcon.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",6
|
spstr strCommand.txt,tTmp.txt,"~",6
|
||||||
covx tTmp.txt,tMainText.pco,0,0
|
covx tTmp.txt,tMainText.pco,0,0
|
||||||
|
tMainTextAlt.pco=tMainText.pco
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
covx tTmp.txt,tForecast1.pco,0,0
|
covx tTmp.txt,tForecast1.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
spstr strCommand.txt,tTmp.txt,"~",8
|
||||||
@@ -535,12 +540,8 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,"~",19
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
covx tTmp.txt,t10.bco,0,0
|
covx tTmp.txt,t10.bco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
spstr strCommand.txt,tTmp.txt,"~",20
|
||||||
covx tTmp.txt,tMainIconAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",21
|
|
||||||
covx tTmp.txt,tMainTextAlt.pco,0,0
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",22
|
|
||||||
covx tTmp.txt,tMRIcon.pco,0,0
|
covx tTmp.txt,tMRIcon.pco,0,0
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",21
|
||||||
covx tTmp.txt,tMR.pco,0,0
|
covx tTmp.txt,tMR.pco,0,0
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="notify")
|
if(tInstruction.txt=="notify")
|
||||||
|
|||||||
Reference in New Issue
Block a user