Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

This commit is contained in:
joBr99
2023-01-20 15:09:20 +01:00
7 changed files with 512 additions and 401 deletions

View File

@@ -541,7 +541,7 @@
│ b[sys0].pco=defaultFontColor
│ }
│ if(defaultBcoColor==0)
│ @@ -275,44 +275,14 @@
│ @@ -275,109 +275,79 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
@@ -586,6 +586,83 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Slider h0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h3
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h4
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h5
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Button bNext
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -463,92 +433,74 @@
│ Attributes
│ Scope : local
@@ -698,7 +775,7 @@
│ + if(sys0<h3.minval)
│ + {
│ + h3.val=h3.maxval
+ }
}
│ + h3.val+=t3Speed.val
│ + sys0=h4.val+t4Speed.val
│ + if(sys0>h4.maxval)
@@ -718,7 +795,7 @@
│ + if(sys0<h5.minval)
│ + {
│ + h5.val=h5.maxval
}
+ }
│ + h5.val+=t5Speed.val
│ Timer tmSerial
@@ -727,7 +804,7 @@
│ Period (ms): 50
│ Enabled : yes
│ @@ -636,141 +588,131 @@
│ @@ -636,189 +588,131 @@
│ vis bNext,1
│ }
│ // icon color home
@@ -759,6 +836,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",24
│ + spstr strCommand.txt,tTmp.txt,"~",19
│ covx tTmp.txt,t0Speed.val,0,0
│ - if(t0Speed.val>120)
│ - {
│ - t0Speed.val=120
│ - }
│ - if(t0Speed.val<-120)
│ - {
│ - t0Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t0u.txt,"~",25
│ + spstr strCommand.txt,t0u.txt,"~",20
@@ -784,6 +869,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",28
│ + spstr strCommand.txt,tTmp.txt,"~",23
│ covx tTmp.txt,t1Speed.val,0,0
│ - if(t1Speed.val>120)
│ - {
│ - t1Speed.val=120
│ - }
│ - if(t1Speed.val<-120)
│ - {
│ - t1Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t1u.txt,"~",29
│ + spstr strCommand.txt,t1u.txt,"~",24
@@ -809,6 +902,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",32
│ + spstr strCommand.txt,tTmp.txt,"~",27
│ covx tTmp.txt,t2Speed.val,0,0
│ - if(t2Speed.val>120)
│ - {
│ - t2Speed.val=120
│ - }
│ - if(t2Speed.val<-120)
│ - {
│ - t2Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t2u.txt,"~",33
│ + spstr strCommand.txt,t2u.txt,"~",28
@@ -834,6 +935,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",36
│ + spstr strCommand.txt,tTmp.txt,"~",31
│ covx tTmp.txt,t3Speed.val,0,0
│ - if(t3Speed.val>120)
│ - {
│ - t3Speed.val=120
│ - }
│ - if(t3Speed.val<-120)
│ - {
│ - t3Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t3u.txt,"~",37
│ + spstr strCommand.txt,t3u.txt,"~",32
@@ -859,6 +968,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",40
│ + spstr strCommand.txt,tTmp.txt,"~",35
│ covx tTmp.txt,t4Speed.val,0,0
│ - if(t4Speed.val>120)
│ - {
│ - t4Speed.val=120
│ - }
│ - if(t4Speed.val<-120)
│ - {
│ - t4Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t4u.txt,"~",41
│ + spstr strCommand.txt,t4u.txt,"~",36
@@ -884,6 +1001,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",44
│ + spstr strCommand.txt,tTmp.txt,"~",39
│ covx tTmp.txt,t5Speed.val,0,0
│ - if(t5Speed.val>120)
│ - {
│ - t5Speed.val=120
│ - }
│ - if(t5Speed.val<-120)
│ - {
│ - t5Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t5u.txt,"~",45
│ + spstr strCommand.txt,t5u.txt,"~",40

View File

@@ -1556,7 +1556,7 @@
│ b[sys0].pco=defaultFontColor
│ }
│ if(defaultBcoColor==0)
│ @@ -275,44 +275,14 @@
│ @@ -275,109 +275,79 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
@@ -1601,6 +1601,83 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Slider h0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h3
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h4
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Slider h5
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│ Button bNext
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -463,92 +433,74 @@
│ Attributes
│ Scope : local
@@ -1713,7 +1790,7 @@
│ + if(sys0<h3.minval)
│ + {
│ + h3.val=h3.maxval
+ }
}
│ + h3.val+=t3Speed.val
│ + sys0=h4.val+t4Speed.val
│ + if(sys0>h4.maxval)
@@ -1733,7 +1810,7 @@
│ + if(sys0<h5.minval)
│ + {
│ + h5.val=h5.maxval
}
+ }
│ + h5.val+=t5Speed.val
│ Timer tmSerial
@@ -1742,7 +1819,7 @@
│ Period (ms): 50
│ Enabled : yes
│ @@ -636,141 +588,131 @@
│ @@ -636,189 +588,131 @@
│ vis bNext,1
│ }
│ // icon color home
@@ -1774,6 +1851,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",24
│ + spstr strCommand.txt,tTmp.txt,"~",19
│ covx tTmp.txt,t0Speed.val,0,0
│ - if(t0Speed.val>120)
│ - {
│ - t0Speed.val=120
│ - }
│ - if(t0Speed.val<-120)
│ - {
│ - t0Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t0u.txt,"~",25
│ + spstr strCommand.txt,t0u.txt,"~",20
@@ -1799,6 +1884,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",28
│ + spstr strCommand.txt,tTmp.txt,"~",23
│ covx tTmp.txt,t1Speed.val,0,0
│ - if(t1Speed.val>120)
│ - {
│ - t1Speed.val=120
│ - }
│ - if(t1Speed.val<-120)
│ - {
│ - t1Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t1u.txt,"~",29
│ + spstr strCommand.txt,t1u.txt,"~",24
@@ -1824,6 +1917,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",32
│ + spstr strCommand.txt,tTmp.txt,"~",27
│ covx tTmp.txt,t2Speed.val,0,0
│ - if(t2Speed.val>120)
│ - {
│ - t2Speed.val=120
│ - }
│ - if(t2Speed.val<-120)
│ - {
│ - t2Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t2u.txt,"~",33
│ + spstr strCommand.txt,t2u.txt,"~",28
@@ -1849,6 +1950,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",36
│ + spstr strCommand.txt,tTmp.txt,"~",31
│ covx tTmp.txt,t3Speed.val,0,0
│ - if(t3Speed.val>120)
│ - {
│ - t3Speed.val=120
│ - }
│ - if(t3Speed.val<-120)
│ - {
│ - t3Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t3u.txt,"~",37
│ + spstr strCommand.txt,t3u.txt,"~",32
@@ -1874,6 +1983,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",40
│ + spstr strCommand.txt,tTmp.txt,"~",35
│ covx tTmp.txt,t4Speed.val,0,0
│ - if(t4Speed.val>120)
│ - {
│ - t4Speed.val=120
│ - }
│ - if(t4Speed.val<-120)
│ - {
│ - t4Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t4u.txt,"~",41
│ + spstr strCommand.txt,t4u.txt,"~",36
@@ -1899,6 +2016,14 @@
│ - spstr strCommand.txt,tTmp.txt,"~",44
│ + spstr strCommand.txt,tTmp.txt,"~",39
│ covx tTmp.txt,t5Speed.val,0,0
│ - if(t5Speed.val>120)
│ - {
│ - t5Speed.val=120
│ - }
│ - if(t5Speed.val<-120)
│ - {
│ - t5Speed.val=-120
│ - }
│ // lower text
│ - spstr strCommand.txt,t5u.txt,"~",45
│ + spstr strCommand.txt,t5u.txt,"~",40

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-14 14:44:28.229131210 +0000
+++ /dev/fd/62 2023-01-20 14:06:59.554663210 +0000
+le list
+ +1,12 @@
+.s.txt
@@ -975,7 +975,7 @@
+ b[sys0].pco=defaultFontColor
+ }
+ if(defaultBcoColor==0)
+44 +275,14 @@
+109 +275,79 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
@@ -1020,6 +1020,83 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+
+h0
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h1
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h2
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h3
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h4
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h5
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+bNext
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+92 +433,74 @@
+ributes
+ Scope : local
@@ -1161,7 +1238,7 @@
+ Period (ms): 50
+ Enabled : yes
+
+141 +588,131 @@
+189 +588,131 @@
+ vis bNext,1
+ }
+ // icon color home
@@ -1193,6 +1270,14 @@
+ spstr strCommand.txt,tTmp.txt,"~",24
+ spstr strCommand.txt,tTmp.txt,"~",19
+ covx tTmp.txt,t0Speed.val,0,0
+ if(t0Speed.val>120)
+ {
+ t0Speed.val=120
+ }
+ if(t0Speed.val<-120)
+ {
+ t0Speed.val=-120
+ }
+ // lower text
+ spstr strCommand.txt,t0u.txt,"~",25
+ spstr strCommand.txt,t0u.txt,"~",20
@@ -1218,6 +1303,14 @@
+ spstr strCommand.txt,tTmp.txt,"~",28
+ spstr strCommand.txt,tTmp.txt,"~",23
+ covx tTmp.txt,t1Speed.val,0,0
+ if(t1Speed.val>120)
+ {
+ t1Speed.val=120
+ }
+ if(t1Speed.val<-120)
+ {
+ t1Speed.val=-120
+ }
+ // lower text
+ spstr strCommand.txt,t1u.txt,"~",29
+ spstr strCommand.txt,t1u.txt,"~",24
@@ -1243,6 +1336,14 @@
+ spstr strCommand.txt,tTmp.txt,"~",32
+ spstr strCommand.txt,tTmp.txt,"~",27
+ covx tTmp.txt,t2Speed.val,0,0
+ if(t2Speed.val>120)
+ {
+ t2Speed.val=120
+ }
+ if(t2Speed.val<-120)
+ {
+ t2Speed.val=-120
+ }
+ // lower text
+ spstr strCommand.txt,t2u.txt,"~",33
+ spstr strCommand.txt,t2u.txt,"~",28
@@ -1268,6 +1369,14 @@
+ spstr strCommand.txt,tTmp.txt,"~",36
+ spstr strCommand.txt,tTmp.txt,"~",31
+ covx tTmp.txt,t3Speed.val,0,0
+ if(t3Speed.val>120)
+ {
+ t3Speed.val=120
+ }
+ if(t3Speed.val<-120)
+ {
+ t3Speed.val=-120
+ }
+ // lower text
+ spstr strCommand.txt,t3u.txt,"~",37
+ spstr strCommand.txt,t3u.txt,"~",32
@@ -1293,6 +1402,14 @@
+ spstr strCommand.txt,tTmp.txt,"~",40
+ spstr strCommand.txt,tTmp.txt,"~",35
+ covx tTmp.txt,t4Speed.val,0,0
+ if(t4Speed.val>120)
+ {
+ t4Speed.val=120
+ }
+ if(t4Speed.val<-120)
+ {
+ t4Speed.val=-120
+ }
+ // lower text
+ spstr strCommand.txt,t4u.txt,"~",41
+ spstr strCommand.txt,t4u.txt,"~",36
@@ -1318,6 +1435,14 @@
+ spstr strCommand.txt,tTmp.txt,"~",44
+ spstr strCommand.txt,tTmp.txt,"~",39
+ covx tTmp.txt,t5Speed.val,0,0
+ if(t5Speed.val>120)
+ {
+ t5Speed.val=120
+ }
+ if(t5Speed.val<-120)
+ {
+ t5Speed.val=-120
+ }
+ // lower text
+ spstr strCommand.txt,t5u.txt,"~",45
+ spstr strCommand.txt,t5u.txt,"~",40

View File

@@ -1,360 +0,0 @@
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icon left
spstr strCommand.txt,tTmp.txt,"~",2 //type
if(tTmp.txt=="delete"||tTmp.txt=="")
{
vis bPrev,0
}else
{
// get internal name
spstr strCommand.txt,nent1.txt,"~",3
// change icon
spstr strCommand.txt,bPrev.txt,"~",4
// change icon color
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,sys0,0,0
bPrev.pco=sys0
vis bPrev,1
}
// navigation icon right
spstr strCommand.txt,tTmp.txt,"~",8 //type
if(tTmp.txt=="delete"||tTmp.txt=="")
{
vis bNext,0
}else
{
// get internal name
spstr strCommand.txt,nent2.txt,"~",9
// change icon
spstr strCommand.txt,bNext.txt,"~",10
// change icon color
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
bNext.pco=sys0
vis bNext,1
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",15
// text home
spstr strCommand.txt,tHome.txt,"~",16
// iconColor
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",18
// speed
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t0Speed.val,0,0
// lower text
spstr strCommand.txt,t0u.txt,"~",20
if(t0Icon.txt!="")
{
vis t0Icon,1
vis t0u,1
vis h0,1
}else
{
vis t0Icon,0
vis t0u,0
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",22
// speed
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,t1Speed.val,0,0
// lower text
spstr strCommand.txt,t1u.txt,"~",24
if(t1Icon.txt!="")
{
vis t1Icon,1
vis t1u,1
vis h1,1
}else
{
vis t1Icon,0
vis t1u,0
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",25
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",26
// speed
spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,t2Speed.val,0,0
// lower text
spstr strCommand.txt,t2u.txt,"~",28
if(t2Icon.txt!="")
{
vis t2Icon,1
vis t2u,1
vis h2,1
}else
{
vis t2Icon,0
vis t2u,0
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",29
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",30
// speed
spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,t3Speed.val,0,0
// lower text
spstr strCommand.txt,t3u.txt,"~",32
if(t3Icon.txt!="")
{
vis t3Icon,1
vis t3u,1
vis h3,1
}else
{
vis t3Icon,0
vis t3u,0
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",33
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",34
// speed
spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,t4Speed.val,0,0
// lower text
spstr strCommand.txt,t4u.txt,"~",36
if(t4Icon.txt!="")
{
vis t4Icon,1
vis t4u,1
vis h4,1
}else
{
vis t4Icon,0
vis t4u,0
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",37
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",38
// speed
spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,t5Speed.val,0,0
// lower text
spstr strCommand.txt,t5u.txt,"~",40
if(t5Icon.txt!="")
{
vis t5Icon,1
vis t5u,1
vis h5,1
}else
{
vis t5Icon,0
vis t5u,0
vis h5,0
}
}
if(tInstruction.txt=="pageType")
{
sleepValue=0
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
if(tId.txt=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// 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=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}

View File

@@ -742,8 +742,8 @@ Slider h0
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h1
@@ -767,8 +767,8 @@ Slider h1
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h2
@@ -792,8 +792,8 @@ Slider h2
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h3
@@ -817,8 +817,8 @@ Slider h3
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h4
@@ -842,8 +842,8 @@ Slider h4
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h5
@@ -867,8 +867,8 @@ Slider h5
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Button bNext
@@ -1228,6 +1228,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,t0Speed.val,0,0
if(t0Speed.val>120)
{
t0Speed.val=120
}
if(t0Speed.val<-120)
{
t0Speed.val=-120
}
// lower text
spstr strCommand.txt,t0u.txt,"~",25
if(t0Icon.txt!="")
@@ -1249,6 +1257,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,t1Speed.val,0,0
if(t1Speed.val>120)
{
t1Speed.val=120
}
if(t1Speed.val<-120)
{
t1Speed.val=-120
}
// lower text
spstr strCommand.txt,t1u.txt,"~",29
if(t1Icon.txt!="")
@@ -1270,6 +1286,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,t2Speed.val,0,0
if(t2Speed.val>120)
{
t2Speed.val=120
}
if(t2Speed.val<-120)
{
t2Speed.val=-120
}
// lower text
spstr strCommand.txt,t2u.txt,"~",33
if(t2Icon.txt!="")
@@ -1291,6 +1315,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,t3Speed.val,0,0
if(t3Speed.val>120)
{
t3Speed.val=120
}
if(t3Speed.val<-120)
{
t3Speed.val=-120
}
// lower text
spstr strCommand.txt,t3u.txt,"~",37
if(t3Icon.txt!="")
@@ -1312,6 +1344,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,t4Speed.val,0,0
if(t4Speed.val>120)
{
t4Speed.val=120
}
if(t4Speed.val<-120)
{
t4Speed.val=-120
}
// lower text
spstr strCommand.txt,t4u.txt,"~",41
if(t4Icon.txt!="")
@@ -1333,6 +1373,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,t5Speed.val,0,0
if(t5Speed.val>120)
{
t5Speed.val=120
}
if(t5Speed.val<-120)
{
t5Speed.val=-120
}
// lower text
spstr strCommand.txt,t5u.txt,"~",45
if(t5Icon.txt!="")

View File

@@ -46,6 +46,10 @@ screensaver
47 Component(s)
443 Line(s) of event code
311 Unique line(s) of event code
cardPower
48 Component(s)
483 Line(s) of event code
324 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
@@ -58,10 +62,6 @@ popupShutter
25 Component(s)
398 Line(s) of event code
218 Unique line(s) of event code
cardPower
48 Component(s)
435 Line(s) of event code
300 Unique line(s) of event code
cardMedia
59 Component(s)
641 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total
20 Page(s)
737 Component(s)
8754 Line(s) of event code
2247 Unique line(s) of event code
8802 Line(s) of event code
2271 Unique line(s) of event code

View File

@@ -322,8 +322,8 @@ Slider h0
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h1
@@ -332,8 +332,8 @@ Slider h1
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h2
@@ -342,8 +342,8 @@ Slider h2
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h3
@@ -352,8 +352,8 @@ Slider h3
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h4
@@ -362,8 +362,8 @@ Slider h4
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h5
@@ -372,8 +372,8 @@ Slider h5
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Button bNext
@@ -660,6 +660,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,t0Speed.val,0,0
if(t0Speed.val>120)
{
t0Speed.val=120
}
if(t0Speed.val<-120)
{
t0Speed.val=-120
}
// lower text
spstr strCommand.txt,t0u.txt,"~",25
if(t0Icon.txt!="")
@@ -681,6 +689,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,t1Speed.val,0,0
if(t1Speed.val>120)
{
t1Speed.val=120
}
if(t1Speed.val<-120)
{
t1Speed.val=-120
}
// lower text
spstr strCommand.txt,t1u.txt,"~",29
if(t1Icon.txt!="")
@@ -702,6 +718,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,t2Speed.val,0,0
if(t2Speed.val>120)
{
t2Speed.val=120
}
if(t2Speed.val<-120)
{
t2Speed.val=-120
}
// lower text
spstr strCommand.txt,t2u.txt,"~",33
if(t2Icon.txt!="")
@@ -723,6 +747,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,t3Speed.val,0,0
if(t3Speed.val>120)
{
t3Speed.val=120
}
if(t3Speed.val<-120)
{
t3Speed.val=-120
}
// lower text
spstr strCommand.txt,t3u.txt,"~",37
if(t3Icon.txt!="")
@@ -744,6 +776,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,t4Speed.val,0,0
if(t4Speed.val>120)
{
t4Speed.val=120
}
if(t4Speed.val<-120)
{
t4Speed.val=-120
}
// lower text
spstr strCommand.txt,t4u.txt,"~",41
if(t4Icon.txt!="")
@@ -765,6 +805,14 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,t5Speed.val,0,0
if(t5Speed.val>120)
{
t5Speed.val=120
}
if(t5Speed.val<-120)
{
t5Speed.val=-120
}
// lower text
spstr strCommand.txt,t5u.txt,"~",45
if(t5Icon.txt!="")