mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-06-17 21:31:52.834043346 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 21:31:53.966042754 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-19 14:21:01.123214844 +0000
|
||||||
@@ -11,6 +11,4 @@
|
@@ -11,6 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
|||||||
- lcd_dev fffb 0002 0000 0020
|
- lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 21:31:53.966042754 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-19 14:21:01.123214844 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
@@ -20,3 +20,78 @@ 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
|
||||||
|
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||||
|
--- HMI/n2t-out/popupShutter.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
|
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-19 14:21:01.123214844 +0000
|
||||||
|
@@ -181,7 +181,7 @@
|
||||||
|
Touch Release Event
|
||||||
|
// event,buttonPress2,internalNameEntity,positionSlider,50
|
||||||
|
//craft command
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider,"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
|
||||||
|
covx hPosition.val,tTmp.txt,0,0
|
||||||
|
tSend.txt+=tTmp.txt
|
||||||
|
//send calc crc
|
||||||
|
@@ -308,7 +308,7 @@
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",up"
|
||||||
|
//send calc crc
|
||||||
|
btlen tSend.txt,sys0
|
||||||
|
crcrest 1,0xffff // reset CRC
|
||||||
|
@@ -333,7 +333,7 @@
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",stop"
|
||||||
|
//send calc crc
|
||||||
|
btlen tSend.txt,sys0
|
||||||
|
crcrest 1,0xffff // reset CRC
|
||||||
|
@@ -358,7 +358,7 @@
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",down"
|
||||||
|
//send calc crc
|
||||||
|
btlen tSend.txt,sys0
|
||||||
|
crcrest 1,0xffff // reset CRC
|
||||||
|
@@ -520,7 +520,6 @@
|
||||||
|
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||||
|
tsw bTLeft,1
|
||||||
|
bTLeft.pco=65535
|
||||||
|
- vis bTLeft,1
|
||||||
|
}
|
||||||
|
// set icon bStop
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
|
@@ -534,10 +533,9 @@
|
||||||
|
spstr strCommand.txt,bTStop.txt,"~",14
|
||||||
|
tsw bTStop,1
|
||||||
|
bTStop.pco=65535
|
||||||
|
- vis bTStop,1
|
||||||
|
}
|
||||||
|
// set icon bDown
|
||||||
|
- spstr strCommand.txt,tTmp.txt,"~",18
|
||||||
|
+ spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
|
@@ -548,15 +546,6 @@
|
||||||
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
|
tsw bTRight,1
|
||||||
|
bTRight.pco=65535
|
||||||
|
- vis bTRight,1
|
||||||
|
- }
|
||||||
|
- // set tilt slider
|
||||||
|
- spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
|
- if(tTmp.txt!="disable")
|
||||||
|
- {
|
||||||
|
- vis hTilt,1
|
||||||
|
- covx tTmp.txt,sys0,0,0
|
||||||
|
- hTilt.val=sys0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(tInstruction.txt=="dimmode")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-06-17 21:31:52.834043346 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 21:31:53.382043060 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
|||||||
+ //lcd_dev fffb 0002 0000 0020
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-06-17 21:31:52.838043344 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-06-19 14:20:59.951205050 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 21:31:53.382043060 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
@@ -63,6 +63,16 @@
|
@@ -63,6 +63,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 21:31:53.382043060 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 14:21:00.515209751 +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
|
||||||
@@ -489,8 +489,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||||
--- HMI/n2t-out/popupLight.txt 2022-06-17 21:31:52.834043346 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-06-19 14:20:59.951205050 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 21:31:53.382043060 +0000
|
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
@@ -151,7 +151,7 @@
|
@@ -151,7 +151,7 @@
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
@@ -501,8 +501,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
|||||||
Text tInstruction
|
Text tInstruction
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||||
--- HMI/n2t-out/popupShutter.txt 2022-06-17 21:31:52.834043346 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 21:31:53.382043060 +0000
|
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
@@ -69,7 +69,7 @@
|
@@ -69,7 +69,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -512,3 +512,75 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
|||||||
|
|
||||||
Text tEntity
|
Text tEntity
|
||||||
Attributes
|
Attributes
|
||||||
|
@@ -181,7 +181,7 @@
|
||||||
|
Touch Release Event
|
||||||
|
// event,buttonPress2,internalNameEntity,positionSlider,50
|
||||||
|
//craft command
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider,"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
|
||||||
|
covx hPosition.val,tTmp.txt,0,0
|
||||||
|
tSend.txt+=tTmp.txt
|
||||||
|
//send calc crc
|
||||||
|
@@ -308,7 +308,7 @@
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",up"
|
||||||
|
//send calc crc
|
||||||
|
btlen tSend.txt,sys0
|
||||||
|
crcrest 1,0xffff // reset CRC
|
||||||
|
@@ -333,7 +333,7 @@
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",stop"
|
||||||
|
//send calc crc
|
||||||
|
btlen tSend.txt,sys0
|
||||||
|
crcrest 1,0xffff // reset CRC
|
||||||
|
@@ -358,7 +358,7 @@
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose"
|
||||||
|
+ tSend.txt="event,buttonPress2,"+entn.txt+",down"
|
||||||
|
//send calc crc
|
||||||
|
btlen tSend.txt,sys0
|
||||||
|
crcrest 1,0xffff // reset CRC
|
||||||
|
@@ -520,7 +520,6 @@
|
||||||
|
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||||
|
tsw bTLeft,1
|
||||||
|
bTLeft.pco=65535
|
||||||
|
- vis bTLeft,1
|
||||||
|
}
|
||||||
|
// set icon bStop
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
|
@@ -534,10 +533,9 @@
|
||||||
|
spstr strCommand.txt,bTStop.txt,"~",14
|
||||||
|
tsw bTStop,1
|
||||||
|
bTStop.pco=65535
|
||||||
|
- vis bTStop,1
|
||||||
|
}
|
||||||
|
// set icon bDown
|
||||||
|
- spstr strCommand.txt,tTmp.txt,"~",18
|
||||||
|
+ spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
|
@@ -548,15 +546,6 @@
|
||||||
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
|
tsw bTRight,1
|
||||||
|
bTRight.pco=65535
|
||||||
|
- vis bTRight,1
|
||||||
|
- }
|
||||||
|
- // set tilt slider
|
||||||
|
- spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
|
- if(tTmp.txt!="disable")
|
||||||
|
- {
|
||||||
|
- vis hTilt,1
|
||||||
|
- covx tTmp.txt,sys0,0,0
|
||||||
|
- hTilt.val=sys0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(tInstruction.txt=="dimmode")
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 21:31:53.398043051 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-19 14:21:00.535209919 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-06-17 21:31:52.834043346 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 21:31:53.382043060 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-06-17 21:31:52.838043344 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-06-19 14:20:59.951205050 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 21:31:53.382043060 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
+@@ -63,6 +63,16 @@
|
+@@ -63,6 +63,16 @@
|
||||||
+@@ -120,6 +130,18 @@
|
+@@ -120,6 +130,18 @@
|
||||||
+@@ -156,6 +178,15 @@
|
+@@ -156,6 +178,15 @@
|
||||||
@@ -14,11 +14,11 @@
|
|||||||
+@@ -970,6 +1149,33 @@
|
+@@ -970,6 +1149,33 @@
|
||||||
+@@ -1075,6 +1281,28 @@
|
+@@ -1075,6 +1281,28 @@
|
||||||
+@@ -1850,6 +2078,169 @@
|
+@@ -1850,6 +2078,169 @@
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 21:31:53.382043060 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||||
+--- HMI/n2t-out/popupLight.txt 2022-06-17 21:31:52.834043346 +0000
|
+--- HMI/n2t-out/popupLight.txt 2022-06-19 14:20:59.951205050 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 21:31:53.382043060 +0000
|
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
+@@ -151,7 +151,7 @@
|
+@@ -151,7 +151,7 @@
|
||||||
+ Send Component ID : disabled
|
+ Send Component ID : disabled
|
||||||
+ Associated Keyboard : none
|
+ Associated Keyboard : none
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
+ Text tInstruction
|
+ Text tInstruction
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||||
+--- HMI/n2t-out/popupShutter.txt 2022-06-17 21:31:52.834043346 +0000
|
+--- HMI/n2t-out/popupShutter.txt 2022-06-19 14:20:59.947205019 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 21:31:53.382043060 +0000
|
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 14:21:00.515209751 +0000
|
||||||
+@@ -69,7 +69,7 @@
|
+@@ -69,7 +69,7 @@
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
@@ -40,3 +40,74 @@
|
|||||||
+
|
+
|
||||||
+ Text tEntity
|
+ Text tEntity
|
||||||
+ Attributes
|
+ Attributes
|
||||||
|
+@@ -181,7 +181,7 @@
|
||||||
|
+ Touch Release Event
|
||||||
|
+ // event,buttonPress2,internalNameEntity,positionSlider,50
|
||||||
|
+ //craft command
|
||||||
|
+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider,"
|
||||||
|
++ tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
|
||||||
|
+ covx hPosition.val,tTmp.txt,0,0
|
||||||
|
+ tSend.txt+=tTmp.txt
|
||||||
|
+ //send calc crc
|
||||||
|
+@@ -308,7 +308,7 @@
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
|
+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen"
|
||||||
|
++ tSend.txt="event,buttonPress2,"+entn.txt+",up"
|
||||||
|
+ //send calc crc
|
||||||
|
+ btlen tSend.txt,sys0
|
||||||
|
+ crcrest 1,0xffff // reset CRC
|
||||||
|
+@@ -333,7 +333,7 @@
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
|
+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop"
|
||||||
|
++ tSend.txt="event,buttonPress2,"+entn.txt+",stop"
|
||||||
|
+ //send calc crc
|
||||||
|
+ btlen tSend.txt,sys0
|
||||||
|
+ crcrest 1,0xffff // reset CRC
|
||||||
|
+@@ -358,7 +358,7 @@
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
|
+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose"
|
||||||
|
++ tSend.txt="event,buttonPress2,"+entn.txt+",down"
|
||||||
|
+ //send calc crc
|
||||||
|
+ btlen tSend.txt,sys0
|
||||||
|
+ crcrest 1,0xffff // reset CRC
|
||||||
|
+@@ -520,7 +520,6 @@
|
||||||
|
+ spstr strCommand.txt,bTLeft.txt,"~",13
|
||||||
|
+ tsw bTLeft,1
|
||||||
|
+ bTLeft.pco=65535
|
||||||
|
+- vis bTLeft,1
|
||||||
|
+ }
|
||||||
|
+ // set icon bStop
|
||||||
|
+ spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
|
+@@ -534,10 +533,9 @@
|
||||||
|
+ spstr strCommand.txt,bTStop.txt,"~",14
|
||||||
|
+ tsw bTStop,1
|
||||||
|
+ bTStop.pco=65535
|
||||||
|
+- vis bTStop,1
|
||||||
|
+ // set icon bDown
|
||||||
|
+- spstr strCommand.txt,tTmp.txt,"~",18
|
||||||
|
++ spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
|
+ if(tTmp.txt=="disable")
|
||||||
|
+ {
|
||||||
|
+ spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
|
+@@ -548,15 +546,6 @@
|
||||||
|
+ spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
|
+ tsw bTRight,1
|
||||||
|
+ bTRight.pco=65535
|
||||||
|
+- vis bTRight,1
|
||||||
|
+- }
|
||||||
|
+- // set tilt slider
|
||||||
|
+- spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
|
+- if(tTmp.txt!="disable")
|
||||||
|
+- {
|
||||||
|
+- vis hTilt,1
|
||||||
|
+- covx tTmp.txt,sys0,0,0
|
||||||
|
+- hTilt.val=sys0
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if(tInstruction.txt=="dimmode")
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ popupNotify
|
|||||||
128 Unique line(s) of event code
|
128 Unique line(s) of event code
|
||||||
popupShutter
|
popupShutter
|
||||||
25 Component(s)
|
25 Component(s)
|
||||||
331 Line(s) of event code
|
341 Line(s) of event code
|
||||||
163 Unique line(s) of event code
|
175 Unique line(s) of event code
|
||||||
cardMedia
|
cardMedia
|
||||||
34 Component(s)
|
34 Component(s)
|
||||||
363 Line(s) of event code
|
363 Line(s) of event code
|
||||||
@@ -58,5 +58,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
13 Page(s)
|
13 Page(s)
|
||||||
412 Component(s)
|
412 Component(s)
|
||||||
4645 Line(s) of event code
|
4655 Line(s) of event code
|
||||||
1236 Unique line(s) of event code
|
1245 Unique line(s) of event code
|
||||||
|
|||||||
@@ -354,7 +354,7 @@ Slider hTilt
|
|||||||
Touch Release Event
|
Touch Release Event
|
||||||
// event,buttonPress2,internalNameEntity,positionSlider,50
|
// event,buttonPress2,internalNameEntity,positionSlider,50
|
||||||
//craft command
|
//craft command
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider,"
|
||||||
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
|
||||||
@@ -591,7 +591,7 @@ Button bTLeft
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",up"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen"
|
||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
@@ -638,7 +638,7 @@ Button bTStop
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",stop"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop"
|
||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
@@ -685,7 +685,7 @@ Button bTRight
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",down"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose"
|
||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
@@ -849,6 +849,7 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,bTLeft.txt,"~",13
|
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||||
tsw bTLeft,1
|
tsw bTLeft,1
|
||||||
bTLeft.pco=65535
|
bTLeft.pco=65535
|
||||||
|
vis bTLeft,1
|
||||||
}
|
}
|
||||||
// set icon bStop
|
// set icon bStop
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -862,9 +863,10 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,bTStop.txt,"~",14
|
spstr strCommand.txt,bTStop.txt,"~",14
|
||||||
tsw bTStop,1
|
tsw bTStop,1
|
||||||
bTStop.pco=65535
|
bTStop.pco=65535
|
||||||
|
vis bTStop,1
|
||||||
}
|
}
|
||||||
// set icon bDown
|
// set icon bDown
|
||||||
spstr strCommand.txt,tTmp.txt,"~",10
|
spstr strCommand.txt,tTmp.txt,"~",18
|
||||||
if(tTmp.txt=="disable")
|
if(tTmp.txt=="disable")
|
||||||
{
|
{
|
||||||
spstr strCommand.txt,bTRight.txt,"~",15
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
@@ -875,6 +877,15 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,bTRight.txt,"~",15
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
tsw bTRight,1
|
tsw bTRight,1
|
||||||
bTRight.pco=65535
|
bTRight.pco=65535
|
||||||
|
vis bTRight,1
|
||||||
|
}
|
||||||
|
// set tilt slider
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
|
if(tTmp.txt!="disable")
|
||||||
|
{
|
||||||
|
vis hTilt,1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hTilt.val=sys0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="dimmode")
|
if(tInstruction.txt=="dimmode")
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ Slider hTilt
|
|||||||
Touch Release Event
|
Touch Release Event
|
||||||
// event,buttonPress2,internalNameEntity,positionSlider,50
|
// event,buttonPress2,internalNameEntity,positionSlider,50
|
||||||
//craft command
|
//craft command
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider,"
|
||||||
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 @@ Button bTLeft
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",up"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen"
|
||||||
//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 @@ Button bTStop
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",stop"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop"
|
||||||
//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 @@ Button bTRight
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
tSend.txt="event,buttonPress2,"+entn.txt+",down"
|
tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose"
|
||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
@@ -520,6 +520,7 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,bTLeft.txt,"~",13
|
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||||
tsw bTLeft,1
|
tsw bTLeft,1
|
||||||
bTLeft.pco=65535
|
bTLeft.pco=65535
|
||||||
|
vis bTLeft,1
|
||||||
}
|
}
|
||||||
// set icon bStop
|
// set icon bStop
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -533,9 +534,10 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,bTStop.txt,"~",14
|
spstr strCommand.txt,bTStop.txt,"~",14
|
||||||
tsw bTStop,1
|
tsw bTStop,1
|
||||||
bTStop.pco=65535
|
bTStop.pco=65535
|
||||||
|
vis bTStop,1
|
||||||
}
|
}
|
||||||
// set icon bDown
|
// set icon bDown
|
||||||
spstr strCommand.txt,tTmp.txt,"~",10
|
spstr strCommand.txt,tTmp.txt,"~",18
|
||||||
if(tTmp.txt=="disable")
|
if(tTmp.txt=="disable")
|
||||||
{
|
{
|
||||||
spstr strCommand.txt,bTRight.txt,"~",15
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
@@ -546,6 +548,15 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,bTRight.txt,"~",15
|
spstr strCommand.txt,bTRight.txt,"~",15
|
||||||
tsw bTRight,1
|
tsw bTRight,1
|
||||||
bTRight.pco=65535
|
bTRight.pco=65535
|
||||||
|
vis bTRight,1
|
||||||
|
}
|
||||||
|
// set tilt slider
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",19
|
||||||
|
if(tTmp.txt!="disable")
|
||||||
|
{
|
||||||
|
vis hTilt,1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hTilt.val=sys0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="dimmode")
|
if(tInstruction.txt=="dimmode")
|
||||||
|
|||||||
Reference in New Issue
Block a user