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

This commit is contained in:
joBr99
2022-07-13 16:57:11 +00:00
committed by github-actions[bot]
parent 21b00bc573
commit eb07944deb
22 changed files with 916 additions and 696 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-07-12 19:48:18.749451287 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-12 19:48:19.897452968 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-13 16:57:07.448403502 +0000
@@ -11,9 +11,4 @@ @@ -11,9 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -12,12 +12,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-13 16:57:07.452403499 +0000
@@ -12,25 +12,6 @@ @@ -37,25 +37,6 @@
vis tCode,0
Events vis bPrev,0
Preinitialize Event vis bNext,0
- cardAlarm.bco=defaultBcoColor - cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<40;sys0++)
- { - {
@@ -37,18 +37,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
- tCode.bco=10565 - tCode.bco=10565
- tCode.pco=40179 - tCode.pco=40179
- } - }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -142,7 +123,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : xxxxxxx
+ Text :
Max. Text Size : 10
Text tIcon Variable (string) strCommand
Attributes
@@ -759,18 +740,6 @@ @@ -759,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
@@ -69,12 +60,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,26 +12,6 @@ @@ -65,26 +65,6 @@
vis nNum4,0
Events vis bPrev,0
Preinitialize Event vis bNext,0
- cardEntities.bco=defaultBcoColor - cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++) - for(sys0=0;sys0<65;sys0++)
- { - {
@@ -95,9 +86,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
- b[sys0].pic2=15 - b[sys0].pic2=15
- } - }
- } - }
dim=dimValueNormal
//wup=cardEntities Variable (string) strCommand
//remove background & activate reparse mode Attributes
@@ -1028,10 +1008,6 @@ @@ -1028,10 +1008,6 @@
//popupLight.tEntity.txt=tEntity3.txt //popupLight.tEntity.txt=tEntity3.txt
page popupLight page popupLight
@@ -162,12 +153,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,15 +12,6 @@ @@ -36,15 +36,6 @@
vis tEntity6,0
Events vis bPrev,0
Preinitialize Event vis bNext,0
- cardGrid.bco=defaultBcoColor - cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++) - for(sys0=0;sys0<42;sys0++)
- { - {
@@ -177,9 +168,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- } - }
- } - }
dim=dimValueNormal
//remove background & activate reparse mode Variable (string) strCommand
vis p0,0 Attributes
@@ -859,18 +850,6 @@ @@ -859,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
@@ -211,12 +202,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-12 19:48:19.897452968 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,21 +12,6 @@ @@ -21,21 +21,6 @@
vis t5,0
Events vis bPrev,0
Preinitialize Event vis bNext,0
- cardMedia.bco=defaultBcoColor - cardMedia.bco=defaultBcoColor
- for(sys0=0;sys0<34;sys0++) - for(sys0=0;sys0<34;sys0++)
- { - {
@@ -232,9 +223,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
- hVolume.pic1=13 - hVolume.pic1=13
- hVolume.pic2=15 - hVolume.pic2=15
- } - }
dim=dimValueNormal
vis p0,0 Variable (string) strCommand
vis tSend,0 Attributes
@@ -681,18 +666,6 @@ @@ -681,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
@@ -255,12 +246,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,25 +12,6 @@ @@ -32,25 +32,6 @@
vis bText2,0
Events tsw m0,0
Preinitialize Event tsw m1,0
- cardQR.bco=defaultBcoColor - cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++) - for(sys0=0;sys0<32;sys0++)
- { - {
@@ -280,9 +271,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
- b[sys0].pic2=11 - b[sys0].pic2=11
- } - }
- } - }
dim=dimValueNormal
vis p0,0 Variable (string) strCommand
vis tSend,0 Attributes
@@ -628,18 +609,6 @@ @@ -628,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
@@ -303,12 +294,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-13 16:57:07.452403499 +0000
@@ -12,21 +12,6 @@ @@ -41,21 +41,6 @@
vis xTempDest1,0
Events vis bPrev,0
Preinitialize Event vis bNext,0
- cardThermo.bco=defaultBcoColor - cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++) - for(sys0=0;sys0<53;sys0++)
- { - {
@@ -324,9 +315,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- } - }
- } - }
dim=dimValueNormal
vis p0,0 Variable (string) strCommand
vis tSend,0 Attributes
@@ -1171,18 +1156,6 @@ @@ -1171,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
@@ -347,8 +338,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-12 19:48:18.749451287 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-13 16:57:07.448403502 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -378,8 +369,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-12 19:48:18.749451287 +0000 --- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-12 19:48:19.897452968 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-13 16:57:07.448403502 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -429,12 +420,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,29 +12,6 @@ @@ -50,29 +50,6 @@
vis t0,0
Events vis pColorWheel,0
Preinitialize Event //vis t0,0
- popupLight.bco=defaultBcoColor - popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++) - for(sys0=0;sys0<27;sys0++)
- { - {
@@ -458,9 +449,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
- hTempSlider.pic1=17 - hTempSlider.pic1=17
- hTempSlider.pic2=15 - hTempSlider.pic2=15
- } - }
dim=dimValueNormal
//get entitiy name Variable (string) strCommand
tEntity.txt=pageIcons.tTmp1.txt Attributes
@@ -589,18 +566,6 @@ @@ -589,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
@@ -481,8 +472,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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,24 +12,12 @@ @@ -12,24 +12,12 @@
Events Events
@@ -528,12 +519,12 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,40 +12,6 @@ @@ -40,40 +40,6 @@
prints sys0,2
Events prints tSend.txt,0
Preinitialize Event prints crcval,2
- popupShutter.bco=defaultBcoColor - popupShutter.bco=defaultBcoColor
- b0.bco=defaultBcoColor - b0.bco=defaultBcoColor
- tIcon1.bco=defaultBcoColor - tIcon1.bco=defaultBcoColor
@@ -568,9 +559,9 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
- hPosition.pic1=13 - hPosition.pic1=13
- hPosition.pic2=15 - hPosition.pic2=15
- } - }
dim=dimValueNormal
//get entitiy name Variable (string) strCommand
tEntity.txt=pageIcons.tTmp1.txt Attributes
@@ -143,7 +109,7 @@ @@ -143,7 +109,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -697,8 +688,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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/screensaver.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-12 19:48:19.901452974 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-13 16:57:07.452403499 +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

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-12 19:48:18.749451287 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-12 19:48:19.285452072 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-13 16:57:06.972403853 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -11,56 +11,106 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.285452072 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,15 +12,11 @@ @@ -12,6 +12,21 @@
Events Events
Preinitialize Event Preinitialize Event
+ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(defaultBcoColor==0)
+ {
+ tCode.bco=6371
+ tCode.pco=40179
+ }
+ if(defaultBcoColor==6371)
+ {
+ tCode.bco=10565
+ tCode.pco=40179
+ }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -37,25 +52,6 @@
vis tCode,0
vis bPrev,0
vis bNext,0
- cardAlarm.bco=defaultBcoColor - cardAlarm.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) - for(sys0=0;sys0<40;sys0++)
{ - {
- if(b[sys0].type==98||b[sys0].type==116) - 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)
- {
- tCode.bco=6371
- tCode.pco=40179
- }
- if(defaultBcoColor==6371)
- {
- tCode.bco=10565
- tCode.pco=40179
- } - }
if(defaultBcoColor==0)
{
tCode.bco=6371
@@ -142,7 +138,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : xxxxxxx
+ Text :
Max. Text Size : 10
Text tIcon Variable (string) strCommand
Attributes
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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-12 19:48:19.289452078 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-13 16:57:06.976403850 +0000
@@ -12,14 +12,10 @@ @@ -12,6 +12,22 @@
Events Events
Preinitialize Event Preinitialize Event
+ 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
+ b[sys0].pic2=11
+ }
+ if(b[sys0].type==1&&defaultBcoColor==0)
+ {
+ b[sys0].pic=14
+ b[sys0].pic1=13
+ b[sys0].pic2=15
+ }
+ }
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -65,26 +81,18 @@
vis nNum4,0
vis bPrev,0
vis bNext,0
- cardEntities.bco=defaultBcoColor - cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++) - for(sys0=0;sys0<65;sys0++)
- { - {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) - 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].bco=defaultBcoColor - b[sys0].pco=defaultFontColor
b[sys0].pco=defaultFontColor - }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- if(b[sys0].type==1&&defaultBcoColor==0)
- {
- b[sys0].pic=14
- b[sys0].pic1=13
- b[sys0].pic2=15
- }
- } - }
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
@@ -85,6 +81,18 @@
vis nNum4,0
vis bPrev,0
vis bNext,0
+ //ui e5 + //ui e5
+ vis btOnOff5,0 + vis btOnOff5,0
+ vis bUp5,0 + vis bUp5,0
@@ -378,25 +428,36 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-12 19:48:19.289452078 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,15 +12,11 @@ @@ -12,6 +12,11 @@
Events Events
Preinitialize Event Preinitialize Event
+ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -36,15 +41,6 @@
vis tEntity6,0
vis bPrev,0
vis bNext,0
- cardGrid.bco=defaultBcoColor - cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++) - for(sys0=0;sys0<42;sys0++)
- { - {
- if(b[sys0].type==98||b[sys0].type==116) - if(b[sys0].type==98||b[sys0].type==116)
+ for(sys0=0;sys0<40;sys0++) - {
{ - b[sys0].bco=defaultBcoColor
b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor
b[sys0].pco=defaultFontColor
}
- } - }
dim=dimValueNormal - }
//remove background & activate reparse mode
vis p0,0 Variable (string) strCommand
Attributes
@@ -932,10 +928,6 @@ @@ -932,10 +928,6 @@
{ {
page popupLight page popupLight
@@ -409,12 +470,21 @@ 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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-12 19:48:18.753451293 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-12 19:48:19.289452078 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,15 +12,11 @@ @@ -12,30 +12,26 @@
Events Events
Preinitialize Event Preinitialize Event
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
- vis tInstruction,0
- vis tTmp,0
- vis tId,0
- vis t5,0
- vis bPrev,0
- vis bNext,0
- cardMedia.bco=defaultBcoColor - cardMedia.bco=defaultBcoColor
- for(sys0=0;sys0<34;sys0++) - for(sys0=0;sys0<34;sys0++)
- { - {
@@ -428,13 +498,28 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hVolume.pic=14 hVolume.pic=14
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt hVolume.pic1=13
--- HMI/n2t-out/cardQR.txt 2022-07-12 19:48:18.753451293 +0000 hVolume.pic2=15
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-12 19:48:19.285452072 +0000 }
@@ -12,25 +12,6 @@ + dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis t5,0
+ vis bPrev,0
+ vis bNext,0
Events Variable (string) strCommand
Preinitialize Event Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-13 16:57:06.972403853 +0000
@@ -32,25 +32,6 @@
vis bText2,0
tsw m0,0
tsw m1,0
- cardQR.bco=defaultBcoColor - cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++) - for(sys0=0;sys0<32;sys0++)
- { - {
@@ -454,16 +539,16 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
- b[sys0].pic2=11 - b[sys0].pic2=11
- } - }
- } - }
dim=dimValueNormal
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-12 19:48:18.753451293 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-12 19:48:19.289452078 +0000
@@ -12,21 +12,6 @@
Events Variable (string) strCommand
Preinitialize Event Attributes
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-13 16:57:06.972403853 +0000
@@ -41,21 +41,6 @@
vis xTempDest1,0
vis bPrev,0
vis bNext,0
- cardThermo.bco=defaultBcoColor - cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++) - for(sys0=0;sys0<53;sys0++)
- { - {
@@ -479,12 +564,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- b[sys0].pco=defaultFontColor - b[sys0].pco=defaultFontColor
- } - }
- } - }
dim=dimValueNormal
vis p0,0 Variable (string) strCommand
vis tSend,0 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-07-12 19:48:18.749451287 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-12 19:48:19.289452078 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-13 16:57:06.972403853 +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
@@ -504,8 +589,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-12 19:48:18.749451287 +0000 --- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-12 19:48:19.285452072 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-13 16:57:06.972403853 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -555,67 +640,27 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/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/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-12 19:48:18.753451293 +0000 --- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-12 19:48:19.285452072 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,29 +12,6 @@ @@ -50,14 +50,10 @@
vis t0,0
Events vis pColorWheel,0
Preinitialize Event //vis t0,0
- popupLight.bco=defaultBcoColor - popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++) - for(sys0=0;sys0<27;sys0++)
- { - {
- if(b[sys0].type==98||b[sys0].type==116) - if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
- if(defaultBcoColor==0)
- {
- hBrightness.pic=14
- hBrightness.pic1=13
- hBrightness.pic2=15
- hTempSlider.pic=16
- hTempSlider.pic1=17
- hTempSlider.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -73,6 +50,25 @@
vis t0,0
vis pColorWheel,0
//vis t0,0
+ for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<40;sys0++)
+ { {
+ 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].pic2=11 b[sys0].pic=10
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hBrightness.pic=14
+ hBrightness.pic1=13
+ hBrightness.pic2=15
+ hTempSlider.pic=16
+ hTempSlider.pic1=17
+ hTempSlider.pic2=15
+ }
Variable (string) strCommand
Attributes
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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-12 19:48:19.285452072 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,24 +12,12 @@ @@ -12,24 +12,12 @@
Events Events
@@ -642,8 +687,78 @@ 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-12 19:48:18.753451293 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-12 19:48:19.285452072 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,34 +12,6 @@
Events
Preinitialize Event
- dim=dimValueNormal
- //get entitiy name
- tEntity.txt=pageIcons.tTmp1.txt
- //get entity id
- entn.txt=pageIcons.tTmp2.txt
- vis p0,0
- vis tSend,0
- vis tPosHeading,0
- vis hPosition,0
- vis hTilt,0
- vis bTLeft,0
- vis bTStop,0
- vis bTRight,0
- //page open event
- // event,pageOpenDetail,typeOfPage,tEntityName
- // craft command
- tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,2
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor
@@ -74,6 +46,34 @@
hPosition.pic1=13
hPosition.pic2=15
}
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+ //get entity id
+ entn.txt=pageIcons.tTmp2.txt
+ vis p0,0
+ vis tSend,0
+ vis tPosHeading,0
+ vis hPosition,0
+ vis hTilt,0
+ vis bTLeft,0
+ vis bTStop,0
+ vis bTRight,0
+ //page open event
+ // event,pageOpenDetail,typeOfPage,tEntityName
+ // craft command
+ tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
Variable (string) strCommand
Attributes
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none

View File

@@ -1,59 +1,109 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-12 19:48:19.341452154 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-07-13 16:57:07.016403820 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-12 19:48:18.749451287 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-12 19:48:19.285452072 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-13 16:57:06.972403853 +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-12 19:48:18.753451293 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.285452072 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,15 +12,11 @@ +@@ -12,6 +12,21 @@
+ +
+ Events + Events
+ Preinitialize Event + Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ }
++ if(defaultBcoColor==0)
++ {
++ tCode.bco=6371
++ tCode.pco=40179
++ }
++ if(defaultBcoColor==6371)
++ {
++ tCode.bco=10565
++ tCode.pco=40179
++ }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -37,25 +52,6 @@
+ vis tCode,0
+ vis bPrev,0
+ vis bNext,0
+- cardAlarm.bco=defaultBcoColor +- cardAlarm.bco=defaultBcoColor
+ for(sys0=0;sys0<40;sys0++) +- for(sys0=0;sys0<40;sys0++)
+ { +- {
+- if(b[sys0].type==98||b[sys0].type==116) +- 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)
+- {
+- tCode.bco=6371
+- tCode.pco=40179
+- }
+- if(defaultBcoColor==6371)
+- {
+- tCode.bco=10565
+- tCode.pco=40179
+- } +- }
+ if(defaultBcoColor==0)
+ {
+ tCode.bco=6371
+@@ -142,7 +138,7 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Text : xxxxxxx
++ Text :
+ Max. Text Size : 10
+ +
+ Text tIcon + Variable (string) strCommand
+--- HMI/n2t-out/cardEntities.txt 2022-07-12 19:48:18.753451293 +0000 + Attributes
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-12 19:48:19.289452078 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
+@@ -12,14 +12,10 @@ ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-13 16:57:06.976403850 +0000
+@@ -12,6 +12,22 @@
+ +
+ Events + Events
+ Preinitialize Event + Preinitialize Event
++ 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
++ b[sys0].pic2=11
++ }
++ if(b[sys0].type==1&&defaultBcoColor==0)
++ {
++ b[sys0].pic=14
++ b[sys0].pic1=13
++ b[sys0].pic2=15
++ }
++ }
+ dim=dimValueNormal
+ //wup=cardEntities
+ //remove background & activate reparse mode
+@@ -65,26 +81,18 @@
+ vis bPrev,0
+ vis bNext,0
+- cardEntities.bco=defaultBcoColor +- cardEntities.bco=defaultBcoColor
+- for(sys0=0;sys0<65;sys0++) +- for(sys0=0;sys0<65;sys0++)
+- { +- {
+- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) +- 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].bco=defaultBcoColor +- b[sys0].pco=defaultFontColor
+ b[sys0].pco=defaultFontColor +- }
+- if(b[sys0].type==53&&defaultBcoColor==0)
+- {
+- b[sys0].pic=10
+- b[sys0].pic2=11
+- }
+- if(b[sys0].type==1&&defaultBcoColor==0)
+- {
+- b[sys0].pic=14
+- b[sys0].pic1=13
+- b[sys0].pic2=15
+- }
+- } +- }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+@@ -85,6 +81,18 @@
+ vis bPrev,0
+ vis bNext,0
++ vis bPrev,0 ++ vis bPrev,0
++ vis bNext,0 ++ vis bNext,0
+ Variable (string) strCommand + Variable (string) strCommand
@@ -68,13 +118,10 @@
+@@ -990,6 +1167,33 @@ +@@ -990,6 +1167,33 @@
+@@ -1028,10 +1232,6 @@ +@@ -1028,10 +1232,6 @@
+ //popupLight.tEntity.txt=tEntity3.txt + //popupLight.tEntity.txt=tEntity3.txt
+ page popupLight
+ }
+- if(type3.txt=="fan") +- if(type3.txt=="fan")
+- { +- {
+- page popupFan +- page popupFan
+- } +- }
+
+ Hotspot m1 + Hotspot m1
+ Attributes + Attributes
+@@ -1054,10 +1254,6 @@ +@@ -1054,10 +1254,6 @@
@@ -90,10 +137,13 @@
+ Attributes + Attributes
+@@ -1080,10 +1276,6 @@ +@@ -1080,10 +1276,6 @@
+ //popupLight.tEntity.txt=tEntity1.txt + //popupLight.tEntity.txt=tEntity1.txt
+ page popupLight
+ }
+- if(type1.txt=="fan") +- if(type1.txt=="fan")
+- { +- {
+- page popupFan +- page popupFan
+- } +- }
+
+ Hotspot m3 + Hotspot m3
+ Attributes + Attributes
+@@ -1106,9 +1298,27 @@ +@@ -1106,9 +1298,27 @@
@@ -107,25 +157,35 @@
+ } + }
+ +
+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-12 19:48:18.753451293 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-12 19:48:19.289452078 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,15 +12,11 @@ +@@ -12,6 +12,11 @@
+ +
+ Events + Events
+ Preinitialize Event + Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ }
+ dim=dimValueNormal
+ //remove background & activate reparse mode
+ vis p0,0
+@@ -36,15 +41,6 @@
+ vis tEntity6,0
+ vis bPrev,0
+ vis bNext,0
+- cardGrid.bco=defaultBcoColor +- cardGrid.bco=defaultBcoColor
+- for(sys0=0;sys0<42;sys0++) +- for(sys0=0;sys0<42;sys0++)
+- { +- {
+- if(b[sys0].type==98||b[sys0].type==116) +- if(b[sys0].type==98||b[sys0].type==116)
++ for(sys0=0;sys0<40;sys0++) +- {
+ { +- b[sys0].bco=defaultBcoColor
+ b[sys0].bco=defaultBcoColor +- b[sys0].pco=defaultFontColor
+ b[sys0].pco=defaultFontColor
+ }
+- } +- }
+ dim=dimValueNormal +- }
+ //remove background & activate reparse mode +
+ vis p0,0 + Variable (string) strCommand
+@@ -932,10 +928,6 @@ +@@ -932,10 +928,6 @@
+ { + {
+ page popupLight + page popupLight
@@ -137,12 +197,20 @@
+ +
+ TouchCap tc0 + TouchCap tc0
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-07-12 19:48:18.753451293 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-12 19:48:19.289452078 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,15 +12,11 @@ +@@ -12,30 +12,26 @@
+
+ Events + Events
+ Preinitialize Event + Preinitialize Event
+- dim=dimValueNormal
+- vis p0,0
+- vis tSend,0
+- vis tInstruction,0
+- vis tTmp,0
+- vis tId,0
+- vis t5,0
+- vis bPrev,0
+- vis bNext,0
+- cardMedia.bco=defaultBcoColor +- cardMedia.bco=defaultBcoColor
+- for(sys0=0;sys0<34;sys0++) +- for(sys0=0;sys0<34;sys0++)
+- { +- {
@@ -156,11 +224,28 @@
+ if(defaultBcoColor==0) + if(defaultBcoColor==0)
+ { + {
+ hVolume.pic=14 + hVolume.pic=14
+--- HMI/n2t-out/cardQR.txt 2022-07-12 19:48:18.753451293 +0000 + hVolume.pic1=13
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-12 19:48:19.285452072 +0000 + hVolume.pic2=15
+@@ -12,25 +12,6 @@ + }
+ Events ++ dim=dimValueNormal
+ Preinitialize Event ++ vis p0,0
++ vis tSend,0
++ vis tInstruction,0
++ vis tTmp,0
++ vis tId,0
++ vis t5,0
++ vis bPrev,0
++ vis bNext,0
+
+ Variable (string) strCommand
+ Attributes
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -32,25 +32,6 @@
+ vis bText2,0
+ tsw m0,0
+ tsw m1,0
+- cardQR.bco=defaultBcoColor +- cardQR.bco=defaultBcoColor
+- for(sys0=0;sys0<32;sys0++) +- for(sys0=0;sys0<32;sys0++)
+- { +- {
@@ -180,16 +265,16 @@
+- b[sys0].pic2=11 +- b[sys0].pic2=11
+- } +- }
+- } +- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-12 19:48:19.289452078 +0000
+@@ -12,21 +12,6 @@
+ +
+ Events + Variable (string) strCommand
+ Preinitialize Event + Attributes
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -41,21 +41,6 @@
+ vis xTempDest1,0
+ vis bPrev,0
+ vis bNext,0
+- cardThermo.bco=defaultBcoColor +- cardThermo.bco=defaultBcoColor
+- for(sys0=0;sys0<53;sys0++) +- for(sys0=0;sys0<53;sys0++)
+- { +- {
@@ -205,14 +290,13 @@
+- b[sys0].pco=defaultFontColor +- b[sys0].pco=defaultFontColor
+- } +- }
+- } +- }
+ dim=dimValueNormal +
+ vis p0,0 + Variable (string) strCommand
+ vis tSend,0 +--- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-07-12 19:48:18.749451287 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-13 16:57:06.972403853 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-12 19:48:19.289452078 +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-12 19:48:18.749451287 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-12 19:48:19.285452072 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -13,46 +13,6 @@ +@@ -13,46 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -262,67 +346,27 @@
+ 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 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-07-12 19:48:18.753451293 +0000 +--- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-12 19:48:19.285452072 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,29 +12,6 @@ +@@ -50,14 +50,10 @@
+ + vis t0,0
+ Events + vis pColorWheel,0
+ Preinitialize Event + //vis t0,0
+- popupLight.bco=defaultBcoColor +- popupLight.bco=defaultBcoColor
+- for(sys0=0;sys0<27;sys0++) +- for(sys0=0;sys0<27;sys0++)
+- { +- {
+- if(b[sys0].type==98||b[sys0].type==116) +- if(b[sys0].type==98||b[sys0].type==116)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- if(b[sys0].type==53&&defaultBcoColor==0)
+- {
+- b[sys0].pic=10
+- b[sys0].pic2=11
+- }
+- }
+- if(defaultBcoColor==0)
+- {
+- hBrightness.pic=14
+- hBrightness.pic1=13
+- hBrightness.pic2=15
+- hTempSlider.pic=16
+- hTempSlider.pic1=17
+- hTempSlider.pic2=15
+- }
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+@@ -73,6 +50,25 @@
+ vis t0,0
+ vis pColorWheel,0
+ //vis t0,0
++ for(sys0=0;sys0<40;sys0++) ++ for(sys0=0;sys0<40;sys0++)
++ { + {
++ 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].pic2=11 + b[sys0].pic=10
++ }
++ }
++ if(defaultBcoColor==0)
++ {
++ hBrightness.pic=14
++ hBrightness.pic1=13
++ hBrightness.pic2=15
++ hTempSlider.pic=16
++ hTempSlider.pic1=17
++ hTempSlider.pic2=15
++ }
+
+ Variable (string) strCommand
+ Attributes
+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-12 19:48:18.753451293 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-12 19:48:19.285452072 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,24 +12,12 @@ +@@ -12,24 +12,12 @@
+ +
+ Events + Events
@@ -349,8 +393,78 @@
+ 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-12 19:48:18.753451293 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-12 19:48:19.285452072 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,34 +12,6 @@
+
+ Events
+ Preinitialize Event
+- dim=dimValueNormal
+- //get entitiy name
+- tEntity.txt=pageIcons.tTmp1.txt
+- //get entity id
+- entn.txt=pageIcons.tTmp2.txt
+- vis p0,0
+- vis tSend,0
+- vis tPosHeading,0
+- vis hPosition,0
+- vis hTilt,0
+- vis bTLeft,0
+- vis bTStop,0
+- vis bTRight,0
+- //page open event
+- // event,pageOpenDetail,typeOfPage,tEntityName
+- // craft command
+- tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
+- //send calc crc
+- btlen tSend.txt,sys0
+- crcrest 1,0xffff // reset CRC
+- crcputh 55 bb
+- crcputs sys0,2
+- crcputs tSend.txt,0
+- //send cmd
+- printh 55 bb
+- prints sys0,2
+- prints tSend.txt,0
+- prints crcval,2
+ popupShutter.bco=defaultBcoColor
+ b0.bco=defaultBcoColor
+ tIcon1.bco=defaultBcoColor
+@@ -74,6 +46,34 @@
+ hPosition.pic1=13
+ hPosition.pic2=15
+ }
++ dim=dimValueNormal
++ //get entitiy name
++ tEntity.txt=pageIcons.tTmp1.txt
++ //get entity id
++ entn.txt=pageIcons.tTmp2.txt
++ vis p0,0
++ vis tSend,0
++ vis tPosHeading,0
++ vis hPosition,0
++ vis hTilt,0
++ vis bTLeft,0
++ vis bTStop,0
++ vis bTRight,0
++ //page open event
++ // event,pageOpenDetail,typeOfPage,tEntityName
++ // craft command
++ tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
++ //send calc crc
++ btlen tSend.txt,sys0
++ crcrest 1,0xffff // reset CRC
++ crcputh 55 bb
++ crcputs sys0,2
++ crcputs tSend.txt,0
++ //send cmd
++ printh 55 bb
++ prints sys0,2
++ prints tSend.txt,0
++ prints crcval,2
+
+ Variable (string) strCommand
+ Attributes
+@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none

View File

@@ -20,25 +20,6 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
cardAlarm.bco=defaultBcoColor
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
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -64,6 +45,25 @@ Page cardAlarm
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardAlarm.bco=defaultBcoColor
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
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -235,7 +235,7 @@ Text tCode
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : password Input Type : password
Text : xxxxxxx Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -20,26 +20,6 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
cardEntities.bco=defaultBcoColor
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].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -93,6 +73,26 @@ Page cardEntities
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardEntities.bco=defaultBcoColor
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].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -20,15 +20,6 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
cardGrid.bco=defaultBcoColor
for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
dim=dimValueNormal dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
@@ -53,6 +44,15 @@ Page cardGrid
vis tEntity6,0 vis tEntity6,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardGrid.bco=defaultBcoColor
for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -20,6 +20,15 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis t5,0
vis bPrev,0
vis bNext,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++) for(sys0=0;sys0<34;sys0++)
{ {
@@ -35,15 +44,6 @@ Page cardMedia
hVolume.pic1=13 hVolume.pic1=13
hVolume.pic2=15 hVolume.pic2=15
} }
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis t5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -20,25 +20,6 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
cardQR.bco=defaultBcoColor
for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371)
{
b[sys0].pic=1
b[sys0].pic2=2
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -59,6 +40,25 @@ Page cardQR
vis bText2,0 vis bText2,0
tsw m0,0 tsw m0,0
tsw m1,0 tsw m1,0
cardQR.bco=defaultBcoColor
for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371)
{
b[sys0].pic=1
b[sys0].pic2=2
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -20,21 +20,6 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
cardThermo.bco=defaultBcoColor
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].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
@@ -64,6 +49,21 @@ Page cardThermo
vis xTempDest1,0 vis xTempDest1,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardThermo.bco=defaultBcoColor
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].pco=defaultFontColor
}
if(b[sys0].type==53)
{
b[sys0].bco=defaultBcoColor
b[sys0].bco2=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -14,10 +14,14 @@ pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 167 Line(s) of event code
122 Unique line(s) of event code 122 Unique line(s) of event code
popupLight popupShutter
27 Component(s) 25 Component(s)
386 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
popupFan
20 Component(s)
234 Line(s) of event code
148 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
@@ -26,18 +30,10 @@ popupNotify
17 Component(s) 17 Component(s)
226 Line(s) of event code 226 Line(s) of event code
143 Unique line(s) of event code 143 Unique line(s) of event code
popupFan popupLight
20 Component(s) 27 Component(s)
234 Line(s) of event code 386 Line(s) of event code
148 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
211 Unique line(s) of event code 211 Unique line(s) of event code
cardQR
32 Component(s)
403 Line(s) of event code
234 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
388 Line(s) of event code 388 Line(s) of event code
@@ -46,14 +42,18 @@ cardGrid
42 Component(s) 42 Component(s)
462 Line(s) of event code 462 Line(s) of event code
271 Unique line(s) of event code 271 Unique line(s) of event code
cardThermo cardQR
53 Component(s) 32 Component(s)
580 Line(s) of event code 403 Line(s) of event code
303 Unique line(s) of event code 234 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
421 Line(s) of event code 421 Line(s) of event code
254 Unique line(s) of event code 254 Unique line(s) of event code
cardThermo
53 Component(s)
580 Line(s) of event code
303 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1179 Line(s) of event code 1179 Line(s) of event code

View File

@@ -20,26 +20,6 @@ Page popupFan
Events Events
Preinitialize Event Preinitialize Event
popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hSpeed.pic=14
hSpeed.pic1=13
hSpeed.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -66,6 +46,26 @@ Page popupFan
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
vis hSpeed,0 vis hSpeed,0
popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hSpeed.pic=14
hSpeed.pic1=13
hSpeed.pic2=15
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -20,29 +20,6 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
popupLight.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -81,6 +58,29 @@ Page popupLight
vis t0,0 vis t0,0
vis pColorWheel,0 vis pColorWheel,0
//vis t0,0 //vis t0,0
popupLight.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -20,6 +20,34 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis p0,0
vis tSend,0
vis tPosHeading,0
vis hPosition,0
vis hTilt,0
vis bTLeft,0
vis bTStop,0
vis bTRight,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
popupShutter.bco=defaultBcoColor popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor tIcon1.bco=defaultBcoColor
@@ -54,34 +82,6 @@ Page popupShutter
hPosition.pic1=13 hPosition.pic1=13
hPosition.pic2=15 hPosition.pic2=15
} }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis p0,0
vis tSend,0
vis tPosHeading,0
vis hPosition,0
vis hTilt,0
vis bTLeft,0
vis bTStop,0
vis bTRight,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,25 +12,6 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
cardAlarm.bco=defaultBcoColor
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
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -56,6 +37,25 @@ Page cardAlarm
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardAlarm.bco=defaultBcoColor
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
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -142,7 +142,7 @@ Text tCode
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
Text : xxxxxxx Text :
Max. Text Size : 10 Max. Text Size : 10
Text tIcon Text tIcon

View File

@@ -12,26 +12,6 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
cardEntities.bco=defaultBcoColor
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].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -85,6 +65,26 @@ Page cardEntities
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardEntities.bco=defaultBcoColor
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].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,15 +12,6 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
cardGrid.bco=defaultBcoColor
for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
dim=dimValueNormal dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
@@ -45,6 +36,15 @@ Page cardGrid
vis tEntity6,0 vis tEntity6,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardGrid.bco=defaultBcoColor
for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,6 +12,15 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis t5,0
vis bPrev,0
vis bNext,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++) for(sys0=0;sys0<34;sys0++)
{ {
@@ -27,15 +36,6 @@ Page cardMedia
hVolume.pic1=13 hVolume.pic1=13
hVolume.pic2=15 hVolume.pic2=15
} }
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis t5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,25 +12,6 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
cardQR.bco=defaultBcoColor
for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371)
{
b[sys0].pic=1
b[sys0].pic2=2
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -51,6 +32,25 @@ Page cardQR
vis bText2,0 vis bText2,0
tsw m0,0 tsw m0,0
tsw m1,0 tsw m1,0
cardQR.bco=defaultBcoColor
for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371)
{
b[sys0].pic=1
b[sys0].pic2=2
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,21 +12,6 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
cardThermo.bco=defaultBcoColor
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].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
@@ -56,6 +41,21 @@ Page cardThermo
vis xTempDest1,0 vis xTempDest1,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardThermo.bco=defaultBcoColor
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].pco=defaultFontColor
}
if(b[sys0].type==53)
{
b[sys0].bco=defaultBcoColor
b[sys0].bco2=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,26 +12,6 @@ Page popupFan
Events Events
Preinitialize Event Preinitialize Event
popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hSpeed.pic=14
hSpeed.pic1=13
hSpeed.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -58,6 +38,26 @@ Page popupFan
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
vis hSpeed,0 vis hSpeed,0
popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hSpeed.pic=14
hSpeed.pic1=13
hSpeed.pic2=15
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,29 +12,6 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
popupLight.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -73,6 +50,29 @@ Page popupLight
vis t0,0 vis t0,0
vis pColorWheel,0 vis pColorWheel,0
//vis t0,0 //vis t0,0
popupLight.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -12,6 +12,34 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis p0,0
vis tSend,0
vis tPosHeading,0
vis hPosition,0
vis hTilt,0
vis bTLeft,0
vis bTStop,0
vis bTRight,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
popupShutter.bco=defaultBcoColor popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor tIcon1.bco=defaultBcoColor
@@ -46,34 +74,6 @@ Page popupShutter
hPosition.pic1=13 hPosition.pic1=13
hPosition.pic2=15 hPosition.pic2=15
} }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis p0,0
vis tSend,0
vis tPosHeading,0
vis hPosition,0
vis hTilt,0
vis bTLeft,0
vis bTStop,0
vis bTRight,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupShutter,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes