Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-04-13 20:21:36 +00:00
committed by github-actions[bot]
parent 5efd4a6238
commit 03cd60db0f
9 changed files with 315 additions and 271 deletions

View File

@@ -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-04-13 20:17:06.882470529 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:17:07.698466051 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:21:35.478242275 +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/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/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-04-13 20:17:06.886470507 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:17:07.698466051 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:21:35.478242275 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:17:06.886470507 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:17:07.698466051 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:21:35.478242275 +0000
@@ -570,43 +570,25 @@ @@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
@@ -76,8 +76,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tId.txt=="cardAlarm") if(tId.txt=="cardAlarm")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:17:07.698466051 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:21:35.478242275 +0000
@@ -48,18 +48,6 @@ @@ -48,18 +48,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -124,81 +124,3 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -450,77 +458,6 @@
//tMR
spstr strCommand.txt,tMR.txt,"~",16
}
- if(tInstruction.txt=="color")
- {
- spstr strCommand.txt,tTmp.txt,"~",1
- covx tTmp.txt,tTime.bco,0,0
- screensaver.bco=tTime.bco
- tAMPM.bco=tTime.bco
- tDate.bco=tTime.bco
- tMainIcon.bco=tTime.bco
- tMainText.bco=tTime.bco
- tMainIconAlt.bco=tTime.bco
- tMainTextAlt.bco=tTime.bco
- tMRIcon.bco=tTime.bco
- tMR.bco=tTime.bco
- tMRIcon.bco=tTime.bco
- tForecast1.bco=tTime.bco
- tForecast1Val.bco=tTime.bco
- tF1Icon.bco=tTime.bco
- tForecast2.bco=tTime.bco
- tForecast2Val.bco=tTime.bco
- tF2Icon.bco=tTime.bco
- tForecast3.bco=tTime.bco
- tForecast3Val.bco=tTime.bco
- tF3Icon.bco=tTime.bco
- tForecast4.bco=tTime.bco
- tForecast4Val.bco=tTime.bco
- tF4Icon.bco=tTime.bco
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,tTime.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",3
- covx tTmp.txt,tAMPM.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",4
- covx tTmp.txt,tDate.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,tMainIcon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",6
- covx tTmp.txt,tMainText.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",7
- covx tTmp.txt,tForecast1.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",8
- covx tTmp.txt,tForecast2.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",9
- covx tTmp.txt,tForecast3.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",10
- covx tTmp.txt,tForecast4.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",11
- covx tTmp.txt,tF1Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",12
- covx tTmp.txt,tF2Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",13
- covx tTmp.txt,tF3Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",14
- covx tTmp.txt,tF4Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",15
- covx tTmp.txt,tForecast1Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",16
- covx tTmp.txt,tForecast2Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",17
- covx tTmp.txt,tForecast3Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",18
- covx tTmp.txt,tForecast4Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",19
- covx tTmp.txt,t10.bco,0,0
- 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
- spstr strCommand.txt,tTmp.txt,"~",23
- covx tTmp.txt,tMR.pco,0,0
- }
if(tInstruction.txt=="pageType")
{
dim=100

View File

@@ -10,10 +10,6 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
screensaver
33 Component(s)
195 Line(s) of event code
152 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
329 Line(s) of event code 329 Line(s) of event code
@@ -50,9 +46,13 @@ popupLight
27 Component(s) 27 Component(s)
320 Line(s) of event code 320 Line(s) of event code
173 Unique line(s) of event code 173 Unique line(s) of event code
screensaver
33 Component(s)
266 Line(s) of event code
218 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
341 Component(s) 341 Component(s)
3571 Line(s) of event code 3642 Line(s) of event code
947 Unique line(s) of event code 1001 Unique line(s) of event code

View File

@@ -980,6 +980,77 @@ Timer tmSerial
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
} }
if(tInstruction.txt=="color")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco
tAMPM.bco=tTime.bco
tDate.bco=tTime.bco
tMainIcon.bco=tTime.bco
tMainText.bco=tTime.bco
tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco
tForecast2.bco=tTime.bco
tForecast2Val.bco=tTime.bco
tF2Icon.bco=tTime.bco
tForecast3.bco=tTime.bco
tForecast3Val.bco=tTime.bco
tF3Icon.bco=tTime.bco
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,tAMPM.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
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
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100

View File

@@ -458,6 +458,77 @@ Timer tmSerial
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
} }
if(tInstruction.txt=="color")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco
tAMPM.bco=tTime.bco
tDate.bco=tTime.bco
tMainIcon.bco=tTime.bco
tMainText.bco=tTime.bco
tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco
tForecast2.bco=tTime.bco
tForecast2Val.bco=tTime.bco
tF2Icon.bco=tTime.bco
tForecast3.bco=tTime.bco
tForecast3Val.bco=tTime.bco
tF3Icon.bco=tTime.bco
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,tAMPM.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
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
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100

View File

@@ -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-04-13 20:17:06.882470529 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:21:35.070233972 +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-04-13 20:17:06.886470507 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:21:35.070233972 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -427,8 +427,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/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-04-13 20:17:06.886470507 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:21:35.070233972 +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
@@ -447,84 +447,3 @@ 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-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000
@@ -450,77 +450,6 @@
//tMR
spstr strCommand.txt,tMR.txt,"~",16
}
- if(tInstruction.txt=="color")
- {
- spstr strCommand.txt,tTmp.txt,"~",1
- covx tTmp.txt,tTime.bco,0,0
- screensaver.bco=tTime.bco
- tAMPM.bco=tTime.bco
- tDate.bco=tTime.bco
- tMainIcon.bco=tTime.bco
- tMainText.bco=tTime.bco
- tMainIconAlt.bco=tTime.bco
- tMainTextAlt.bco=tTime.bco
- tMRIcon.bco=tTime.bco
- tMR.bco=tTime.bco
- tMRIcon.bco=tTime.bco
- tForecast1.bco=tTime.bco
- tForecast1Val.bco=tTime.bco
- tF1Icon.bco=tTime.bco
- tForecast2.bco=tTime.bco
- tForecast2Val.bco=tTime.bco
- tF2Icon.bco=tTime.bco
- tForecast3.bco=tTime.bco
- tForecast3Val.bco=tTime.bco
- tF3Icon.bco=tTime.bco
- tForecast4.bco=tTime.bco
- tForecast4Val.bco=tTime.bco
- tF4Icon.bco=tTime.bco
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,tTime.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",3
- covx tTmp.txt,tAMPM.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",4
- covx tTmp.txt,tDate.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,tMainIcon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",6
- covx tTmp.txt,tMainText.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",7
- covx tTmp.txt,tForecast1.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",8
- covx tTmp.txt,tForecast2.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",9
- covx tTmp.txt,tForecast3.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",10
- covx tTmp.txt,tForecast4.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",11
- covx tTmp.txt,tF1Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",12
- covx tTmp.txt,tF2Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",13
- covx tTmp.txt,tF3Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",14
- covx tTmp.txt,tF4Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",15
- covx tTmp.txt,tForecast1Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",16
- covx tTmp.txt,tForecast2Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",17
- covx tTmp.txt,tForecast3Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",18
- covx tTmp.txt,tForecast4Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",19
- covx tTmp.txt,t10.bco,0,0
- 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
- spstr strCommand.txt,tTmp.txt,"~",23
- covx tTmp.txt,tMR.pco,0,0
- }
if(tInstruction.txt=="pageType")
{
dim=100

View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:17:07.294468268 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:21:35.094234461 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:21:35.070233972 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:17:06.886470507 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:21:35.070233972 +0000
+@@ -62,6 +62,16 @@ +@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@ +@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@ +@@ -153,6 +175,15 @@
@@ -15,86 +15,5 @@
+ } + }
+ if(tInstruction.txt=="pageType") + if(tInstruction.txt=="pageType")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:21:35.070233972 +0000
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000
+@@ -450,77 +450,6 @@
+ //tMR
+ spstr strCommand.txt,tMR.txt,"~",16
+ }
+- if(tInstruction.txt=="color")
+- {
+- spstr strCommand.txt,tTmp.txt,"~",1
+- covx tTmp.txt,tTime.bco,0,0
+- screensaver.bco=tTime.bco
+- tAMPM.bco=tTime.bco
+- tDate.bco=tTime.bco
+- tMainIcon.bco=tTime.bco
+- tMainText.bco=tTime.bco
+- tMainIconAlt.bco=tTime.bco
+- tMainTextAlt.bco=tTime.bco
+- tMRIcon.bco=tTime.bco
+- tMR.bco=tTime.bco
+- tMRIcon.bco=tTime.bco
+- tForecast1.bco=tTime.bco
+- tForecast1Val.bco=tTime.bco
+- tF1Icon.bco=tTime.bco
+- tForecast2.bco=tTime.bco
+- tForecast2Val.bco=tTime.bco
+- tF2Icon.bco=tTime.bco
+- tForecast3.bco=tTime.bco
+- tForecast3Val.bco=tTime.bco
+- tF3Icon.bco=tTime.bco
+- tForecast4.bco=tTime.bco
+- tForecast4Val.bco=tTime.bco
+- tF4Icon.bco=tTime.bco
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,tTime.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",3
+- covx tTmp.txt,tAMPM.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",4
+- covx tTmp.txt,tDate.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",5
+- covx tTmp.txt,tMainIcon.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",6
+- covx tTmp.txt,tMainText.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",7
+- covx tTmp.txt,tForecast1.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",8
+- covx tTmp.txt,tForecast2.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",9
+- covx tTmp.txt,tForecast3.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",10
+- covx tTmp.txt,tForecast4.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",11
+- covx tTmp.txt,tF1Icon.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",12
+- covx tTmp.txt,tF2Icon.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",13
+- covx tTmp.txt,tF3Icon.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",14
+- covx tTmp.txt,tF4Icon.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",15
+- covx tTmp.txt,tForecast1Val.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",16
+- covx tTmp.txt,tForecast2Val.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",17
+- covx tTmp.txt,tForecast3Val.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",18
+- covx tTmp.txt,tForecast4Val.pco,0,0
+- spstr strCommand.txt,tTmp.txt,"~",19
+- covx tTmp.txt,t10.bco,0,0
+- 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
+- spstr strCommand.txt,tTmp.txt,"~",23
+- covx tTmp.txt,tMR.pco,0,0
+- }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100

View File

@@ -28,8 +28,8 @@ popupLight
182 Unique line(s) of event code 182 Unique line(s) of event code
screensaver screensaver
33 Component(s) 33 Component(s)
195 Line(s) of event code 266 Line(s) of event code
152 Unique line(s) of event code 218 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
329 Line(s) of event code 329 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total Total
12 Page(s) 12 Page(s)
353 Component(s) 353 Component(s)
3782 Line(s) of event code 3853 Line(s) of event code
1003 Unique line(s) of event code 1057 Unique line(s) of event code

View File

@@ -934,6 +934,77 @@ Timer tmSerial
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
} }
if(tInstruction.txt=="color")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco
tAMPM.bco=tTime.bco
tDate.bco=tTime.bco
tMainIcon.bco=tTime.bco
tMainText.bco=tTime.bco
tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco
tForecast2.bco=tTime.bco
tForecast2Val.bco=tTime.bco
tF2Icon.bco=tTime.bco
tForecast3.bco=tTime.bco
tForecast3Val.bco=tTime.bco
tF3Icon.bco=tTime.bco
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,tAMPM.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
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
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100

View File

@@ -450,6 +450,77 @@ Timer tmSerial
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
} }
if(tInstruction.txt=="color")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco
tAMPM.bco=tTime.bco
tDate.bco=tTime.bco
tMainIcon.bco=tTime.bco
tMainText.bco=tTime.bco
tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco
tForecast2.bco=tTime.bco
tForecast2Val.bco=tTime.bco
tF2Icon.bco=tTime.bco
tForecast3.bco=tTime.bco
tForecast3Val.bco=tTime.bco
tF3Icon.bco=tTime.bco
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,tAMPM.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
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
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100