h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 23:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-07-07 21:52:24 +00:00
committed by github-actions[bot]
parent 4712f7342e
commit f0773f9026
20 changed files with 493 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
HMI/US/landscape/diff-eu-version.txt
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-07 21:52:21.071078168 +0000
@@ -11,9 +11,4 @@ @@ -11,9 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -12,17 +12,20 @@ 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,21 +12,6 @@ @@ -12,24 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<40;sys0++)
- { - {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- } - }
- }
- if(defaultBcoColor==0) - if(defaultBcoColor==0)
- { - {
- tCode.bco=6371 - tCode.bco=6371
@@ -36,7 +39,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -138,7 +123,7 @@ @@ -141,7 +123,7 @@
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
@@ -45,7 +48,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
Max. Text Size : 10 Max. Text Size : 10
Text tIcon Text tIcon
@@ -755,18 +740,6 @@ @@ -758,18 +740,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -65,16 +68,19 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,22 +12,6 @@ @@ -12,25 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0) - if(b[sys0].type==53&&defaultBcoColor==0)
- { - {
- b[sys0].pic=10 - b[sys0].pic=10
@@ -90,7 +96,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -1024,10 +1008,6 @@ @@ -1027,10 +1008,6 @@
//popupLight.tEntity.txt=tEntity3.txt //popupLight.tEntity.txt=tEntity3.txt
page popupLight page popupLight
} }
@@ -101,7 +107,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot m1 Hotspot m1
Attributes Attributes
@@ -1050,10 +1030,6 @@ @@ -1053,10 +1030,6 @@
//popupLight.tEntity.txt=tEntity2.txt //popupLight.tEntity.txt=tEntity2.txt
page popupLight page popupLight
} }
@@ -112,7 +118,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot m0 Hotspot m0
Attributes Attributes
@@ -1076,10 +1052,6 @@ @@ -1079,10 +1052,6 @@
//popupLight.tEntity.txt=tEntity1.txt //popupLight.tEntity.txt=tEntity1.txt
page popupLight page popupLight
} }
@@ -123,7 +129,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot m3 Hotspot m3
Attributes Attributes
@@ -1102,10 +1074,6 @@ @@ -1105,10 +1074,6 @@
//popupLight.tEntity.txt=tEntity4.txt //popupLight.tEntity.txt=tEntity4.txt
page popupLight page popupLight
} }
@@ -134,7 +140,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
@@ -1961,18 +1929,6 @@ @@ -1964,18 +1929,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -154,21 +160,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,11 +12,6 @@ @@ -12,14 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- } - }
dim=dimValueNormal dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
@@ -855,18 +850,6 @@ @@ -858,18 +850,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -187,7 +196,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
@@ -928,10 +911,6 @@ @@ -931,10 +911,6 @@
{ {
page popupLight page popupLight
} }
@@ -199,17 +208,20 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0 TouchCap tc0
Attributes Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,17 +12,6 @@ @@ -12,20 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<34;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- } - }
- }
- if(defaultBcoColor==0) - if(defaultBcoColor==0)
- { - {
- hVolume.pic=14 - hVolume.pic=14
@@ -219,7 +231,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -677,18 +666,6 @@ @@ -680,18 +666,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -239,16 +251,19 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,21 +12,6 @@ @@ -12,24 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<32;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==6371) - if(b[sys0].type==53&&defaultBcoColor==6371)
- { - {
- b[sys0].pic=1 - b[sys0].pic=1
@@ -263,7 +278,7 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -624,18 +609,6 @@ @@ -627,18 +609,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -283,21 +298,30 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,11 +12,6 @@ @@ -12,20 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<60;sys0++) - for(sys0=0;sys0<53;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].bco2=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- } - }
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -1161,18 +1156,6 @@ @@ -1170,18 +1156,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -317,8 +341,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-07 21:52:21.071078168 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -348,8 +372,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-07 21:52:21.071078168 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -399,16 +423,19 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Attributes Attributes
Only in HMI/n2t-out: popupFan.txt Only in HMI/n2t-out: popupFan.txt
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,25 +12,6 @@ @@ -12,28 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<27;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0) - if(b[sys0].type==53&&defaultBcoColor==0)
- { - {
- b[sys0].pic=10 - b[sys0].pic=10
@@ -427,7 +454,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -585,18 +566,6 @@ @@ -588,18 +566,6 @@
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0 covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal dim=dimValueNormal
@@ -447,8 +474,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-07 21:52:21.071078168 +0000
@@ -18,17 +18,6 @@ @@ -18,17 +18,6 @@
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
@@ -487,8 +514,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,40 +12,6 @@ @@ -12,40 +12,6 @@
Events Events
@@ -656,8 +683,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/screensaver.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-07 19:52:19.367317435 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-07 21:52:21.071078168 +0000
@@ -406,22 +406,10 @@ @@ -406,22 +406,10 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

169
HMI/US/portrait/diff-eu-version.txt
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 21:52:20.607071209 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -11,9 +11,22 @@ 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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.607071209 +0000
@@ -138,7 +138,7 @@ @@ -14,12 +14,9 @@
Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
- if(b[sys0].type==98||b[sys0].type==116)
- {
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
- }
if(defaultBcoColor==0)
{
tCode.bco=6371
@@ -141,7 +138,7 @@
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
@@ -23,9 +36,24 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Text tIcon Text tIcon
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 21:52:20.611071269 +0000
@@ -81,6 +81,18 @@ @@ -12,13 +12,10 @@
Events
Preinitialize Event
- for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
- }
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
@@ -84,6 +81,18 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -44,7 +72,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -136,6 +148,18 @@ @@ -139,6 +148,18 @@
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
@@ -63,7 +91,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1 Number nNum1
Attributes Attributes
Scope : local Scope : local
@@ -172,6 +196,15 @@ @@ -175,6 +196,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -79,7 +107,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
@@ -302,6 +335,26 @@ @@ -305,6 +335,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -106,7 +134,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -421,6 +474,34 @@ @@ -424,6 +474,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -141,7 +169,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -878,6 +959,106 @@ @@ -881,6 +959,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -248,7 +276,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -986,6 +1167,33 @@ @@ -989,6 +1167,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -282,7 +310,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1024,10 +1232,6 @@ @@ -1027,10 +1232,6 @@
//popupLight.tEntity.txt=tEntity3.txt //popupLight.tEntity.txt=tEntity3.txt
page popupLight page popupLight
} }
@@ -293,7 +321,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot m1 Hotspot m1
Attributes Attributes
@@ -1050,10 +1254,6 @@ @@ -1053,10 +1254,6 @@
//popupLight.tEntity.txt=tEntity2.txt //popupLight.tEntity.txt=tEntity2.txt
page popupLight page popupLight
} }
@@ -304,7 +332,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot m0 Hotspot m0
Attributes Attributes
@@ -1076,10 +1276,6 @@ @@ -1079,10 +1276,6 @@
//popupLight.tEntity.txt=tEntity1.txt //popupLight.tEntity.txt=tEntity1.txt
page popupLight page popupLight
} }
@@ -315,7 +343,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot m3 Hotspot m3
Attributes Attributes
@@ -1102,9 +1298,27 @@ @@ -1105,9 +1298,27 @@
//popupLight.tEntity.txt=tEntity4.txt //popupLight.tEntity.txt=tEntity4.txt
page popupLight page popupLight
} }
@@ -346,9 +374,25 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 21:52:20.611071269 +0000
@@ -928,10 +928,6 @@ @@ -12,14 +12,11 @@
Events
Preinitialize Event
- for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
- }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -931,10 +928,6 @@
{ {
page popupLight page popupLight
} }
@@ -359,17 +403,39 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0 TouchCap tc0
Attributes Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-07 21:52:20.607071209 +0000
@@ -12,21 +12,6 @@ @@ -12,14 +12,11 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<34;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
- }
if(defaultBcoColor==0)
{
hVolume.pic=14
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 21:52:20.607071209 +0000
@@ -12,24 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<32;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==6371) - if(b[sys0].type==53&&defaultBcoColor==6371)
- { - {
- b[sys0].pic=1 - b[sys0].pic=1
@@ -385,23 +451,32 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 21:52:20.611071269 +0000
@@ -12,11 +12,6 @@ @@ -12,20 +12,6 @@
Events Events
Preinitialize Event Preinitialize Event
- for(sys0=0;sys0<60;sys0++) - for(sys0=0;sys0<53;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
- { - {
- b[sys0].bco=defaultBcoColor - b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].bco2=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- } - }
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
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-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 21:52:20.607071209 +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
@@ -421,8 +496,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 21:52:20.607071209 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -471,9 +546,27 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Picture p0 Picture p0
Attributes Attributes
Only in HMI/n2t-out: popupFan.txt Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-07 21:52:20.607071209 +0000
@@ -12,13 +12,10 @@
Events
Preinitialize Event
- for(sys0=0;sys0<27;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
- }
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 21:52:20.607071209 +0000
@@ -18,17 +18,6 @@ @@ -18,17 +18,6 @@
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
@@ -493,8 +586,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 19:52:18.875307970 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 21:52:20.607071209 +0000
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none

169
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,14 +1,27 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-07 19:52:18.891308278 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-07-07 21:52:20.623071449 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@
+ //color vars + //color vars
+ int defaultFontColor=65535 + int defaultFontColor=65535
+ int defaultBcoColor=6371 + int defaultBcoColor=6371
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -138,7 +138,7 @@ +@@ -14,12 +14,9 @@
+ Preinitialize Event
+ for(sys0=0;sys0<40;sys0++)
+ {
+- if(b[sys0].type==98||b[sys0].type==116)
+- {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+- }
+ if(defaultBcoColor==0)
+ {
+ tCode.bco=6371
+@@ -141,7 +138,7 @@
+ 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
@@ -17,24 +30,39 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ Text tIcon + Text tIcon
+--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 21:52:20.611071269 +0000
+@@ -81,6 +81,18 @@ +@@ -12,13 +12,10 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<65;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
++ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+- }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+@@ -84,6 +81,18 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
++ vis bPrev,0 ++ vis bPrev,0
++ vis bNext,0 ++ vis bNext,0
+ Variable (string) strCommand + Variable (string) strCommand
+ Attributes + Attributes
+@@ -136,6 +148,18 @@ +@@ -139,6 +148,18 @@
+@@ -172,6 +196,15 @@ +@@ -175,6 +196,15 @@
+@@ -302,6 +335,26 @@ +@@ -305,6 +335,26 @@
+@@ -421,6 +474,34 @@ +@@ -424,6 +474,34 @@
+@@ -878,6 +959,106 @@ +@@ -881,6 +959,106 @@
++ Text : ++ Text :
++ Max. Text Size : 20 ++ Max. Text Size : 20
+@@ -986,6 +1167,33 @@ +@@ -989,6 +1167,33 @@
+@@ -1024,10 +1232,6 @@ +@@ -1027,10 +1232,6 @@
+ //popupLight.tEntity.txt=tEntity3.txt + //popupLight.tEntity.txt=tEntity3.txt
+ page popupLight + page popupLight
+ } + }
@@ -45,7 +73,7 @@
+ +
+ Hotspot m1 + Hotspot m1
+ Attributes + Attributes
+@@ -1050,10 +1254,6 @@ +@@ -1053,10 +1254,6 @@
+ //popupLight.tEntity.txt=tEntity2.txt + //popupLight.tEntity.txt=tEntity2.txt
+ page popupLight + page popupLight
+ } + }
@@ -56,7 +84,7 @@
+ +
+ Hotspot m0 + Hotspot m0
+ Attributes + Attributes
+@@ -1076,10 +1276,6 @@ +@@ -1079,10 +1276,6 @@
+ //popupLight.tEntity.txt=tEntity1.txt + //popupLight.tEntity.txt=tEntity1.txt
+- if(type1.txt=="fan") +- if(type1.txt=="fan")
+- { +- {
@@ -64,7 +92,7 @@
+- } +- }
+ Hotspot m3 + Hotspot m3
+ Attributes + Attributes
+@@ -1102,9 +1298,27 @@ +@@ -1105,9 +1298,27 @@
+ //popupLight.tEntity.txt=tEntity4.txt + //popupLight.tEntity.txt=tEntity4.txt
+ page popupLight + page popupLight
+ } + }
@@ -75,9 +103,25 @@
+ } + }
+ +
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 21:52:20.611071269 +0000
+@@ -928,10 +928,6 @@ +@@ -12,14 +12,11 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<42;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
++ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+- }
+ dim=dimValueNormal
+ //remove background & activate reparse mode
+ vis p0,0
+@@ -931,10 +928,6 @@
+ { + {
+ page popupLight + page popupLight
+ } + }
@@ -87,15 +131,37 @@
+- } +- }
+ +
+ TouchCap tc0 + TouchCap tc0
+--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000 +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 19:52:18.875307970 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000
+@@ -12,21 +12,6 @@ ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -12,14 +12,11 @@
+
+ Events + Events
+ Preinitialize Event + Preinitialize Event
+- for(sys0=0;sys0<40;sys0++) +- for(sys0=0;sys0<34;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
++ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+- }
+ if(defaultBcoColor==0)
+ {
+ hVolume.pic=14
+--- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -12,24 +12,6 @@
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<32;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
+- { +- {
+- b[sys0].bco=defaultBcoColor +- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor +- b[sys0].pco=defaultFontColor
+- }
+- if(b[sys0].type==53&&defaultBcoColor==6371) +- if(b[sys0].type==53&&defaultBcoColor==6371)
+- { +- {
+- b[sys0].pic=1 +- b[sys0].pic=1
@@ -111,25 +177,34 @@
+ vis p0,0 + vis p0,0
+ vis tSend,0 + vis tSend,0
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 21:52:20.611071269 +0000
+@@ -12,11 +12,6 @@ +@@ -12,20 +12,6 @@
+ +
+ Events + Events
+ Preinitialize Event + Preinitialize Event
+- for(sys0=0;sys0<60;sys0++) +- for(sys0=0;sys0<53;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
+- { +- {
+- b[sys0].bco=defaultBcoColor +- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor +- b[sys0].pco=defaultFontColor
+- } +- }
+- if(b[sys0].type==53)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].bco2=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- }
+ dim=dimValueNormal + dim=dimValueNormal
+ vis p0,0 + vis p0,0
+ vis tSend,0 + vis tSend,0
+--- HMI/n2t-out/pageStartup.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 21:52:20.607071209 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -13,46 +13,6 @@ +@@ -13,46 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -178,9 +253,27 @@
+ Picture p0 + Picture p0
+ Attributes + Attributes
+Only in HMI/n2t-out: popupFan.txt +Only in HMI/n2t-out: popupFan.txt
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -12,13 +12,10 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<27;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
++ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+- }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -18,17 +18,6 @@ +@@ -18,17 +18,6 @@
+ vis tTmp,0 + vis tTmp,0
+ vis tInstruction,0 + vis tInstruction,0
@@ -200,8 +293,8 @@
+ Variable (string) strCommand + Variable (string) strCommand
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 19:52:18.875307970 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 21:52:20.607071209 +0000
+@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none

3
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -21,10 +21,13 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
}
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
tCode.bco=6371 tCode.bco=6371

5
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -20,10 +20,13 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<65;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0) if(b[sys0].type==53&&defaultBcoColor==0)
{ {
b[sys0].pic=10 b[sys0].pic=10

5
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -20,11 +20,14 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
}
dim=dimValueNormal dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0

5
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -20,11 +20,14 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<34;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
}
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hVolume.pic=14 hVolume.pic=14

5
HMI/n2t-out-visual/cardQR.txt
View File

@@ -20,10 +20,13 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371) if(b[sys0].type==53&&defaultBcoColor==6371)
{ {
b[sys0].pic=1 b[sys0].pic=1

11
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -20,11 +20,20 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<60;sys0++) for(sys0=0;sys0<53;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
if(b[sys0].type==53)
{
b[sys0].bco=defaultBcoColor
b[sys0].bco2=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0

52
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -18,49 +18,49 @@ popupNotify
17 Component(s) 17 Component(s)
225 Line(s) of event code 225 Line(s) of event code
143 Unique line(s) of event code 143 Unique line(s) of event code
popupLight cardGrid
27 Component(s) 42 Component(s)
382 Line(s) of event code 461 Line(s) of event code
209 Unique line(s) of event code 270 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
332 Line(s) of event code 332 Line(s) of event code
257 Unique line(s) of event code 257 Unique line(s) of event code
popupFan
20 Component(s)
230 Line(s) of event code
146 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
399 Line(s) of event code 402 Line(s) of event code
232 Unique line(s) of event code 233 Unique line(s) of event code
cardMedia popupFan
34 Component(s) 20 Component(s)
384 Line(s) of event code 233 Line(s) of event code
207 Unique line(s) of event code 147 Unique line(s) of event code
popupLight
27 Component(s)
385 Line(s) of event code
210 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
388 Line(s) of event code 388 Line(s) of event code
211 Unique line(s) of event code 211 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
417 Line(s) of event code 420 Line(s) of event code
252 Unique line(s) of event code 253 Unique line(s) of event code
cardMedia
34 Component(s)
387 Line(s) of event code
208 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
570 Line(s) of event code 579 Line(s) of event code
299 Unique line(s) of event code 302 Unique line(s) of event code
cardGrid
42 Component(s)
458 Line(s) of event code
269 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1175 Line(s) of event code 1178 Line(s) of event code
516 Unique line(s) of event code 517 Unique line(s) of event code
Total Total
14 Page(s) 14 Page(s)
436 Component(s) 436 Component(s)
5156 Line(s) of event code 5186 Line(s) of event code
1336 Unique line(s) of event code 1346 Unique line(s) of event code

3
HMI/n2t-out-visual/popupFan.txt
View File

@@ -21,9 +21,12 @@ Page popupFan
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0) if(b[sys0].type==53&&defaultBcoColor==0)
{ {
b[sys0].pic=10 b[sys0].pic=10

5
HMI/n2t-out-visual/popupLight.txt
View File

@@ -20,10 +20,13 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0) if(b[sys0].type==53&&defaultBcoColor==0)
{ {
b[sys0].pic=10 b[sys0].pic=10

3
HMI/n2t-out/cardAlarm.txt
View File

@@ -13,10 +13,13 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
}
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
tCode.bco=6371 tCode.bco=6371

5
HMI/n2t-out/cardEntities.txt
View File

@@ -12,10 +12,13 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<65;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0) if(b[sys0].type==53&&defaultBcoColor==0)
{ {
b[sys0].pic=10 b[sys0].pic=10

5
HMI/n2t-out/cardGrid.txt
View File

@@ -12,11 +12,14 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
}
dim=dimValueNormal dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0

5
HMI/n2t-out/cardMedia.txt
View File

@@ -12,11 +12,14 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<34;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
}
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hVolume.pic=14 hVolume.pic=14

5
HMI/n2t-out/cardQR.txt
View File

@@ -12,10 +12,13 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371) if(b[sys0].type==53&&defaultBcoColor==6371)
{ {
b[sys0].pic=1 b[sys0].pic=1

11
HMI/n2t-out/cardThermo.txt
View File

@@ -12,11 +12,20 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<60;sys0++) for(sys0=0;sys0<53;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
if(b[sys0].type==53)
{
b[sys0].bco=defaultBcoColor
b[sys0].bco2=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0

3
HMI/n2t-out/popupFan.txt
View File

@@ -13,9 +13,12 @@ Page popupFan
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0) if(b[sys0].type==53&&defaultBcoColor==0)
{ {
b[sys0].pic=10 b[sys0].pic=10

5
HMI/n2t-out/popupLight.txt
View File

@@ -12,10 +12,13 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{ {
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0) if(b[sys0].type==53&&defaultBcoColor==0)
{ {
b[sys0].pic=10 b[sys0].pic=10