h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 22:24:15 +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-06-22 21:38:53 +00:00
committed by github-actions[bot]
parent 7e5ec9d14f
commit 878db9c571
30 changed files with 2283 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

521
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,16 +1,269 @@
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-19 15:03:28.220436240 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-22 21:38:53.203087434 +0000
@@ -11,6 +11,4 @@ @@ -11,9 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
- //color vars
- int defaultFontColor=65535
- int defaultBcoColor=6371
- // fix touch offset - // fix touch offset
- 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
--- HMI/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,21 +12,6 @@
Events
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
@@ -138,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
@@ -755,18 +740,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,22 +12,6 @@
Events
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
@@ -1945,18 +1929,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,11 +12,6 @@
Events
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
@@ -855,18 +850,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,17 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(defaultBcoColor==0)
- {
- hVolume.pic=14
- hVolume.pic1=13
- hVolume.pic2=15
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -677,18 +666,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,21 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- 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
vis p0,0
vis tSend,0
@@ -624,18 +609,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,11 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<60;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1161,18 +1156,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-19 15:03:28.220436240 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-22 21:38:53.203087434 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -20,10 +273,202 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -277,18 +277,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-22 21:38:53.203087434 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
vis p0,0
- n0.val=defaultBcoColor
- n1.val=defaultFontColor
-
-Number n0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-Number n1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-Text t0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : bco
- Max. Text Size : 10
-
-Text t1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : font
- Max. Text Size : 10
Picture p0
Attributes
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,25 +12,6 @@
Events
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(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
@@ -585,18 +566,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-22 21:38:53.203087434 +0000
@@ -12,11 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -320,18 +315,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-19 15:03:28.220436240 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-22 21:38:53.203087434 +0000
@@ -181,7 +181,7 @@ @@ -12,40 +12,6 @@
Events
Preinitialize Event
- popupShutter.bco=defaultBcoColor
- b0.bco=defaultBcoColor
- tIcon1.bco=defaultBcoColor
- tEntity.bco=defaultBcoColor
- tInfo1.bco=defaultBcoColor
- tPosHeading.bco=defaultBcoColor
- tTiltHeading.bco=defaultBcoColor
- bUp1.bco=defaultBcoColor
- bStop1.bco=defaultBcoColor
- bDown1.bco=defaultBcoColor
- bTLeft.bco=defaultBcoColor
- bTStop.bco=defaultBcoColor
- bTRight.bco=defaultBcoColor
- b0.pco=defaultFontColor
- tIcon1.pco=defaultFontColor
- tEntity.pco=defaultFontColor
- tInfo1.pco=defaultFontColor
- tPosHeading.pco=defaultFontColor
- tTiltHeading.pco=defaultFontColor
- bUp1.pco=defaultFontColor
- bStop1.pco=defaultFontColor
- bDown1.pco=defaultFontColor
- bTLeft.pco=defaultFontColor
- bTStop.pco=defaultFontColor
- bTRight.pco=defaultFontColor
- if(defaultBcoColor==0)
- {
- hTilt.pic=14
- hTilt.pic1=13
- hTilt.pic2=15
- hPosition.pic=14
- hPosition.pic1=13
- hPosition.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -215,7 +181,7 @@
Touch Release Event Touch Release Event
// event,buttonPress2,internalNameEntity,positionSlider,50 // event,buttonPress2,internalNameEntity,positionSlider,50
//craft command //craft command
@@ -32,7 +477,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
covx hPosition.val,tTmp.txt,0,0 covx hPosition.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -308,7 +308,7 @@ @@ -342,7 +308,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -41,7 +486,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -333,7 +333,7 @@ @@ -367,7 +333,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -50,7 +495,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -358,7 +358,7 @@ @@ -392,7 +358,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -59,11 +504,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -515,13 +515,11 @@ @@ -549,13 +515,11 @@
tsw bTLeft,0 tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501 bTLeft.pco=27501
- vis bTRight,1 - vis bTLeft,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
@@ -73,11 +518,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,tTmp.txt,"~",17
@@ -530,36 +528,24 @@ @@ -564,36 +528,24 @@
tsw bTStop,0 tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501 bTStop.pco=27501
- vis bTRight,1 - vis bTStop,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
@@ -111,3 +556,49 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
@@ -605,18 +557,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-22 21:38:53.203087434 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
+ dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="time")
{

540
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,19 +1,98 @@
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 15:03:27.756426330 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +0000
@@ -11,6 +11,6 @@ @@ -11,9 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
- //color vars
- int defaultFontColor=65535
- int defaultBcoColor=6371
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //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
--- HMI/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,21 +12,6 @@
Events
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
@@ -138,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
@@ -755,18 +740,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 15:03:27.756426330 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-22 21:38:52.775079189 +0000
@@ -63,6 +63,16 @@ @@ -12,22 +12,6 @@
Events
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
@@ -79,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
@@ -30,7 +109,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -120,6 +130,18 @@ @@ -136,6 +130,18 @@
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
@@ -49,7 +128,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
@@ -156,6 +178,15 @@ @@ -172,6 +178,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -65,7 +144,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
@@ -286,6 +317,26 @@ @@ -302,6 +317,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -92,7 +171,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
@@ -405,6 +456,34 @@ @@ -421,6 +456,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -127,7 +206,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
@@ -862,6 +941,106 @@ @@ -878,6 +941,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -234,7 +313,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
@@ -970,6 +1149,33 @@ @@ -986,6 +1149,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -268,7 +347,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
@@ -1075,6 +1281,28 @@ @@ -1091,6 +1281,28 @@
page popupLight page popupLight
} }
@@ -297,7 +376,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -1850,6 +2078,169 @@ @@ -1866,6 +2078,169 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -467,9 +546,180 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
@@ -1945,18 +2320,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,11 +12,6 @@
Events
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
@@ -855,18 +850,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,17 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(defaultBcoColor==0)
- {
- hVolume.pic=14
- hVolume.pic1=13
- hVolume.pic2=15
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -677,18 +666,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,21 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- 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
vis p0,0
vis tSend,0
@@ -624,18 +609,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,11 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<60;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1161,18 +1156,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 15:03:27.756426330 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-22 21:38:52.775079189 +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
@@ -488,10 +738,202 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -277,18 +277,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-22 21:38:52.775079189 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
vis p0,0
- n0.val=defaultBcoColor
- n1.val=defaultFontColor
-
-Number n0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-Number n1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-Text t0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : bco
- Max. Text Size : 10
-
-Text t1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : font
- Max. Text Size : 10
Picture p0
Attributes
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,25 +12,6 @@
Events
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(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
@@ -585,18 +566,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-22 21:38:52.775079189 +0000
@@ -12,11 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -320,18 +315,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="timeout")
{
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-06-19 15:03:27.316416932 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 15:03:27.756426330 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000
@@ -181,7 +181,7 @@ @@ -12,40 +12,6 @@
Events
Preinitialize Event
- popupShutter.bco=defaultBcoColor
- b0.bco=defaultBcoColor
- tIcon1.bco=defaultBcoColor
- tEntity.bco=defaultBcoColor
- tInfo1.bco=defaultBcoColor
- tPosHeading.bco=defaultBcoColor
- tTiltHeading.bco=defaultBcoColor
- bUp1.bco=defaultBcoColor
- bStop1.bco=defaultBcoColor
- bDown1.bco=defaultBcoColor
- bTLeft.bco=defaultBcoColor
- bTStop.bco=defaultBcoColor
- bTRight.bco=defaultBcoColor
- b0.pco=defaultFontColor
- tIcon1.pco=defaultFontColor
- tEntity.pco=defaultFontColor
- tInfo1.pco=defaultFontColor
- tPosHeading.pco=defaultFontColor
- tTiltHeading.pco=defaultFontColor
- bUp1.pco=defaultFontColor
- bStop1.pco=defaultFontColor
- bDown1.pco=defaultFontColor
- bTLeft.pco=defaultFontColor
- bTStop.pco=defaultFontColor
- bTRight.pco=defaultFontColor
- if(defaultBcoColor==0)
- {
- hTilt.pic=14
- hTilt.pic1=13
- hTilt.pic2=15
- hPosition.pic=14
- hPosition.pic1=13
- hPosition.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -215,7 +181,7 @@
Touch Release Event Touch Release Event
// event,buttonPress2,internalNameEntity,positionSlider,50 // event,buttonPress2,internalNameEntity,positionSlider,50
//craft command //craft command
@@ -500,7 +942,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
covx hPosition.val,tTmp.txt,0,0 covx hPosition.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
//send calc crc //send calc crc
@@ -308,7 +308,7 @@ @@ -342,7 +308,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -509,7 +951,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -333,7 +333,7 @@ @@ -367,7 +333,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -518,7 +960,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -358,7 +358,7 @@ @@ -392,7 +358,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -527,11 +969,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -515,13 +515,11 @@ @@ -549,13 +515,11 @@
tsw bTLeft,0 tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501 bTLeft.pco=27501
- vis bTRight,1 - vis bTLeft,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
@@ -541,11 +983,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,tTmp.txt,"~",17
@@ -530,36 +528,24 @@ @@ -564,36 +528,24 @@
tsw bTStop,0 tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501 bTStop.pco=27501
- vis bTRight,1 - vis bTStop,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
@@ -579,3 +1021,49 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
@@ -605,18 +557,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-22 21:38:52.403072023 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-22 21:38:52.775079189 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
+ dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
- // get background color
- spstr strCommand.txt,tTmp.txt,"~",3
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultBcoColor,0,0
- }
- // get font color
- spstr strCommand.txt,tTmp.txt,"~",4
- if(tTmp.txt!="")
- {
- covx tTmp.txt,defaultFontColor,0,0
- }
}
if(tInstruction.txt=="time")
{

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

@@ -1,25 +1,466 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-19 15:03:27.772426671 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-22 21:38:52.819080036 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-19 15:03:27.316416932 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 15:03:27.756426330 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-19 15:03:27.316416932 +0000 +@@ -11,9 +11,6 @@
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 15:03:27.756426330 +0000 +- //color vars
+@@ -63,6 +63,16 @@ +- int defaultFontColor=65535
+@@ -120,6 +130,18 @@ +- int defaultBcoColor=6371
+@@ -156,6 +178,15 @@ +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+@@ -286,6 +317,26 @@ +--- HMI/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.407072100 +0000
+@@ -405,6 +456,34 @@ ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -862,6 +941,106 @@ +@@ -12,21 +12,6 @@
+
+ Events
+ 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
+@@ -138,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
+@@ -755,18 +740,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,22 +12,6 @@
+
+ Events
+ 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
+@@ -79,6 +63,16 @@
+@@ -136,6 +130,18 @@
+@@ -172,6 +178,15 @@
+@@ -302,6 +317,26 @@
+@@ -421,6 +456,34 @@
+@@ -878,6 +941,106 @@
++ Text : ++ Text :
++ Max. Text Size : 20 ++ Max. Text Size : 20
+@@ -970,6 +1149,33 @@ +@@ -986,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1091,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1866,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000 +@@ -1945,18 +2320,6 @@
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 15:03:27.756426330 +0000 + spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,11 +12,6 @@
+
+ Events
+ 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
+@@ -855,18 +850,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,17 +12,6 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<40;sys0++)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- if(defaultBcoColor==0)
+- {
+- hVolume.pic=14
+- hVolume.pic1=13
+- hVolume.pic2=15
+- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -677,18 +666,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,21 +12,6 @@
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<40;sys0++)
+- {
+- 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
+ vis p0,0
+ vis tSend,0
+@@ -624,18 +609,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-06-22 21:38:52.407072100 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,11 +12,6 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<60;sys0++)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -1161,18 +1156,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -277,18 +277,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -13,46 +13,6 @@
+ Events
+ Preinitialize Event
+ vis p0,0
+- n0.val=defaultBcoColor
+- n1.val=defaultFontColor
+-
+-Number n0
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-Number n1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-Text t0
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text : bco
+- Max. Text Size : 10
+-
+-Text t1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text : font
+- Max. Text Size : 10
+
+ Picture p0
+ Attributes
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,25 +12,6 @@
+
+ Events
+ 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(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
+@@ -585,18 +566,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -12,11 +12,6 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<40;sys0++)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -320,18 +315,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+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-06-19 15:03:27.316416932 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 15:03:27.756426330 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -181,7 +181,7 @@ +@@ -12,40 +12,6 @@
+
+ Events
+ Preinitialize Event
+- popupShutter.bco=defaultBcoColor
+- b0.bco=defaultBcoColor
+- tIcon1.bco=defaultBcoColor
+- tEntity.bco=defaultBcoColor
+- tInfo1.bco=defaultBcoColor
+- tPosHeading.bco=defaultBcoColor
+- tTiltHeading.bco=defaultBcoColor
+- bUp1.bco=defaultBcoColor
+- bStop1.bco=defaultBcoColor
+- bDown1.bco=defaultBcoColor
+- bTLeft.bco=defaultBcoColor
+- bTStop.bco=defaultBcoColor
+- bTRight.bco=defaultBcoColor
+- b0.pco=defaultFontColor
+- tIcon1.pco=defaultFontColor
+- tEntity.pco=defaultFontColor
+- tInfo1.pco=defaultFontColor
+- tPosHeading.pco=defaultFontColor
+- tTiltHeading.pco=defaultFontColor
+- bUp1.pco=defaultFontColor
+- bStop1.pco=defaultFontColor
+- bDown1.pco=defaultFontColor
+- bTLeft.pco=defaultFontColor
+- bTStop.pco=defaultFontColor
+- bTRight.pco=defaultFontColor
+- if(defaultBcoColor==0)
+- {
+- hTilt.pic=14
+- hTilt.pic1=13
+- hTilt.pic2=15
+- hPosition.pic=14
+- hPosition.pic1=13
+- hPosition.pic2=15
+- }
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+@@ -215,7 +181,7 @@
+ Touch Release Event + Touch Release Event
+ // event,buttonPress2,internalNameEntity,positionSlider,50 + // event,buttonPress2,internalNameEntity,positionSlider,50
+ //craft command + //craft command
@@ -28,7 +469,7 @@
+ covx hPosition.val,tTmp.txt,0,0 + covx hPosition.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt + tSend.txt+=tTmp.txt
+ //send calc crc + //send calc crc
+@@ -308,7 +308,7 @@ +@@ -342,7 +308,7 @@
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
@@ -37,7 +478,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -333,7 +333,7 @@ +@@ -367,7 +333,7 @@
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
@@ -46,7 +487,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -358,7 +358,7 @@ +@@ -392,7 +358,7 @@
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
@@ -55,11 +496,11 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+@@ -515,13 +515,11 @@ +@@ -549,13 +515,11 @@
+ tsw bTLeft,0 + tsw bTLeft,0
+ spstr strCommand.txt,bTLeft.txt,"~",13 + spstr strCommand.txt,bTLeft.txt,"~",13
+ bTLeft.pco=27501 + bTLeft.pco=27501
+- vis bTRight,1 +- vis bTLeft,1
+ }else if(tTmp.txt=="enable") + }else if(tTmp.txt=="enable")
+ { + {
+ spstr strCommand.txt,bTLeft.txt,"~",13 + spstr strCommand.txt,bTLeft.txt,"~",13
@@ -69,11 +510,11 @@
+ } + }
+ // set icon bStop + // set icon bStop
+ spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",17
+@@ -530,36 +528,24 @@ +@@ -564,36 +528,24 @@
+ tsw bTStop,0 + tsw bTStop,0
+ spstr strCommand.txt,bTStop.txt,"~",14 + spstr strCommand.txt,bTStop.txt,"~",14
+ bTStop.pco=27501 + bTStop.pco=27501
+- vis bTRight,1 +- vis bTStop,1
+ }else if(tTmp.txt=="enable") + }else if(tTmp.txt=="enable")
+ { + {
+ spstr strCommand.txt,bTStop.txt,"~",14 + spstr strCommand.txt,bTStop.txt,"~",14
@@ -106,3 +547,49 @@
+ } + }
+ } + }
+ if(tInstruction.txt=="dimmode") + if(tInstruction.txt=="dimmode")
+@@ -605,18 +557,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+ dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="time")
+ {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-06-22 21:38:52.403072023 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-22 21:38:52.775079189 +0000
+@@ -406,22 +406,10 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
++ dim=dimValue
+ // get value normal
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+- // get background color
+- spstr strCommand.txt,tTmp.txt,"~",3
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultBcoColor,0,0
+- }
+- // get font color
+- spstr strCommand.txt,tTmp.txt,"~",4
+- if(tTmp.txt!="")
+- {
+- covx tTmp.txt,defaultFontColor,0,0
+- }
+ }
+ if(tInstruction.txt=="time")
+ {

3
HMI/n2t-out-visual/Program.s.txt
View File

@@ -11,6 +11,9 @@ Program.s
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
// fix touch offset // fix touch offset
lcd_dev fffb 0002 0000 0020 lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

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

@@ -20,6 +20,21 @@ Page cardAlarm
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 dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -216,7 +231,7 @@ Text tCode
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : password Input Type : password
Text : Text : xxxxxxx
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -388,7 +403,7 @@ Button b0
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -426,7 +441,7 @@ Button b1
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -464,7 +479,7 @@ Button b2
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -502,7 +517,7 @@ Button b3
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -540,7 +555,7 @@ Button b4
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -578,7 +593,7 @@ Button b5
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -616,7 +631,7 @@ Button b6
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -654,7 +669,7 @@ Button b7
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -692,7 +707,7 @@ Button b8
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -730,7 +745,7 @@ Button b9
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 1 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -788,7 +803,7 @@ Button b10
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -826,7 +841,7 @@ Button arm1
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -880,7 +895,7 @@ Button arm3
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -934,7 +949,7 @@ Button arm2
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -988,7 +1003,7 @@ Button arm4
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -1042,7 +1057,7 @@ Button b11
Fill : solid color Fill : solid color
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 0
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
@@ -1322,6 +1337,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -20,6 +20,22 @@ Page cardEntities
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 dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -2901,6 +2917,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -20,6 +20,11 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
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
@@ -1314,6 +1319,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -20,6 +20,17 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -1116,6 +1127,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -20,6 +20,21 @@ Page cardQR
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==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
@@ -908,6 +923,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -20,6 +20,11 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<60;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -1874,6 +1879,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -1,62 +1,62 @@
Program.s Program.s
0 Component(s) 0 Component(s)
11 Line(s) of event code 13 Line(s) of event code
11 Unique line(s) of event code 13 Unique line(s) of event code
pageIcons pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
pageTest pageTest
14 Component(s) 18 Component(s)
14 Line(s) of event code 16 Line(s) of event code
14 Unique line(s) of event code 16 Unique line(s) of event code
cardQR
32 Component(s)
374 Line(s) of event code
218 Unique line(s) of event code
popupNotify
17 Component(s)
204 Line(s) of event code
128 Unique line(s) of event code
popupShutter
25 Component(s)
344 Line(s) of event code
175 Unique line(s) of event code
cardMedia
34 Component(s)
363 Line(s) of event code
195 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
157 Line(s) of event code 167 Line(s) of event code
117 Unique line(s) of event code 122 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
353 Line(s) of event code 382 Line(s) of event code
193 Unique line(s) of event code 209 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
259 Unique line(s) of event code
cardAlarm
40 Component(s)
392 Line(s) of event code
239 Unique line(s) of event code
cardThermo
53 Component(s)
555 Line(s) of event code
292 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
319 Line(s) of event code 329 Line(s) of event code
253 Unique line(s) of event code 256 Unique line(s) of event code
popupNotify
17 Component(s)
219 Line(s) of event code
135 Unique line(s) of event code
cardQR
32 Component(s)
399 Line(s) of event code
232 Unique line(s) of event code
cardMedia
34 Component(s)
384 Line(s) of event code
207 Unique line(s) of event code
cardGrid
42 Component(s)
454 Line(s) of event code
267 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
211 Unique line(s) of event code
cardAlarm
40 Component(s)
417 Line(s) of event code
252 Unique line(s) of event code
cardThermo
53 Component(s)
570 Line(s) of event code
299 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1159 Line(s) of event code
496 Unique line(s) of event code 511 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
412 Component(s) 416 Component(s)
4658 Line(s) of event code 4897 Line(s) of event code
1245 Unique line(s) of event code 1309 Unique line(s) of event code

12
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -572,6 +572,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

122
HMI/n2t-out-visual/pageTest.txt
View File

@@ -21,7 +21,129 @@ Page pageTest
Events Events
Preinitialize Event Preinitialize Event
vis p0,0 vis p0,0
n0.val=defaultBcoColor
n1.val=defaultFontColor
Number n0
Attributes
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 221
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Number n1
Attributes
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 280
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t0
Attributes
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 191
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : bco
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 251
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : font
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1

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

@@ -20,6 +20,25 @@ Page popupLight
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(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
@@ -912,6 +931,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

17
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -20,6 +20,11 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -524,6 +529,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

50
HMI/n2t-out-visual/popupShutter.txt
View File

@@ -20,6 +20,40 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor
tEntity.bco=defaultBcoColor
tInfo1.bco=defaultBcoColor
tPosHeading.bco=defaultBcoColor
tTiltHeading.bco=defaultBcoColor
bUp1.bco=defaultBcoColor
bStop1.bco=defaultBcoColor
bDown1.bco=defaultBcoColor
bTLeft.bco=defaultBcoColor
bTStop.bco=defaultBcoColor
bTRight.bco=defaultBcoColor
b0.pco=defaultFontColor
tIcon1.pco=defaultFontColor
tEntity.pco=defaultFontColor
tInfo1.pco=defaultFontColor
tPosHeading.pco=defaultFontColor
tTiltHeading.pco=defaultFontColor
bUp1.pco=defaultFontColor
bStop1.pco=defaultFontColor
bDown1.pco=defaultFontColor
bTLeft.pco=defaultFontColor
bTStop.pco=defaultFontColor
bTRight.pco=defaultFontColor
if(defaultBcoColor==0)
{
hTilt.pic=14
hTilt.pic1=13
hTilt.pic2=15
hPosition.pic=14
hPosition.pic1=13
hPosition.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -844,7 +878,7 @@ Timer tmSerial
tsw bTLeft,0 tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501 bTLeft.pco=27501
vis bTRight,1 vis bTLeft,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
@@ -859,7 +893,7 @@ Timer tmSerial
tsw bTStop,0 tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501 bTStop.pco=27501
vis bTRight,1 vis bTStop,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
@@ -900,6 +934,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

14
HMI/n2t-out-visual/screensaver.txt
View File

@@ -971,10 +971,22 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal // get value normal
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

3
HMI/n2t-out/Program.s.txt
View File

@@ -11,6 +11,9 @@ Program.s
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
// fix touch offset // fix touch offset
lcd_dev fffb 0002 0000 0020 lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

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

@@ -12,6 +12,21 @@ Page cardAlarm
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 dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -123,7 +138,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 : Text : xxxxxxx
Max. Text Size : 10 Max. Text Size : 10
Text tIcon Text tIcon
@@ -740,6 +755,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -12,6 +12,22 @@ Page cardEntities
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 dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -1929,6 +1945,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -12,6 +12,11 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
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
@@ -850,6 +855,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -12,6 +12,17 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -666,6 +677,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -12,6 +12,21 @@ Page cardQR
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==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
@@ -609,6 +624,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -12,6 +12,11 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<60;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -1156,6 +1161,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

12
HMI/n2t-out/pageStartup.txt
View File

@@ -277,6 +277,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

40
HMI/n2t-out/pageTest.txt
View File

@@ -13,7 +13,47 @@ Page pageTest
Events Events
Preinitialize Event Preinitialize Event
vis p0,0 vis p0,0
n0.val=defaultBcoColor
n1.val=defaultFontColor
Number n0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Number n1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Text t0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : bco
Max. Text Size : 10
Text t1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : font
Max. Text Size : 10
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local

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

@@ -12,6 +12,25 @@ Page popupLight
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(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
@@ -566,6 +585,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

17
HMI/n2t-out/popupNotify.txt
View File

@@ -12,6 +12,11 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -315,6 +320,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

50
HMI/n2t-out/popupShutter.txt
View File

@@ -12,6 +12,40 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor
tEntity.bco=defaultBcoColor
tInfo1.bco=defaultBcoColor
tPosHeading.bco=defaultBcoColor
tTiltHeading.bco=defaultBcoColor
bUp1.bco=defaultBcoColor
bStop1.bco=defaultBcoColor
bDown1.bco=defaultBcoColor
bTLeft.bco=defaultBcoColor
bTStop.bco=defaultBcoColor
bTRight.bco=defaultBcoColor
b0.pco=defaultFontColor
tIcon1.pco=defaultFontColor
tEntity.pco=defaultFontColor
tInfo1.pco=defaultFontColor
tPosHeading.pco=defaultFontColor
tTiltHeading.pco=defaultFontColor
bUp1.pco=defaultFontColor
bStop1.pco=defaultFontColor
bDown1.pco=defaultFontColor
bTLeft.pco=defaultFontColor
bTStop.pco=defaultFontColor
bTRight.pco=defaultFontColor
if(defaultBcoColor==0)
{
hTilt.pic=14
hTilt.pic1=13
hTilt.pic2=15
hPosition.pic=14
hPosition.pic1=13
hPosition.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
@@ -515,7 +549,7 @@ Timer tmSerial
tsw bTLeft,0 tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501 bTLeft.pco=27501
vis bTRight,1 vis bTLeft,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTLeft.txt,"~",13 spstr strCommand.txt,bTLeft.txt,"~",13
@@ -530,7 +564,7 @@ Timer tmSerial
tsw bTStop,0 tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501 bTStop.pco=27501
vis bTRight,1 vis bTStop,1
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTStop.txt,"~",14 spstr strCommand.txt,bTStop.txt,"~",14
@@ -571,6 +605,18 @@ Timer tmSerial
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

14
HMI/n2t-out/screensaver.txt
View File

@@ -406,10 +406,22 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal // get value normal
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
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {