mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-01 02:54:12 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
Johannes
@@ -1,16 +1,269 @@
|
||||
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/US/landscape/n2t-out/Program.s.txt 2022-06-19 15:03:28.220436240 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-22 21:38:53.203087434 +0000
|
||||
@@ -11,9 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
- //color vars
|
||||
- int defaultFontColor=65535
|
||||
- int defaultBcoColor=6371
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
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
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-19 15:03:28.220436240 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-22 21:38:53.203087434 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -20,10 +273,202 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
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
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-19 15:03:28.220436240 +0000
|
||||
@@ -181,7 +181,7 @@
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-22 21:38:53.203087434 +0000
|
||||
@@ -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
|
||||
// event,buttonPress2,internalNameEntity,positionSlider,50
|
||||
//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
|
||||
tSend.txt+=tTmp.txt
|
||||
//send calc crc
|
||||
@@ -308,7 +308,7 @@
|
||||
@@ -342,7 +308,7 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -41,7 +486,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -333,7 +333,7 @@
|
||||
@@ -367,7 +333,7 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -50,7 +495,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -358,7 +358,7 @@
|
||||
@@ -392,7 +358,7 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -59,11 +504,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -515,13 +515,11 @@
|
||||
@@ -549,13 +515,11 @@
|
||||
tsw bTLeft,0
|
||||
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||
bTLeft.pco=27501
|
||||
- vis bTRight,1
|
||||
- vis bTLeft,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
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
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
@@ -530,36 +528,24 @@
|
||||
@@ -564,36 +528,24 @@
|
||||
tsw bTStop,0
|
||||
spstr strCommand.txt,bTStop.txt,"~",14
|
||||
bTStop.pco=27501
|
||||
- vis bTRight,1
|
||||
- vis bTStop,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
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")
|
||||
@@ -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")
|
||||
{
|
||||
|
||||
@@ -1,19 +1,98 @@
|
||||
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/US/portrait/n2t-out/Program.s.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +0000
|
||||
@@ -11,9 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
- //color vars
|
||||
- int defaultFontColor=65535
|
||||
- int defaultBcoColor=6371
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
+ // fix touch offset (Removed for US version)
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
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
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
@@ -63,6 +63,16 @@
|
||||
--- 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 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,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 bNext,0
|
||||
|
||||
@@ -120,6 +130,18 @@
|
||||
@@ -136,6 +130,18 @@
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
@@ -49,7 +128,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Number nNum1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -156,6 +178,15 @@
|
||||
@@ -172,6 +178,15 @@
|
||||
Associated Keyboard : none
|
||||
Value : 0
|
||||
|
||||
@@ -65,7 +144,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Text tHeading
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -286,6 +317,26 @@
|
||||
@@ -302,6 +317,26 @@
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
|
||||
@@ -92,7 +171,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Picture p0
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -405,6 +456,34 @@
|
||||
@@ -421,6 +456,34 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
@@ -127,7 +206,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Button bDown1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -862,6 +941,106 @@
|
||||
@@ -878,6 +941,106 @@
|
||||
prints tSend.txt,0
|
||||
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
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -970,6 +1149,33 @@
|
||||
@@ -986,6 +1149,33 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
@@ -268,7 +347,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Hotspot mSpecial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1075,6 +1281,28 @@
|
||||
@@ -1091,6 +1281,28 @@
|
||||
page popupLight
|
||||
}
|
||||
|
||||
@@ -297,7 +376,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1850,6 +2078,169 @@
|
||||
@@ -1866,6 +2078,169 @@
|
||||
covx tTmp.txt,sys0,0,0
|
||||
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")
|
||||
{
|
||||
@@ -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
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
--- 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
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
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
|
||||
btlen tSend.txt,sys0
|
||||
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
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
@@ -181,7 +181,7 @@
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000
|
||||
@@ -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
|
||||
// event,buttonPress2,internalNameEntity,positionSlider,50
|
||||
//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
|
||||
tSend.txt+=tTmp.txt
|
||||
//send calc crc
|
||||
@@ -308,7 +308,7 @@
|
||||
@@ -342,7 +308,7 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -509,7 +951,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -333,7 +333,7 @@
|
||||
@@ -367,7 +333,7 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -518,7 +960,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -358,7 +358,7 @@
|
||||
@@ -392,7 +358,7 @@
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -527,11 +969,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -515,13 +515,11 @@
|
||||
@@ -549,13 +515,11 @@
|
||||
tsw bTLeft,0
|
||||
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||
bTLeft.pco=27501
|
||||
- vis bTRight,1
|
||||
- vis bTLeft,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
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
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
@@ -530,36 +528,24 @@
|
||||
@@ -564,36 +528,24 @@
|
||||
tsw bTStop,0
|
||||
spstr strCommand.txt,bTStop.txt,"~",14
|
||||
bTStop.pco=27501
|
||||
- vis bTRight,1
|
||||
- vis bTStop,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
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")
|
||||
@@ -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")
|
||||
{
|
||||
|
||||
@@ -1,25 +1,466 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-19 15:03:27.772426671 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
+@@ -63,6 +63,16 @@
|
||||
+@@ -120,6 +130,18 @@
|
||||
+@@ -156,6 +178,15 @@
|
||||
+@@ -286,6 +317,26 @@
|
||||
+@@ -405,6 +456,34 @@
|
||||
+@@ -862,6 +941,106 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-22 21:38:52.819080036 +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-22 21:38:52.775079189 +0000
|
||||
+@@ -11,9 +11,6 @@
|
||||
+- //color vars
|
||||
+- int defaultFontColor=65535
|
||||
+- int defaultBcoColor=6371
|
||||
+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")
|
||||
+ {
|
||||
+--- 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 :
|
||||
++ Max. Text Size : 20
|
||||
+@@ -970,6 +1149,33 @@
|
||||
+@@ -1075,6 +1281,28 @@
|
||||
+@@ -1850,6 +2078,169 @@
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
+@@ -986,6 +1149,33 @@
|
||||
+@@ -1091,6 +1281,28 @@
|
||||
+@@ -1866,6 +2078,169 @@
|
||||
+@@ -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")
|
||||
+ {
|
||||
+--- 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
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-06-19 15:03:27.316416932 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 15:03:27.756426330 +0000
|
||||
+@@ -181,7 +181,7 @@
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000
|
||||
+@@ -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
|
||||
+ // event,buttonPress2,internalNameEntity,positionSlider,50
|
||||
+ //craft command
|
||||
@@ -28,7 +469,7 @@
|
||||
+ covx hPosition.val,tTmp.txt,0,0
|
||||
+ tSend.txt+=tTmp.txt
|
||||
+ //send calc crc
|
||||
+@@ -308,7 +308,7 @@
|
||||
+@@ -342,7 +308,7 @@
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
@@ -37,7 +478,7 @@
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -333,7 +333,7 @@
|
||||
+@@ -367,7 +333,7 @@
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
@@ -46,7 +487,7 @@
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -358,7 +358,7 @@
|
||||
+@@ -392,7 +358,7 @@
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
@@ -55,11 +496,11 @@
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -515,13 +515,11 @@
|
||||
+@@ -549,13 +515,11 @@
|
||||
+ tsw bTLeft,0
|
||||
+ spstr strCommand.txt,bTLeft.txt,"~",13
|
||||
+ bTLeft.pco=27501
|
||||
+- vis bTRight,1
|
||||
+- vis bTLeft,1
|
||||
+ }else if(tTmp.txt=="enable")
|
||||
+ {
|
||||
+ spstr strCommand.txt,bTLeft.txt,"~",13
|
||||
@@ -69,11 +510,11 @@
|
||||
+ }
|
||||
+ // set icon bStop
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",17
|
||||
+@@ -530,36 +528,24 @@
|
||||
+@@ -564,36 +528,24 @@
|
||||
+ tsw bTStop,0
|
||||
+ spstr strCommand.txt,bTStop.txt,"~",14
|
||||
+ bTStop.pco=27501
|
||||
+- vis bTRight,1
|
||||
+- vis bTStop,1
|
||||
+ }else if(tTmp.txt=="enable")
|
||||
+ {
|
||||
+ spstr strCommand.txt,bTStop.txt,"~",14
|
||||
@@ -106,3 +547,49 @@
|
||||
+ }
|
||||
+ }
|
||||
+ 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")
|
||||
+ {
|
||||
|
||||
Reference in New Issue
Block a user