mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4600458da3 | ||
|
67bc1533bf | ||
|
|
e5f5546352 | ||
|
|
40896473b2 | ||
|
|
83e820d037 | ||
|
|
fb8a1003f9 | ||
|
1eef2bc96f | ||
|
015d9c29c7 | ||
|
|
164467d435 | ||
|
|
e8e8b0fc29 | ||
|
|
b95b35f10c | ||
|
|
7d52df1f11 | ||
|
|
ff2208a646 | ||
|
|
205f45ba48 | ||
|
|
1712098f61 | ||
|
|
84585499d5 | ||
|
|
1a4f7a7754 | ||
|
|
632663cd9f | ||
|
|
059619a636 | ||
|
|
49352c7ca0 | ||
|
|
a44573cfc9 | ||
|
|
847546893f | ||
|
|
11106eb778 | ||
|
|
cf1acdefff | ||
|
|
5a07523a86 | ||
|
|
affb663579 | ||
|
|
d2695d993e | ||
|
|
b3b24d4b8d | ||
|
|
690a8f4279 | ||
|
|
040119963a | ||
|
|
fe44b008af | ||
|
|
7d2503c66b |
@@ -33,27 +33,6 @@
|
|||||||
│ crcputs sys0,2
|
│ crcputs sys0,2
|
||||||
│ crcputs tSend.txt,0
|
│ crcputs tSend.txt,0
|
||||||
│ //send cmd
|
│ //send cmd
|
||||||
│ @@ -275,20 +275,14 @@
|
|
||||||
│ }
|
|
||||||
│ // get font color
|
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",4
|
|
||||||
│ if(tTmp.txt!="")
|
|
||||||
│ {
|
|
||||||
│ covx tTmp.txt,defaultFontColor,0,0
|
|
||||||
│ }
|
|
||||||
│ - // get feature flag popup
|
|
||||||
│ - spstr strCommand.txt,tTmp.txt,"~",5
|
|
||||||
│ - if(tTmp.txt!="")
|
|
||||||
│ - {
|
|
||||||
│ - covx tTmp.txt,featNewSliders,0,0
|
|
||||||
│ - }
|
|
||||||
│ }
|
|
||||||
│ if(tInstruction.txt=="timeout")
|
|
||||||
│ {
|
|
||||||
│ //set timeout to global var
|
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
|
||||||
│ covx tTmp.txt,sleepTimeout,0,0
|
|
||||||
│ }
|
|
||||||
│ --- HMI/n2t-out/screensaver.txt
|
│ --- HMI/n2t-out/screensaver.txt
|
||||||
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
|
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
|
||||||
│ @@ -28,17 +28,14 @@
|
│ @@ -28,17 +28,14 @@
|
||||||
|
|||||||
@@ -1167,6 +1167,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -1188,6 +1199,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -1209,6 +1231,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -1230,6 +1263,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1251,6 +1295,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1272,6 +1327,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1358,10 +1424,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1389,6 +1389,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -1410,6 +1421,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -1431,6 +1453,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -1452,6 +1485,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1473,6 +1517,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1494,6 +1549,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1515,6 +1581,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity7.txt,"~",52
|
spstr strCommand.txt,bEntity7.txt,"~",52
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity7.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity7.font=sys1
|
||||||
|
substr bEntity7.txt,bEntity7.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity7,1
|
vis bEntity7,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",53
|
spstr strCommand.txt,tTmp.txt,"~",53
|
||||||
@@ -1536,6 +1613,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity8.txt,"~",58
|
spstr strCommand.txt,bEntity8.txt,"~",58
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity8.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity8.font=sys1
|
||||||
|
substr bEntity8.txt,bEntity8.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity8,1
|
vis bEntity8,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",59
|
spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
|
|||||||
@@ -1485,6 +1485,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",25
|
spstr strCommand.txt,bEntity1.txt,"~",25
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
spstr strCommand.txt,tTmp.txt,"~",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1506,6 +1517,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",31
|
spstr strCommand.txt,bEntity2.txt,"~",31
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",32
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1527,6 +1549,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",37
|
spstr strCommand.txt,bEntity3.txt,"~",37
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",38
|
spstr strCommand.txt,tTmp.txt,"~",38
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1548,6 +1581,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",43
|
spstr strCommand.txt,bEntity4.txt,"~",43
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",44
|
spstr strCommand.txt,tTmp.txt,"~",44
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1569,6 +1613,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",49
|
spstr strCommand.txt,bEntity5.txt,"~",49
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",50
|
spstr strCommand.txt,tTmp.txt,"~",50
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1590,6 +1645,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",55
|
spstr strCommand.txt,bEntity6.txt,"~",55
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",56
|
spstr strCommand.txt,tTmp.txt,"~",56
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1675,10 +1741,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,14 +10,14 @@ pageIcons
|
|||||||
7 Component(s)
|
7 Component(s)
|
||||||
0 Line(s) of event code
|
0 Line(s) of event code
|
||||||
0 Unique line(s) of event code
|
0 Unique line(s) of event code
|
||||||
|
pageStartup
|
||||||
|
20 Component(s)
|
||||||
|
198 Line(s) of event code
|
||||||
|
137 Unique line(s) of event code
|
||||||
popupTimer
|
popupTimer
|
||||||
42 Component(s)
|
42 Component(s)
|
||||||
516 Line(s) of event code
|
516 Line(s) of event code
|
||||||
257 Unique line(s) of event code
|
257 Unique line(s) of event code
|
||||||
pageStartup
|
|
||||||
20 Component(s)
|
|
||||||
193 Line(s) of event code
|
|
||||||
135 Unique line(s) of event code
|
|
||||||
cardChart
|
cardChart
|
||||||
33 Component(s)
|
33 Component(s)
|
||||||
437 Line(s) of event code
|
437 Line(s) of event code
|
||||||
@@ -70,22 +70,22 @@ cardThermo
|
|||||||
57 Component(s)
|
57 Component(s)
|
||||||
540 Line(s) of event code
|
540 Line(s) of event code
|
||||||
319 Unique line(s) of event code
|
319 Unique line(s) of event code
|
||||||
|
cardGrid
|
||||||
|
44 Component(s)
|
||||||
|
579 Line(s) of event code
|
||||||
|
330 Unique line(s) of event code
|
||||||
cardMedia
|
cardMedia
|
||||||
59 Component(s)
|
59 Component(s)
|
||||||
649 Line(s) of event code
|
699 Line(s) of event code
|
||||||
322 Unique line(s) of event code
|
354 Unique line(s) of event code
|
||||||
cardGrid2
|
|
||||||
52 Component(s)
|
|
||||||
617 Line(s) of event code
|
|
||||||
338 Unique line(s) of event code
|
|
||||||
popupLight
|
popupLight
|
||||||
28 Component(s)
|
28 Component(s)
|
||||||
412 Line(s) of event code
|
412 Line(s) of event code
|
||||||
227 Unique line(s) of event code
|
227 Unique line(s) of event code
|
||||||
cardGrid
|
cardGrid2
|
||||||
44 Component(s)
|
52 Component(s)
|
||||||
529 Line(s) of event code
|
689 Line(s) of event code
|
||||||
298 Unique line(s) of event code
|
382 Unique line(s) of event code
|
||||||
cardEntities
|
cardEntities
|
||||||
67 Component(s)
|
67 Component(s)
|
||||||
1194 Line(s) of event code
|
1194 Line(s) of event code
|
||||||
@@ -98,5 +98,5 @@ screensaver2
|
|||||||
Total
|
Total
|
||||||
23 Page(s)
|
23 Page(s)
|
||||||
875 Component(s)
|
875 Component(s)
|
||||||
10379 Line(s) of event code
|
10556 Line(s) of event code
|
||||||
2407 Unique line(s) of event code
|
2450 Unique line(s) of event code
|
||||||
|
|||||||
@@ -396,7 +396,7 @@ Text tVersion
|
|||||||
Horizontal Alignment: center
|
Horizontal Alignment: center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : 52
|
Text : 53
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
@@ -575,6 +575,12 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
covx tTmp.txt,defaultFontColor,0,0
|
covx tTmp.txt,defaultFontColor,0,0
|
||||||
}
|
}
|
||||||
|
// get feature flag popup
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,featNewSliders,0,0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -719,6 +719,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -740,6 +751,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -761,6 +783,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -782,6 +815,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -803,6 +847,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -824,6 +879,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -910,10 +976,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -853,6 +853,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -874,6 +885,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -895,6 +917,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -916,6 +949,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -937,6 +981,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -958,6 +1013,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -979,6 +1045,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity7.txt,"~",52
|
spstr strCommand.txt,bEntity7.txt,"~",52
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity7.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity7.font=sys1
|
||||||
|
substr bEntity7.txt,bEntity7.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity7,1
|
vis bEntity7,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",53
|
spstr strCommand.txt,tTmp.txt,"~",53
|
||||||
@@ -1000,6 +1077,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity8.txt,"~",58
|
spstr strCommand.txt,bEntity8.txt,"~",58
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity8.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity8.font=sys1
|
||||||
|
substr bEntity8.txt,bEntity8.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity8,1
|
vis bEntity8,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",59
|
spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
|
|||||||
@@ -997,6 +997,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",25
|
spstr strCommand.txt,bEntity1.txt,"~",25
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
spstr strCommand.txt,tTmp.txt,"~",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1018,6 +1029,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",31
|
spstr strCommand.txt,bEntity2.txt,"~",31
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",32
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1039,6 +1061,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",37
|
spstr strCommand.txt,bEntity3.txt,"~",37
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",38
|
spstr strCommand.txt,tTmp.txt,"~",38
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1060,6 +1093,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",43
|
spstr strCommand.txt,bEntity4.txt,"~",43
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",44
|
spstr strCommand.txt,tTmp.txt,"~",44
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1081,6 +1125,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",49
|
spstr strCommand.txt,bEntity5.txt,"~",49
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",50
|
spstr strCommand.txt,tTmp.txt,"~",50
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1102,6 +1157,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",55
|
spstr strCommand.txt,bEntity6.txt,"~",55
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",56
|
spstr strCommand.txt,tTmp.txt,"~",56
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1187,10 +1253,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ Text tVersion
|
|||||||
Dragging : 0
|
Dragging : 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard: none
|
Associated Keyboard: none
|
||||||
Text : 52
|
Text : 53
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
@@ -279,6 +279,12 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
covx tTmp.txt,defaultFontColor,0,0
|
covx tTmp.txt,defaultFontColor,0,0
|
||||||
}
|
}
|
||||||
|
// get feature flag popup
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",5
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,featNewSliders,0,0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1195,7 +1195,7 @@
|
|||||||
│ Send Component ID: disabled
|
│ Send Component ID: disabled
|
||||||
│ State : unpressed
|
│ State : unpressed
|
||||||
│ Text : î³
|
│ Text : î³
|
||||||
│ @@ -1005,14 +1072,35 @@
|
│ @@ -1093,14 +1160,46 @@
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",59
|
│ spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
│ covx tTmp.txt,sys0,0,0
|
│ covx tTmp.txt,sys0,0,0
|
||||||
│ bEntity8.pco=sys0
|
│ bEntity8.pco=sys0
|
||||||
@@ -1215,6 +1215,17 @@
|
|||||||
│ + {
|
│ + {
|
||||||
│ + // change icon
|
│ + // change icon
|
||||||
│ + spstr strCommand.txt,bEntity9.txt,"~",64
|
│ + spstr strCommand.txt,bEntity9.txt,"~",64
|
||||||
|
│ + // way to get force font adjustment
|
||||||
|
│ + strlen bEntity9.txt,sys0
|
||||||
|
│ + //check 2nd last char for ¬
|
||||||
|
│ + substr bEntity9.txt,tTmp.txt,sys0-2,1
|
||||||
|
│ + if(tTmp.txt=="¬")
|
||||||
|
│ + {
|
||||||
|
│ + substr bEntity9.txt,tTmp.txt,sys0-1,1
|
||||||
|
│ + covx tTmp.txt,sys1,0,0
|
||||||
|
│ + bEntity9.font=sys1
|
||||||
|
│ + substr bEntity9.txt,bEntity9.txt,0,sys0-2
|
||||||
|
│ + }
|
||||||
│ + vis bEntity9,1
|
│ + vis bEntity9,1
|
||||||
│ + // change icon color
|
│ + // change icon color
|
||||||
│ + spstr strCommand.txt,tTmp.txt,"~",65
|
│ + spstr strCommand.txt,tTmp.txt,"~",65
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
+++ /dev/fd/62 2023-08-20 13:07:13.304519211 +0000
|
+++ /dev/fd/62 2023-09-16 10:55:16.569411880 +0000
|
||||||
+I/n2t-out/Program.s.txt
|
+I/n2t-out/Program.s.txt
|
||||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
+1 +12,11 @@
|
+1 +12,11 @@
|
||||||
@@ -757,7 +757,7 @@
|
|||||||
+ Send Component ID: disabled
|
+ Send Component ID: disabled
|
||||||
+ State : unpressed
|
+ State : unpressed
|
||||||
+ Text : î³
|
+ Text : î³
|
||||||
+,14 +1072,35 @@
|
+,14 +1160,46 @@
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",59
|
+ spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
+ covx tTmp.txt,sys0,0,0
|
+ covx tTmp.txt,sys0,0,0
|
||||||
+ bEntity8.pco=sys0
|
+ bEntity8.pco=sys0
|
||||||
@@ -777,6 +777,17 @@
|
|||||||
+ {
|
+ {
|
||||||
+ // change icon
|
+ // change icon
|
||||||
+ spstr strCommand.txt,bEntity9.txt,"~",64
|
+ spstr strCommand.txt,bEntity9.txt,"~",64
|
||||||
|
+ // way to get force font adjustment
|
||||||
|
+ strlen bEntity9.txt,sys0
|
||||||
|
+ //check 2nd last char for ¬
|
||||||
|
+ substr bEntity9.txt,tTmp.txt,sys0-2,1
|
||||||
|
+ if(tTmp.txt=="¬")
|
||||||
|
+ {
|
||||||
|
+ substr bEntity9.txt,tTmp.txt,sys0-1,1
|
||||||
|
+ covx tTmp.txt,sys1,0,0
|
||||||
|
+ bEntity9.font=sys1
|
||||||
|
+ substr bEntity9.txt,bEntity9.txt,0,sys0-2
|
||||||
|
+ }
|
||||||
+ vis bEntity9,1
|
+ vis bEntity9,1
|
||||||
+ // change icon color
|
+ // change icon color
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",65
|
+ spstr strCommand.txt,tTmp.txt,"~",65
|
||||||
|
|||||||
@@ -1167,6 +1167,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -1188,6 +1199,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -1209,6 +1231,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -1230,6 +1263,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1251,6 +1295,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1272,6 +1327,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1358,10 +1424,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1500,6 +1500,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -1521,6 +1532,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -1542,6 +1564,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -1563,6 +1596,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1584,6 +1628,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1605,6 +1660,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1626,6 +1692,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity7.txt,"~",52
|
spstr strCommand.txt,bEntity7.txt,"~",52
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity7.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity7.font=sys1
|
||||||
|
substr bEntity7.txt,bEntity7.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity7,1
|
vis bEntity7,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",53
|
spstr strCommand.txt,tTmp.txt,"~",53
|
||||||
@@ -1647,6 +1724,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity8.txt,"~",58
|
spstr strCommand.txt,bEntity8.txt,"~",58
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity8.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity8.font=sys1
|
||||||
|
substr bEntity8.txt,bEntity8.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity8,1
|
vis bEntity8,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",59
|
spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
@@ -1668,6 +1756,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity9.txt,"~",64
|
spstr strCommand.txt,bEntity9.txt,"~",64
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity9.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity9.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity9.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity9.font=sys1
|
||||||
|
substr bEntity9.txt,bEntity9.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity9,1
|
vis bEntity9,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",65
|
spstr strCommand.txt,tTmp.txt,"~",65
|
||||||
|
|||||||
@@ -1485,6 +1485,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",25
|
spstr strCommand.txt,bEntity1.txt,"~",25
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
spstr strCommand.txt,tTmp.txt,"~",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1506,6 +1517,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",31
|
spstr strCommand.txt,bEntity2.txt,"~",31
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",32
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1527,6 +1549,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",37
|
spstr strCommand.txt,bEntity3.txt,"~",37
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",38
|
spstr strCommand.txt,tTmp.txt,"~",38
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1548,6 +1581,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",43
|
spstr strCommand.txt,bEntity4.txt,"~",43
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",44
|
spstr strCommand.txt,tTmp.txt,"~",44
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1569,6 +1613,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",49
|
spstr strCommand.txt,bEntity5.txt,"~",49
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",50
|
spstr strCommand.txt,tTmp.txt,"~",50
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1590,6 +1645,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",55
|
spstr strCommand.txt,bEntity6.txt,"~",55
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",56
|
spstr strCommand.txt,tTmp.txt,"~",56
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1675,10 +1741,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ popupNotify
|
|||||||
19 Component(s)
|
19 Component(s)
|
||||||
267 Line(s) of event code
|
267 Line(s) of event code
|
||||||
172 Unique line(s) of event code
|
172 Unique line(s) of event code
|
||||||
cardGrid
|
pageStartup
|
||||||
44 Component(s)
|
19 Component(s)
|
||||||
529 Line(s) of event code
|
198 Line(s) of event code
|
||||||
298 Unique line(s) of event code
|
137 Unique line(s) of event code
|
||||||
popupTimer
|
popupTimer
|
||||||
42 Component(s)
|
42 Component(s)
|
||||||
516 Line(s) of event code
|
516 Line(s) of event code
|
||||||
@@ -38,18 +38,14 @@ cardChart
|
|||||||
33 Component(s)
|
33 Component(s)
|
||||||
437 Line(s) of event code
|
437 Line(s) of event code
|
||||||
296 Unique line(s) of event code
|
296 Unique line(s) of event code
|
||||||
cardMedia
|
cardGrid
|
||||||
59 Component(s)
|
44 Component(s)
|
||||||
649 Line(s) of event code
|
579 Line(s) of event code
|
||||||
322 Unique line(s) of event code
|
330 Unique line(s) of event code
|
||||||
cardLChart
|
cardLChart
|
||||||
33 Component(s)
|
33 Component(s)
|
||||||
402 Line(s) of event code
|
402 Line(s) of event code
|
||||||
266 Unique line(s) of event code
|
266 Unique line(s) of event code
|
||||||
pageStartup
|
|
||||||
19 Component(s)
|
|
||||||
198 Line(s) of event code
|
|
||||||
137 Unique line(s) of event code
|
|
||||||
popupShutter
|
popupShutter
|
||||||
25 Component(s)
|
25 Component(s)
|
||||||
402 Line(s) of event code
|
402 Line(s) of event code
|
||||||
@@ -66,14 +62,14 @@ popupInSel
|
|||||||
34 Component(s)
|
34 Component(s)
|
||||||
621 Line(s) of event code
|
621 Line(s) of event code
|
||||||
297 Unique line(s) of event code
|
297 Unique line(s) of event code
|
||||||
cardGrid2
|
|
||||||
56 Component(s)
|
|
||||||
663 Line(s) of event code
|
|
||||||
359 Unique line(s) of event code
|
|
||||||
cardAlarm
|
cardAlarm
|
||||||
43 Component(s)
|
43 Component(s)
|
||||||
500 Line(s) of event code
|
500 Line(s) of event code
|
||||||
273 Unique line(s) of event code
|
273 Unique line(s) of event code
|
||||||
|
cardMedia
|
||||||
|
59 Component(s)
|
||||||
|
699 Line(s) of event code
|
||||||
|
354 Unique line(s) of event code
|
||||||
cardThermo
|
cardThermo
|
||||||
57 Component(s)
|
57 Component(s)
|
||||||
540 Line(s) of event code
|
540 Line(s) of event code
|
||||||
@@ -94,9 +90,13 @@ cardEntities
|
|||||||
91 Component(s)
|
91 Component(s)
|
||||||
1666 Line(s) of event code
|
1666 Line(s) of event code
|
||||||
711 Unique line(s) of event code
|
711 Unique line(s) of event code
|
||||||
|
cardGrid2
|
||||||
|
56 Component(s)
|
||||||
|
744 Line(s) of event code
|
||||||
|
408 Unique line(s) of event code
|
||||||
|
|
||||||
Total
|
Total
|
||||||
23 Page(s)
|
23 Page(s)
|
||||||
890 Component(s)
|
890 Component(s)
|
||||||
10836 Line(s) of event code
|
11017 Line(s) of event code
|
||||||
2553 Unique line(s) of event code
|
2600 Unique line(s) of event code
|
||||||
|
|||||||
@@ -389,7 +389,7 @@ Text tVersion
|
|||||||
Horizontal Alignment: center
|
Horizontal Alignment: center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : 52
|
Text : 53
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
|
|||||||
@@ -719,6 +719,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -740,6 +751,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -761,6 +783,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -782,6 +815,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -803,6 +847,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -824,6 +879,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -910,10 +976,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -920,6 +920,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -941,6 +952,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -962,6 +984,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -983,6 +1016,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1004,6 +1048,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1025,6 +1080,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1046,6 +1112,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity7.txt,"~",52
|
spstr strCommand.txt,bEntity7.txt,"~",52
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity7.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity7.font=sys1
|
||||||
|
substr bEntity7.txt,bEntity7.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity7,1
|
vis bEntity7,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",53
|
spstr strCommand.txt,tTmp.txt,"~",53
|
||||||
@@ -1067,6 +1144,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity8.txt,"~",58
|
spstr strCommand.txt,bEntity8.txt,"~",58
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity8.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity8.font=sys1
|
||||||
|
substr bEntity8.txt,bEntity8.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity8,1
|
vis bEntity8,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",59
|
spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
@@ -1088,6 +1176,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity9.txt,"~",64
|
spstr strCommand.txt,bEntity9.txt,"~",64
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity9.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity9.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity9.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity9.font=sys1
|
||||||
|
substr bEntity9.txt,bEntity9.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity9,1
|
vis bEntity9,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",65
|
spstr strCommand.txt,tTmp.txt,"~",65
|
||||||
|
|||||||
@@ -997,6 +997,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",25
|
spstr strCommand.txt,bEntity1.txt,"~",25
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
spstr strCommand.txt,tTmp.txt,"~",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1018,6 +1029,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",31
|
spstr strCommand.txt,bEntity2.txt,"~",31
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",32
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1039,6 +1061,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",37
|
spstr strCommand.txt,bEntity3.txt,"~",37
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",38
|
spstr strCommand.txt,tTmp.txt,"~",38
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1060,6 +1093,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",43
|
spstr strCommand.txt,bEntity4.txt,"~",43
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",44
|
spstr strCommand.txt,tTmp.txt,"~",44
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1081,6 +1125,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",49
|
spstr strCommand.txt,bEntity5.txt,"~",49
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",50
|
spstr strCommand.txt,tTmp.txt,"~",50
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1102,6 +1157,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",55
|
spstr strCommand.txt,bEntity6.txt,"~",55
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",56
|
spstr strCommand.txt,tTmp.txt,"~",56
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1187,10 +1253,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ Text tVersion
|
|||||||
Dragging : 0
|
Dragging : 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard: none
|
Associated Keyboard: none
|
||||||
Text : 52
|
Text : 53
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -7,7 +7,7 @@ head = sharedhead + """
|
|||||||
""" + navigation
|
""" + navigation
|
||||||
print(head)
|
print(head)
|
||||||
start = 14
|
start = 14
|
||||||
for i in range(1,7):
|
for i in range(1,9):
|
||||||
idxstart = start + (i-1)*6
|
idxstart = start + (i-1)*6
|
||||||
item = f"""
|
item = f"""
|
||||||
// get Type
|
// get Type
|
||||||
@@ -22,6 +22,19 @@ for i in range(1,7):
|
|||||||
{{
|
{{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
|
spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
|
||||||
|
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity{i}.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity{i}.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{{
|
||||||
|
substr bEntity{i}.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity{i}.font=sys1
|
||||||
|
substr bEntity{i}.txt,bEntity{i}.txt,0,sys0-2
|
||||||
|
}}
|
||||||
|
|
||||||
vis bEntity{i},1
|
vis bEntity{i},1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
|
spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
|
||||||
|
|||||||
@@ -71,6 +71,19 @@ for i in range(1,7):
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
|
spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
|
||||||
vis bEntity{i},1
|
vis bEntity{i},1
|
||||||
|
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity{i}.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity{i}.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{{
|
||||||
|
substr bEntity{i}.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity{i}.font=sys1
|
||||||
|
substr bEntity{i}.txt,bEntity{i}.txt,0,sys0-2
|
||||||
|
}}
|
||||||
|
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
|
spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -79,6 +92,7 @@ for i in range(1,7):
|
|||||||
spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
|
spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
|
||||||
vis tEntity{i},1
|
vis tEntity{i},1
|
||||||
}}
|
}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
print(item)
|
print(item)
|
||||||
foot = """
|
foot = """
|
||||||
|
|||||||
@@ -1167,6 +1167,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -1188,6 +1199,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -1209,6 +1231,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -1230,6 +1263,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1251,6 +1295,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1272,6 +1327,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1358,10 +1424,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1389,6 +1389,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -1410,6 +1421,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -1431,6 +1453,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -1452,6 +1485,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -1473,6 +1517,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -1494,6 +1549,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -1515,6 +1581,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity7.txt,"~",52
|
spstr strCommand.txt,bEntity7.txt,"~",52
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity7.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity7.font=sys1
|
||||||
|
substr bEntity7.txt,bEntity7.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity7,1
|
vis bEntity7,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",53
|
spstr strCommand.txt,tTmp.txt,"~",53
|
||||||
@@ -1536,6 +1613,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity8.txt,"~",58
|
spstr strCommand.txt,bEntity8.txt,"~",58
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity8.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity8.font=sys1
|
||||||
|
substr bEntity8.txt,bEntity8.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity8,1
|
vis bEntity8,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",59
|
spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
|
|||||||
@@ -1485,6 +1485,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",25
|
spstr strCommand.txt,bEntity1.txt,"~",25
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
spstr strCommand.txt,tTmp.txt,"~",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1506,6 +1517,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",31
|
spstr strCommand.txt,bEntity2.txt,"~",31
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",32
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1527,6 +1549,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",37
|
spstr strCommand.txt,bEntity3.txt,"~",37
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",38
|
spstr strCommand.txt,tTmp.txt,"~",38
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1548,6 +1581,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",43
|
spstr strCommand.txt,bEntity4.txt,"~",43
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",44
|
spstr strCommand.txt,tTmp.txt,"~",44
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1569,6 +1613,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",49
|
spstr strCommand.txt,bEntity5.txt,"~",49
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",50
|
spstr strCommand.txt,tTmp.txt,"~",50
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1590,6 +1645,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",55
|
spstr strCommand.txt,bEntity6.txt,"~",55
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",56
|
spstr strCommand.txt,tTmp.txt,"~",56
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1675,10 +1741,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ popupFan
|
|||||||
27 Component(s)
|
27 Component(s)
|
||||||
355 Line(s) of event code
|
355 Line(s) of event code
|
||||||
206 Unique line(s) of event code
|
206 Unique line(s) of event code
|
||||||
|
pageStartup
|
||||||
|
20 Component(s)
|
||||||
|
198 Line(s) of event code
|
||||||
|
137 Unique line(s) of event code
|
||||||
popupShutter
|
popupShutter
|
||||||
25 Component(s)
|
25 Component(s)
|
||||||
402 Line(s) of event code
|
402 Line(s) of event code
|
||||||
@@ -32,12 +36,8 @@ popupNotify
|
|||||||
172 Unique line(s) of event code
|
172 Unique line(s) of event code
|
||||||
cardGrid
|
cardGrid
|
||||||
44 Component(s)
|
44 Component(s)
|
||||||
529 Line(s) of event code
|
579 Line(s) of event code
|
||||||
298 Unique line(s) of event code
|
330 Unique line(s) of event code
|
||||||
pageStartup
|
|
||||||
20 Component(s)
|
|
||||||
198 Line(s) of event code
|
|
||||||
137 Unique line(s) of event code
|
|
||||||
cardQR
|
cardQR
|
||||||
34 Component(s)
|
34 Component(s)
|
||||||
410 Line(s) of event code
|
410 Line(s) of event code
|
||||||
@@ -64,12 +64,12 @@ cardThermo
|
|||||||
319 Unique line(s) of event code
|
319 Unique line(s) of event code
|
||||||
cardGrid2
|
cardGrid2
|
||||||
52 Component(s)
|
52 Component(s)
|
||||||
617 Line(s) of event code
|
689 Line(s) of event code
|
||||||
338 Unique line(s) of event code
|
382 Unique line(s) of event code
|
||||||
cardMedia
|
cardMedia
|
||||||
59 Component(s)
|
59 Component(s)
|
||||||
649 Line(s) of event code
|
699 Line(s) of event code
|
||||||
322 Unique line(s) of event code
|
354 Unique line(s) of event code
|
||||||
popupInSel
|
popupInSel
|
||||||
34 Component(s)
|
34 Component(s)
|
||||||
621 Line(s) of event code
|
621 Line(s) of event code
|
||||||
@@ -98,5 +98,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
23 Page(s)
|
23 Page(s)
|
||||||
878 Component(s)
|
878 Component(s)
|
||||||
10404 Line(s) of event code
|
10576 Line(s) of event code
|
||||||
2417 Unique line(s) of event code
|
2459 Unique line(s) of event code
|
||||||
|
|||||||
@@ -396,7 +396,7 @@ Text tVersion
|
|||||||
Horizontal Alignment: center
|
Horizontal Alignment: center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : 52
|
Text : 53
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
|
|||||||
@@ -719,6 +719,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -740,6 +751,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -761,6 +783,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -782,6 +815,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -803,6 +847,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -824,6 +879,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -910,10 +976,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -853,6 +853,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",16
|
spstr strCommand.txt,bEntity1.txt,"~",16
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",17
|
spstr strCommand.txt,tTmp.txt,"~",17
|
||||||
@@ -874,6 +885,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",22
|
spstr strCommand.txt,bEntity2.txt,"~",22
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",23
|
spstr strCommand.txt,tTmp.txt,"~",23
|
||||||
@@ -895,6 +917,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",28
|
spstr strCommand.txt,bEntity3.txt,"~",28
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",29
|
spstr strCommand.txt,tTmp.txt,"~",29
|
||||||
@@ -916,6 +949,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",34
|
spstr strCommand.txt,bEntity4.txt,"~",34
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",35
|
spstr strCommand.txt,tTmp.txt,"~",35
|
||||||
@@ -937,6 +981,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",40
|
spstr strCommand.txt,bEntity5.txt,"~",40
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",41
|
spstr strCommand.txt,tTmp.txt,"~",41
|
||||||
@@ -958,6 +1013,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",46
|
spstr strCommand.txt,bEntity6.txt,"~",46
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",47
|
spstr strCommand.txt,tTmp.txt,"~",47
|
||||||
@@ -979,6 +1045,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity7.txt,"~",52
|
spstr strCommand.txt,bEntity7.txt,"~",52
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity7.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity7.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity7.font=sys1
|
||||||
|
substr bEntity7.txt,bEntity7.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity7,1
|
vis bEntity7,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",53
|
spstr strCommand.txt,tTmp.txt,"~",53
|
||||||
@@ -1000,6 +1077,17 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity8.txt,"~",58
|
spstr strCommand.txt,bEntity8.txt,"~",58
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity8.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity8.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity8.font=sys1
|
||||||
|
substr bEntity8.txt,bEntity8.txt,0,sys0-2
|
||||||
|
}
|
||||||
vis bEntity8,1
|
vis bEntity8,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",59
|
spstr strCommand.txt,tTmp.txt,"~",59
|
||||||
|
|||||||
@@ -997,6 +997,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity1.txt,"~",25
|
spstr strCommand.txt,bEntity1.txt,"~",25
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity1.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity1.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity1.font=sys1
|
||||||
|
substr bEntity1.txt,bEntity1.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
spstr strCommand.txt,tTmp.txt,"~",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1018,6 +1029,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity2.txt,"~",31
|
spstr strCommand.txt,bEntity2.txt,"~",31
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity2.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity2.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity2.font=sys1
|
||||||
|
substr bEntity2.txt,bEntity2.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",32
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1039,6 +1061,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity3.txt,"~",37
|
spstr strCommand.txt,bEntity3.txt,"~",37
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity3.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity3.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity3.font=sys1
|
||||||
|
substr bEntity3.txt,bEntity3.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",38
|
spstr strCommand.txt,tTmp.txt,"~",38
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1060,6 +1093,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity4.txt,"~",43
|
spstr strCommand.txt,bEntity4.txt,"~",43
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity4.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity4.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity4.font=sys1
|
||||||
|
substr bEntity4.txt,bEntity4.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",44
|
spstr strCommand.txt,tTmp.txt,"~",44
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1081,6 +1125,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity5.txt,"~",49
|
spstr strCommand.txt,bEntity5.txt,"~",49
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity5.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity5.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity5.font=sys1
|
||||||
|
substr bEntity5.txt,bEntity5.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",50
|
spstr strCommand.txt,tTmp.txt,"~",50
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1102,6 +1157,17 @@ Timer tmSerial
|
|||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,bEntity6.txt,"~",55
|
spstr strCommand.txt,bEntity6.txt,"~",55
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
|
// way to get force font adjustment
|
||||||
|
strlen bEntity6.txt,sys0
|
||||||
|
//check 2nd last char for ¬
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-2,1
|
||||||
|
if(tTmp.txt=="¬")
|
||||||
|
{
|
||||||
|
substr bEntity6.txt,tTmp.txt,sys0-1,1
|
||||||
|
covx tTmp.txt,sys1,0,0
|
||||||
|
bEntity6.font=sys1
|
||||||
|
substr bEntity6.txt,bEntity6.txt,0,sys0-2
|
||||||
|
}
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,"~",56
|
spstr strCommand.txt,tTmp.txt,"~",56
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
@@ -1187,10 +1253,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ Text tVersion
|
|||||||
Dragging : 0
|
Dragging : 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard: none
|
Associated Keyboard: none
|
||||||
Text : 52
|
Text : 53
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
|
|||||||
BIN
HMI/nspanel.HMI
BIN
HMI/nspanel.HMI
Binary file not shown.
BIN
HMI/nspanel.tft
BIN
HMI/nspanel.tft
Binary file not shown.
@@ -24,6 +24,7 @@ class Entity(object):
|
|||||||
self.assumedState = entity_input_config.get("assumed_state", False)
|
self.assumedState = entity_input_config.get("assumed_state", False)
|
||||||
self.stype = entity_input_config.get("type")
|
self.stype = entity_input_config.get("type")
|
||||||
self.value = entity_input_config.get("value")
|
self.value = entity_input_config.get("value")
|
||||||
|
self.font = entity_input_config.get("font")
|
||||||
self.data = entity_input_config.get("data", {})
|
self.data = entity_input_config.get("data", {})
|
||||||
self.entity_input_config = entity_input_config
|
self.entity_input_config = entity_input_config
|
||||||
|
|
||||||
|
|||||||
@@ -173,8 +173,8 @@ class LuiController(object):
|
|||||||
self._pages_gen.render_card(self._current_card, send_page_type=False)
|
self._pages_gen.render_card(self._current_card, send_page_type=False)
|
||||||
# send detail page update, just in case
|
# send detail page update, just in case
|
||||||
if self._current_card.cardType in ["cardGrid", "cardGrid2", "cardEntities", "cardMedia"]:
|
if self._current_card.cardType in ["cardGrid", "cardGrid2", "cardEntities", "cardMedia"]:
|
||||||
#if entity.startswith("light"):
|
if entity.startswith("light"):
|
||||||
# self._pages_gen.generate_light_detail_page(res_uuid)
|
self._pages_gen.generate_light_detail_page(res_uuid)
|
||||||
if entity.startswith("cover"):
|
if entity.startswith("cover"):
|
||||||
self._pages_gen.generate_shutter_detail_page(entity)
|
self._pages_gen.generate_shutter_detail_page(entity)
|
||||||
if entity.startswith("fan"):
|
if entity.startswith("fan"):
|
||||||
|
|||||||
@@ -299,7 +299,7 @@ class LuiPagesGen(object):
|
|||||||
value = entity.state
|
value = entity.state
|
||||||
|
|
||||||
# limit value to 4 chars on us-p
|
# limit value to 4 chars on us-p
|
||||||
if self._config.get("model") == "us-p":
|
if self._config.get("model") == "us-p" and cardType == "cardEntities":
|
||||||
value = entity.state[:4]
|
value = entity.state[:4]
|
||||||
if value[-1] == ".":
|
if value[-1] == ".":
|
||||||
value = value[:-1]
|
value = value[:-1]
|
||||||
@@ -405,6 +405,20 @@ class LuiPagesGen(object):
|
|||||||
entityTypePanel = ""
|
entityTypePanel = ""
|
||||||
if "entityId" in mask:
|
if "entityId" in mask:
|
||||||
entityId = ""
|
entityId = ""
|
||||||
|
# change font on cardgrid
|
||||||
|
if item.font:
|
||||||
|
font = 0
|
||||||
|
if item.font == "small":
|
||||||
|
font = 0
|
||||||
|
elif item.font == "medium-icon":
|
||||||
|
font = 1
|
||||||
|
elif item.font == "medium":
|
||||||
|
font = 2
|
||||||
|
elif item.font == "large":
|
||||||
|
font = 3
|
||||||
|
elif isinstance(item.font, int):
|
||||||
|
font = item.font
|
||||||
|
icon_id += f'{icon_id}¬{font}'
|
||||||
return f"~{entityTypePanel}~{entityId}~{icon_id}~{color}~{name}~{value}"
|
return f"~{entityTypePanel}~{entityId}~{icon_id}~{color}~{name}~{value}"
|
||||||
|
|
||||||
def generate_entities_page(self, navigation, heading, items, cardType, tempUnit):
|
def generate_entities_page(self, navigation, heading, items, cardType, tempUnit):
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ key | optional | type | default | description
|
|||||||
`status` | True | string | `None` | Only valid for navigate and service items, adds a entity to track state for the icon
|
`status` | True | string | `None` | Only valid for navigate and service items, adds a entity to track state for the icon
|
||||||
`assumed_state` | True | string | `None` | Only for cover items, up, down and stop buttons are always shown
|
`assumed_state` | True | string | `None` | Only for cover items, up, down and stop buttons are always shown
|
||||||
`action_name` | True | string | `None` | Only valid for script; Button label
|
`action_name` | True | string | `None` | Only valid for script; Button label
|
||||||
|
`font` | True | string | `None` | Used to change the font for cardGrid Icons; valid values are (`small`, `medium-icon` and `medium`). Currently only supported for homeassistant entities and not for internal ones.
|
||||||
`effectList` | True | string | `None` | Only valid for light; for example `[Android, Aurora` (fav list for effects)
|
`effectList` | True | string | `None` | Only valid for light; for example `[Android, Aurora` (fav list for effects)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
TypeScript v4.1.4.4 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom
|
TypeScript v4.2.1.5 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
|
||||||
- abgestimmt auf TFT 51 / v4.1.4 / BerryDriver 8 / Tasmota 13.0.0
|
- abgestimmt auf TFT 52 / v4.2.1 / BerryDriver 8 / Tasmota 13.1.0
|
||||||
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
|
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
|
||||||
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
|
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
|
||||||
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
|
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
|
||||||
@@ -8,17 +8,17 @@ ioBroker-Unterstützung: https://forum.iobroker.net/topic/50888/sonoff-nspanel
|
|||||||
WIKI zu diesem Projekt unter: https://github.com/joBr99/nspanel-lovelace-ui/wiki (siehe Sidebar)
|
WIKI zu diesem Projekt unter: https://github.com/joBr99/nspanel-lovelace-ui/wiki (siehe Sidebar)
|
||||||
Icons unter: https://htmlpreview.github.io/?https://github.com/jobr99/Generate-HASP-Fonts/blob/master/cheatsheet.html
|
Icons unter: https://htmlpreview.github.io/?https://github.com/jobr99/Generate-HASP-Fonts/blob/master/cheatsheet.html
|
||||||
|
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
Achtung Änderung des Sonoff ESP-Temperatursensors
|
Achtung Änderung des Sonoff ESP-Temperatursensors
|
||||||
!!! Bitte "SetOption146 1" in der Tasmota-Console ausführen !!!
|
!!! Bitte "SetOption146 1" in der Tasmota-Console ausführen !!!
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
In bestimmten Situationen kommt es vor, dass sich das Panel mit FlashNextion
|
In bestimmten Situationen kommt es vor, dass sich das Panel mit FlashNextion
|
||||||
unter Tasmota > 12.2.0 nicht flashen lässt. Für den Fall ein Tasmota Dowengrade
|
unter Tasmota > 12.2.0 nicht flashen lässt. Für den Fall ein Tasmota Dowengrade
|
||||||
durchführen und FlashNextion wiederholen.
|
durchführen und FlashNextion wiederholen.
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
Ab Tasmota > 13.0.0 ist für ein Upgrade ggfs. eine Umpartitionierung erforderlich
|
Ab Tasmota > 13.0.0 ist für ein Upgrade ggfs. eine Umpartitionierung erforderlich
|
||||||
https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Tasmota-FAQ#3-tasmota-update-probleme
|
https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Tasmota-FAQ#3-tasmota-update-probleme
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
|
|
||||||
ReleaseNotes:
|
ReleaseNotes:
|
||||||
Bugfixes und Erweiterungen:
|
Bugfixes und Erweiterungen:
|
||||||
@@ -149,6 +149,22 @@ ReleaseNotes:
|
|||||||
- 12.08.2023 - v4.1.4.2 Add onStop function() to Schedules
|
- 12.08.2023 - v4.1.4.2 Add onStop function() to Schedules
|
||||||
- 13.08.2023 - v4.1.4.3 Add InSel to popUpLight
|
- 13.08.2023 - v4.1.4.3 Add InSel to popUpLight
|
||||||
- 13.08.2023 - v4.1.4.4 Add Parameter inSel_ChoiceState to InSel to show/hide Focus
|
- 13.08.2023 - v4.1.4.4 Add Parameter inSel_ChoiceState to InSel to show/hide Focus
|
||||||
|
- 21.08.2023 - v4.2.0 Upgrade TFT 52 / 4.2.0
|
||||||
|
- 21.08.2023 - v4.2.0 Add new alias state for iconcolor and buttontext for icon for subpages
|
||||||
|
- 22.08.2023 - v4.2.0.1 Add iconArray to Alias "Klimaanlage" (airCondition)
|
||||||
|
- 23.08.2023 - v4.2.0.2 Add CardGrid2 with maxItems = 8
|
||||||
|
- 23.08.2023 - v4.2.1 Upgrade TFT 52 / 4.2.1
|
||||||
|
- 23.08.2023 - v4.2.1.1 Add WINDOWOPEN to cardThermo (Thermostat)
|
||||||
|
- 25.08.2023 - v4.2.1.2 Add Parameter fontSize for v4.3.0
|
||||||
|
- 27.08.2023 - v4.2.1.3 Add MQTT-Port-Check (use with exec) --> function CheckMQTTPorts()
|
||||||
|
- 27.08.2023 - v4.2.1.3 Add MQTT-Port-Check for ServiceMenu
|
||||||
|
- 01.09.2023 - v4.2.1.4 Fix iconId2 in Alias door/window
|
||||||
|
- 02.09.2023 - v4.2.1.4 Add dynamically USERICON to Alias info
|
||||||
|
- 04.09.2023 - v4.2.1.5 Fix Debug with 0_userdata.0...
|
||||||
|
- 04.09.2023 - v4.2.1.5 Add minValue/maxValue to Blinds
|
||||||
|
|
||||||
|
Next Release with TFT DEV (always implemented)
|
||||||
|
- 25.08.2023 - v4.3.0 Add Parameter fontSize (0-4) to cardGrid (with useValue)
|
||||||
|
|
||||||
|
|
||||||
***********************************************************************************************************
|
***********************************************************************************************************
|
||||||
@@ -167,6 +183,7 @@ Mögliche Seiten-Ansichten:
|
|||||||
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
||||||
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
||||||
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
||||||
|
cardGrid2 Page - 8 horizontal angeordnete Steuerelemente in 2 Reihen a 4 Steuerelemente - auch als Subpage
|
||||||
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
||||||
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
||||||
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
||||||
@@ -239,7 +256,7 @@ Erforderliche Adapter:
|
|||||||
|
|
||||||
Upgrades in Konsole:
|
Upgrades in Konsole:
|
||||||
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
|
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
|
||||||
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.1.4.tft
|
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.2.1.tft
|
||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -247,7 +264,7 @@ let Icons = new IconsSelector();
|
|||||||
let timeoutSlider: any;
|
let timeoutSlider: any;
|
||||||
let vwIconColor = [];
|
let vwIconColor = [];
|
||||||
let weatherForecast: boolean;
|
let weatherForecast: boolean;
|
||||||
let Debug: boolean = false;
|
let Debug: boolean;
|
||||||
|
|
||||||
// Ab hier Anpassungen vornehmen
|
// Ab hier Anpassungen vornehmen
|
||||||
|
|
||||||
@@ -478,7 +495,7 @@ let Subpages_1 = <PageEntities>
|
|||||||
'heading': 'Test Subpages',
|
'heading': 'Test Subpages',
|
||||||
'useColor': true,
|
'useColor': true,
|
||||||
'items': [
|
'items': [
|
||||||
<PageItem>{ navigate: true, id: null, targetPage: 'Abfall', onColor: White, name: 'Abfallkalender'},
|
<PageItem>{ navigate: true, id: 'alias.0.NSPanel_1.Abfall.event1', targetPage: 'Abfall', name: 'Abfallkalender'},
|
||||||
<PageItem>{ navigate: true, id: null, targetPage: 'WLAN', onColor: White, name: 'Gäste WLAN'},
|
<PageItem>{ navigate: true, id: null, targetPage: 'WLAN', onColor: White, name: 'Gäste WLAN'},
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
@@ -510,9 +527,9 @@ let Subpages_1 = <PageEntities>
|
|||||||
'items': [<PageItem>{ id: 'alias.0.NSPanel_1.Guest_Wifi', hidePassword: false }]
|
'items': [<PageItem>{ id: 'alias.0.NSPanel_1.Guest_Wifi', hidePassword: false }]
|
||||||
};
|
};
|
||||||
|
|
||||||
let Buero_Seite_2 = <PageGrid>
|
let Buero_Seite_2 = <PageGrid2>
|
||||||
{
|
{
|
||||||
'type': 'cardGrid',
|
'type': 'cardGrid2',
|
||||||
'heading': 'Büro 2',
|
'heading': 'Büro 2',
|
||||||
'useColor': true,
|
'useColor': true,
|
||||||
'items': [
|
'items': [
|
||||||
@@ -522,7 +539,7 @@ let Buero_Seite_2 = <PageGrid>
|
|||||||
<PageItem>{ id: 'alias.0.NSPanel_1.Luftreiniger', icon: 'power', offColor: MSRed, onColor: MSGreen},
|
<PageItem>{ id: 'alias.0.NSPanel_1.Luftreiniger', icon: 'power', offColor: MSRed, onColor: MSGreen},
|
||||||
<PageItem>{ id: 'alias.0.NSPanel_1.TestBlind', icon: 'projector-screen', onColor: White, name: 'Beamer', secondRow: 'auch Text'},
|
<PageItem>{ id: 'alias.0.NSPanel_1.TestBlind', icon: 'projector-screen', onColor: White, name: 'Beamer', secondRow: 'auch Text'},
|
||||||
<PageItem>{ id: 'alias.0.NSPanel_1.Kippfenster', useValue: true },
|
<PageItem>{ id: 'alias.0.NSPanel_1.Kippfenster', useValue: true },
|
||||||
//PageItem>{ id: 'alias.0.NSPanel_1.Radio.Bob', icon: 'play', onColor: White, name: 'TuneIn'}
|
<PageItem>{ id: 'alias.0.NSPanel_1.Radio.Bob', icon: 'play', onColor: White, name: 'TuneIn'}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -683,6 +700,7 @@ let Buero_Klimaanlage = <PageThermo>
|
|||||||
minValue: 50,
|
minValue: 50,
|
||||||
maxValue: 250,
|
maxValue: 250,
|
||||||
stepValue: 5,
|
stepValue: 5,
|
||||||
|
iconArray: ['power-standby','air-conditioner','snowflake','fire','alpha-e-circle-outline','fan','water-percent','swap-vertical-bold'],
|
||||||
popupThermoMode1: ['Auto','0','1','2','3'],
|
popupThermoMode1: ['Auto','0','1','2','3'],
|
||||||
popupThermoMode2: ['Auto','0','1','2','3','4','5'],
|
popupThermoMode2: ['Auto','0','1','2','3','4','5'],
|
||||||
popupThermoMode3: ['Auto','Manual','Boost',],
|
popupThermoMode3: ['Auto','Manual','Boost',],
|
||||||
@@ -693,6 +711,21 @@ let Buero_Klimaanlage = <PageThermo>
|
|||||||
}]
|
}]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let Pool_Waermepumpe = <PageThermo>
|
||||||
|
{
|
||||||
|
'type': 'cardThermo',
|
||||||
|
'heading': 'Pool Wärmepumpe',
|
||||||
|
'useColor': true,
|
||||||
|
'items': [<PageItem>{
|
||||||
|
id: 'alias.0.NSPanel_1.Pool_Waermepumpe',
|
||||||
|
minValue: 100,
|
||||||
|
maxValue: 300,
|
||||||
|
stepValue: 5,
|
||||||
|
iconArray: ['power-standby','alpha-a-circle-outline','snowflake','fire'],
|
||||||
|
//iconArray: ['power-standby','air-conditioner','snowflake','fire','alpha-e-circle-outline','fan','water-percent','swap-vertical-bold'],
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
|
||||||
let Buero_Alarm = <PageAlarm>
|
let Buero_Alarm = <PageAlarm>
|
||||||
{
|
{
|
||||||
'type': 'cardAlarm',
|
'type': 'cardAlarm',
|
||||||
@@ -996,7 +1029,8 @@ let NSPanel_Service = <PageEntities>
|
|||||||
'parent': NSPanel_Einstellungen,
|
'parent': NSPanel_Einstellungen,
|
||||||
'home': 'NSPanel_Service',
|
'home': 'NSPanel_Service',
|
||||||
'items': [
|
'items': [
|
||||||
<PageItem>{ id: AliasPath + 'Config.ScripgtDebugStatus', name: 'Debugmodus (aus/an)' ,icon: 'code-tags-check', offColor: HMIOff, onColor: HMIOn},
|
<PageItem>{ id: AliasPath + 'Config.ScripgtDebugStatus', name: 'Debugmode (aus/an)' ,icon: 'code-tags-check', offColor: HMIOff, onColor: HMIOn},
|
||||||
|
<PageItem>{ id: AliasPath + 'Config.MQTT.portCheck', name: 'Port-Check (aus/an)' ,icon: 'check-network', offColor: HMIOff, onColor: HMIOn},
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1340,8 +1374,8 @@ export const config = <Config> {
|
|||||||
const request = require('request');
|
const request = require('request');
|
||||||
|
|
||||||
//Desired Firmware
|
//Desired Firmware
|
||||||
const tft_version: string = 'v4.1.4';
|
const tft_version: string = 'v4.2.1';
|
||||||
const desired_display_firmware_version = 51;
|
const desired_display_firmware_version = 52;
|
||||||
const berry_driver_version = 8;
|
const berry_driver_version = 8;
|
||||||
const tasmotaOtaUrl: string = 'http://ota.tasmota.com/tasmota32/release/';
|
const tasmotaOtaUrl: string = 'http://ota.tasmota.com/tasmota32/release/';
|
||||||
|
|
||||||
@@ -1365,9 +1399,81 @@ onStop (function scriptStop () {
|
|||||||
if (scheduleInitDimModeNight!=null) clearSchedule(scheduleInitDimModeNight);
|
if (scheduleInitDimModeNight!=null) clearSchedule(scheduleInitDimModeNight);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|
||||||
|
async function CheckDebugMode() {
|
||||||
|
try {
|
||||||
|
|
||||||
|
await createStateAsync(NSPanel_Path + 'Config.ScripgtDebugStatus', false, { type: 'boolean' });
|
||||||
|
setObject(AliasPath + 'Config.ScripgtDebugStatus', {type: 'channel', common: {role: 'socket', name:'ScripgtDebugStatus'}, native: {}});
|
||||||
|
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.ACTUAL', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'ACTUAL' });
|
||||||
|
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.SET', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'SET' });
|
||||||
|
|
||||||
|
if(getState(NSPanel_Path + 'Config.ScripgtDebugStatus').val){
|
||||||
|
Debug = true;
|
||||||
|
console.log('Debugmodus aktiviert');
|
||||||
|
}else{
|
||||||
|
Debug = false;
|
||||||
|
console.log('Debugmodus deaktiviert')
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('error at function CheckDebugModus: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CheckDebugMode();
|
||||||
|
|
||||||
|
async function CheckMQTTPorts() {
|
||||||
|
try {
|
||||||
|
let instanceName: string = config.panelRecvTopic.substring(0,6);
|
||||||
|
|
||||||
|
await createStateAsync(NSPanel_Path + 'Config.MQTT.portCheck', true, { type: 'boolean' });
|
||||||
|
setObject(AliasPath + 'Config.MQTT.portCheck', {type: 'channel', common: {role: 'socket', name:'mqttPortCheck'}, native: {}});
|
||||||
|
await createAliasAsync(AliasPath + 'Config.MQTT.portCheck.ACTUAL', NSPanel_Path + 'Config.MQTT.portCheck', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'ACTUAL' });
|
||||||
|
await createAliasAsync(AliasPath + 'Config.MQTT.portCheck.SET', NSPanel_Path + 'Config.MQTT.portCheck', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'SET' });
|
||||||
|
|
||||||
|
if (getState(NSPanel_Path + 'Config.MQTT.portCheck').val) {
|
||||||
|
let adapterArray: any = [];
|
||||||
|
let portArray: any = [];
|
||||||
|
exec('iob l i --port --enabled', async (error, result, stderr) => {
|
||||||
|
if (error == null){
|
||||||
|
if (result != undefined) {
|
||||||
|
console.log('Start MQTT-Port-Check -------------------------------------');
|
||||||
|
let resultString1 = result.split('+');
|
||||||
|
for (let i: number = 1; i < resultString1.length -1; i++) {
|
||||||
|
let resultString2: any = resultString1[i].split(':')
|
||||||
|
let adapterInstanceName: string = resultString2[0].substring(16);
|
||||||
|
let adapterInstancePort: string = resultString2[3].substring(1,5);
|
||||||
|
console.log('-- '+ adapterInstanceName + ' - ' + adapterInstancePort);
|
||||||
|
adapterArray[i] = adapterInstanceName.trim();
|
||||||
|
portArray[i] = adapterInstancePort.trim();
|
||||||
|
}
|
||||||
|
let mqttInstance = adapterArray.indexOf(instanceName);
|
||||||
|
for (let j: number = 1; j < portArray.length; j++) {
|
||||||
|
if (portArray[j] == portArray[mqttInstance] && adapterArray[j] == adapterArray[mqttInstance]) {
|
||||||
|
console.log('- MQTT-Port-Check OK: Instance of Adapter: ' + adapterArray[j] + ' is running on Port:' + portArray[j]);
|
||||||
|
} else if (portArray[j] == portArray[mqttInstance] && adapterArray[j] != adapterArray[mqttInstance]) {
|
||||||
|
console.warn('Instance of Adapter: ' + adapterArray[j] + ' is running on same Port:' + portArray[j] + ' as ' + adapterArray[mqttInstance]);
|
||||||
|
console.warn('Please Change Port of Instance: ' + adapterArray[j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log('End MQTT-Port-Check ---------------------------------------');
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (error.toString().substring(0,21) == 'exec is not available') {
|
||||||
|
console.warn('MQTT-Portcheck not possible - exec is not available. Please enable exec option in JS-Adapter instance settings');
|
||||||
|
console.warn('MQTT-Portcheck nicht möglich - exec ist nicht verfügbar. Bitte Haken bei -- Kommando Exec erlauben -- in JS-Adapter-Instanz setzen');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('error at function CheckMQTTPorts: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CheckMQTTPorts();
|
||||||
|
|
||||||
async function Init_Release() {
|
async function Init_Release() {
|
||||||
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53]
|
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53]
|
||||||
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.0','4.3.0']
|
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.1','4.3.0']
|
||||||
try {
|
try {
|
||||||
if (existsObject(NSPanel_Path + 'Display_Firmware.desiredVersion') == false) {
|
if (existsObject(NSPanel_Path + 'Display_Firmware.desiredVersion') == false) {
|
||||||
await createStateAsync(NSPanel_Path + 'Display_Firmware.desiredVersion', desired_display_firmware_version, { type: 'number' });
|
await createStateAsync(NSPanel_Path + 'Display_Firmware.desiredVersion', desired_display_firmware_version, { type: 'number' });
|
||||||
@@ -1463,13 +1569,6 @@ async function InitConfigParameters() {
|
|||||||
setObject(AliasPath + 'Config.temperatureUnitNumber', {type: 'channel', common: {role: 'buttonSensor', name:'temperatureUnitNumber'}, native: {}});
|
setObject(AliasPath + 'Config.temperatureUnitNumber', {type: 'channel', common: {role: 'buttonSensor', name:'temperatureUnitNumber'}, native: {}});
|
||||||
await createAliasAsync(AliasPath + 'Config.temperatureUnitNumber.VALUE', NSPanel_Path + 'Config.temperatureUnitNumber', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'VALUE' });
|
await createAliasAsync(AliasPath + 'Config.temperatureUnitNumber.VALUE', NSPanel_Path + 'Config.temperatureUnitNumber', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'VALUE' });
|
||||||
}
|
}
|
||||||
// Script Debug - Medlungen socket
|
|
||||||
if (existsObject(NSPanel_Path + 'Config.ScripgtDebugStatus') == false) {
|
|
||||||
await createStateAsync(NSPanel_Path + 'Config.ScripgtDebugStatus', false, { type: 'boolean' });
|
|
||||||
setObject(AliasPath + 'Config.ScripgtDebugStatus', {type: 'channel', common: {role: 'socket', name:'ScripgtDebugStatus'}, native: {}});
|
|
||||||
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.ACTUAL', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'ACTUAL' });
|
|
||||||
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.SET', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'SET' });
|
|
||||||
}
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('error at function InitConfigParameters: ' + err.message);
|
console.warn('error at function InitConfigParameters: ' + err.message);
|
||||||
}
|
}
|
||||||
@@ -1478,6 +1577,7 @@ InitConfigParameters();
|
|||||||
|
|
||||||
on({id: [].concat(NSPanel_Path + 'Config.ScripgtDebugStatus'), change: "ne"}, async function (obj) {
|
on({id: [].concat(NSPanel_Path + 'Config.ScripgtDebugStatus'), change: "ne"}, async function (obj) {
|
||||||
try {
|
try {
|
||||||
|
obj.state.val ? console.log('Debugmodus aktiviert') : console.log('Debugmodus deaktiviert');
|
||||||
Debug = obj.state.val
|
Debug = obj.state.val
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('error at Trigger ScripgtDebugStatus: ' + err.message);
|
console.warn('error at Trigger ScripgtDebugStatus: ' + err.message);
|
||||||
@@ -3064,6 +3164,9 @@ function GeneratePage(page: Page): void {
|
|||||||
case 'cardGrid':
|
case 'cardGrid':
|
||||||
SendToPanel(GenerateGridPage(<PageGrid>page));
|
SendToPanel(GenerateGridPage(<PageGrid>page));
|
||||||
break;
|
break;
|
||||||
|
case 'cardGrid2':
|
||||||
|
SendToPanel(GenerateGridPage2(<PageGrid2>page));
|
||||||
|
break;
|
||||||
case 'cardMedia':
|
case 'cardMedia':
|
||||||
useMediaEvents = true;
|
useMediaEvents = true;
|
||||||
SendToPanel(GenerateMediaPage(<PageMedia>page));
|
SendToPanel(GenerateMediaPage(<PageMedia>page));
|
||||||
@@ -3194,6 +3297,16 @@ function GenerateGridPage(page: PageGrid): Payload[] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function GenerateGridPage2(page: PageGrid2): Payload[] {
|
||||||
|
try {
|
||||||
|
let out_msgs: Array<Payload> = [{ payload: 'pageType~cardGrid2' }];
|
||||||
|
out_msgs.push({ payload: GeneratePageElements(page) });
|
||||||
|
return out_msgs;
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('error at function GenerateGridPage2: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function GeneratePageElements(page: Page): string {
|
function GeneratePageElements(page: Page): string {
|
||||||
try {
|
try {
|
||||||
activePage = page;
|
activePage = page;
|
||||||
@@ -3228,6 +3341,9 @@ function GeneratePageElements(page: Page): string {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'cardGrid':
|
case 'cardGrid':
|
||||||
|
maxItems = 6;
|
||||||
|
break;
|
||||||
|
case 'cardGrid2':
|
||||||
maxItems = 8;
|
maxItems = 8;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -3255,6 +3371,7 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
}
|
}
|
||||||
|
|
||||||
let name: string;
|
let name: string;
|
||||||
|
let buttonText: string = 'PRESS';
|
||||||
let type: string;
|
let type: string;
|
||||||
|
|
||||||
// ioBroker
|
// ioBroker
|
||||||
@@ -3316,78 +3433,101 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
|
|
||||||
if (pageItem.navigate) {
|
if (pageItem.navigate) {
|
||||||
|
|
||||||
if (pageItem.id == null && pageItem.targetPage != undefined){
|
if (pageItem.id == null && pageItem.targetPage != undefined) {
|
||||||
let buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
||||||
type = 'button';
|
type = 'button';
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity statisch Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText)
|
if (Debug) console.log('CreateEntity statisch Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText)
|
||||||
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText;
|
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText;
|
||||||
} else if (pageItem.id != null && pageItem.targetPage != undefined){
|
|
||||||
let buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
} else if (pageItem.id != null && pageItem.targetPage != undefined) {
|
||||||
|
|
||||||
type = 'button';
|
type = 'button';
|
||||||
|
|
||||||
switch (o.common.role) {
|
switch (o.common.role) {
|
||||||
case 'socket':
|
case 'socket':
|
||||||
case 'light':
|
case 'light':
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'socket' ? Icons.GetIcon('power-socket-de') : Icons.GetIcon('lightbulb');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'socket' ? Icons.GetIcon('power-socket-de') : Icons.GetIcon('lightbulb');
|
||||||
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : o.common.role == 'socket' ? Icons.GetIcon('power-socket-de') : Icons.GetIcon('lightbulb');
|
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : iconId;
|
||||||
optVal = '0';
|
|
||||||
|
|
||||||
if (val === true || val === 'true') {
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
optVal = '1';
|
if (existsState(pageItem.id + '.COLORDEC')) {
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = getState(pageItem.id + '.COLORDEC').val;
|
||||||
} else {
|
} else {
|
||||||
|
if (val === true || val === 'true') {
|
||||||
iconColor = GetIconColor(pageItem, false, useColors);
|
iconColor = GetIconColor(pageItem, false, useColors);
|
||||||
if (pageItem.icon !== undefined) {
|
} else {
|
||||||
if (pageItem.icon2 !== undefined) {
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
iconId = iconId2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (val === true || val === 'true') { iconId = iconId2 };
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'blind':
|
case 'blind':
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('window-open');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('window-open');
|
||||||
iconColor = GetIconColor(pageItem, existsState(pageItem.id + '.ACTUAL') ? getState(pageItem.id + '.ACTUAL').val : true, useColors);
|
iconColor = existsState(pageItem.id + '.COLORDEC') ? getState(pageItem.id + '.COLORDEC').val : GetIconColor(pageItem, existsState(pageItem.id + '.ACTUAL') ? getState(pageItem.id + '.ACTUAL').val : true, useColors);
|
||||||
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'door':
|
case 'door':
|
||||||
case 'window':
|
case 'window':
|
||||||
if (existsState(pageItem.id + '.ACTUAL')) {
|
|
||||||
if (getState(pageItem.id + '.ACTUAL').val) {
|
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-open') : Icons.GetIcon('window-open-variant');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-open') : Icons.GetIcon('window-open-variant');
|
||||||
|
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
||||||
|
|
||||||
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
|
if (existsState(pageItem.id + '.COLORDEC')) {
|
||||||
|
iconColor = getState(pageItem.id + '.COLORDEC').val;
|
||||||
|
} else {
|
||||||
|
if (val === true || val === 'true') {
|
||||||
iconColor = GetIconColor(pageItem, false, useColors);
|
iconColor = GetIconColor(pageItem, false, useColors);
|
||||||
} else {
|
} else {
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (val === true || val === 'true') { iconId = iconId2 };
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'info':
|
case 'info':
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : Icons.GetIcon('gesture-tap-button');
|
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : iconId;
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
|
||||||
if (val === true || val === 'true') {
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
if (existsState(pageItem.id + '.COLORDEC')) {
|
||||||
|
iconColor = getState(pageItem.id + '.COLORDEC').val;
|
||||||
} else {
|
} else {
|
||||||
|
if (val === true || val === 'true') {
|
||||||
iconColor = GetIconColor(pageItem, false, useColors);
|
iconColor = GetIconColor(pageItem, false, useColors);
|
||||||
if (pageItem.icon !== undefined) {
|
} else {
|
||||||
if (pageItem.icon2 !== undefined) {
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
iconId = iconId2;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
if (val === true || val === 'true') { iconId = iconId2 };
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'warning':
|
||||||
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
|
iconColor = pageItem.onColor !== undefined ? GetIconColor(pageItem, true, useColors) : getState(pageItem.id + '.LEVEL').val;
|
||||||
|
name = pageItem.name !== undefined ? pageItem.name : getState(pageItem.id + '.INFO').val;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return '~delete~~~~~';
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
|
iconColor = pageItem.onColor !== undefined ? GetIconColor(pageItem, true, useColors) : existsState(pageItem.id + '.COLORDEC') ? getState(pageItem.id + '.COLORDEC').val : 65535;
|
||||||
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
|
break;
|
||||||
|
// return '~delete~~~~~';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity Dynamische Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
if (Debug) console.log('CreateEntity Dynamische Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
||||||
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
type = 'button';
|
type = 'button';
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
let buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity Standard ~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
if (Debug) console.log('CreateEntity Standard ~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
||||||
return '~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
return '~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
||||||
@@ -3590,6 +3730,7 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
windowState = findLocale('window', 'opened');
|
windowState = findLocale('window', 'opened');
|
||||||
} else {
|
} else {
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
||||||
|
iconId = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : iconId;
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
windowState = findLocale('window', 'closed');
|
windowState = findLocale('window', 'closed');
|
||||||
}
|
}
|
||||||
@@ -3629,7 +3770,9 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
|
|
||||||
case 'thermostat':
|
case 'thermostat':
|
||||||
type = 'text';
|
type = 'text';
|
||||||
|
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'value.temperature' || o.common.role == 'thermostat' ? Icons.GetIcon('thermometer') : Icons.GetIcon('information-outline');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'value.temperature' || o.common.role == 'thermostat' ? Icons.GetIcon('thermometer') : Icons.GetIcon('information-outline');
|
||||||
|
|
||||||
let unit = '';
|
let unit = '';
|
||||||
optVal = '0';
|
optVal = '0';
|
||||||
|
|
||||||
@@ -3672,9 +3815,19 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (existsState(pageItem.id + '.USERICON')) {
|
||||||
|
iconId = Icons.GetIcon(getState(pageItem.id + '.USERICON').val);
|
||||||
|
console.log(iconId);
|
||||||
|
RegisterEntityWatcher(pageItem.id + '.USERICON');
|
||||||
|
}
|
||||||
|
|
||||||
if (pageItem.useValue) {
|
if (pageItem.useValue) {
|
||||||
|
if (pageItem.fontSize != undefined) {
|
||||||
|
iconId = optVal + '¬' + pageItem.fontSize;
|
||||||
|
} else {
|
||||||
iconId = optVal;
|
iconId = optVal;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity Icon role info, humidity, temperature, value.temperature, value.humidity, sensor.door, sensor.window, thermostat');
|
if (Debug) console.log('CreateEntity Icon role info, humidity, temperature, value.temperature, value.humidity, sensor.door, sensor.window, thermostat');
|
||||||
if (Debug) console.log('CreateEntity ~' + type + '~' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + optVal+ ' ' + unit);
|
if (Debug) console.log('CreateEntity ~' + type + '~' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + optVal+ ' ' + unit);
|
||||||
@@ -3997,6 +4150,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
//Attribute hinzufügen, wenn im Alias definiert
|
//Attribute hinzufügen, wenn im Alias definiert
|
||||||
let i_list = Array.prototype.slice.apply($('[state.id="' + id + '.*"]'));
|
let i_list = Array.prototype.slice.apply($('[state.id="' + id + '.*"]'));
|
||||||
let bt = ['~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~'];
|
let bt = ['~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~'];
|
||||||
|
|
||||||
|
let tempIcon: string = '';
|
||||||
|
|
||||||
if ((i_list.length - 3) != 0) {
|
if ((i_list.length - 3) != 0) {
|
||||||
|
|
||||||
let i = 0;
|
let i = 0;
|
||||||
@@ -4123,6 +4279,15 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
}
|
}
|
||||||
} else i--;
|
} else i--;
|
||||||
break;
|
break;
|
||||||
|
case 'WINDOWOPEN':
|
||||||
|
if (existsState(id + '.WINDOWOPEN') && getState(id + '.WINDOWOPEN').val != null) {
|
||||||
|
if (getState(id + '.WINDOWOPEN').val) {
|
||||||
|
bt[i - 1] = Icons.GetIcon('window-open-variant') + '~63488~1~' + 'WIN' + '~';
|
||||||
|
} else {
|
||||||
|
bt[i - 1] = Icons.GetIcon('window-closed-variant') + '~2016~1~' + 'WIN' + '~';
|
||||||
|
}
|
||||||
|
} else i--;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
i--;
|
i--;
|
||||||
break;
|
break;
|
||||||
@@ -4150,47 +4315,78 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
if(stateKeyNumber == Mode) {
|
if(stateKeyNumber == Mode) {
|
||||||
statusStr = stateName.replace('_', ' ');
|
statusStr = stateName.replace('_', ' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(stateName) {
|
switch(stateName) {
|
||||||
case 'AUTO':
|
case 'AUTO':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[1] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~1024~1~' + 'AUTO' + '~';
|
tempIcon = page.items[0].iconArray[1];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~35921~0~' + 'AUTO' + '~';
|
tempIcon = 'air-conditioner';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~1024~1~' + 'AUTO' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'AUTO' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'COOL':
|
case 'COOL':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[2] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('snowflake') + '~11487~1~' + 'COOL' + '~';
|
tempIcon = page.items[0].iconArray[2];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('snowflake') + '~35921~0~' + 'COOL' + '~';
|
tempIcon = 'snowflake';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~11487~1~' + 'COOL' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'COOL' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'HEAT':
|
case 'HEAT':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[3] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('fire') + '~64512~1~' + 'HEAT' + '~';
|
tempIcon = page.items[0].iconArray[3];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('fire') + '~35921~0~' + 'HEAT' + '~';
|
tempIcon = 'fire';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~64512~1~' + 'HEAT' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'HEAT' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'ECO':
|
case 'ECO':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[4] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~';
|
tempIcon = page.items[0].iconArray[4];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~';
|
tempIcon = 'alpha-e-circle-outline';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'ECO' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'ECO' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'FAN_ONLY':
|
case 'FAN_ONLY':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[5] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN_ONLY' + '~';
|
tempIcon = page.items[0].iconArray[5];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN_ONLY' + '~';
|
tempIcon = 'fan';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~11487~1~' + 'FAN_ONLY' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'FAN_ONLY' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'DRY':
|
case 'DRY':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[6] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('water-percent') + '~60897~1~' + 'DRY' + '~';
|
tempIcon = page.items[0].iconArray[6];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('water-percent') + '~35921~0~' + 'DRY' + '~';
|
tempIcon = 'water-percent';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~60897~1~' + 'DRY' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'DRY' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -4198,32 +4394,47 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (iconIndex <= 7 && existsState(id + '.ECO') && getState(id + '.ECO').val != null) {
|
if (iconIndex <= 7 && existsState(id + '.ECO') && getState(id + '.ECO').val != null) {
|
||||||
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[4] !== '') {
|
||||||
|
tempIcon = page.items[0].iconArray[4];
|
||||||
|
} else {
|
||||||
|
tempIcon = 'alpha-e-circle-outline';
|
||||||
|
}
|
||||||
if (getState(id + '.ECO').val && getState(id + '.ECO').val == 1) {
|
if (getState(id + '.ECO').val && getState(id + '.ECO').val == 1) {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~';
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'ECO' + '~';
|
||||||
statusStr = 'ECO';
|
statusStr = 'ECO';
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~';
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'ECO' + '~';
|
||||||
}
|
}
|
||||||
iconIndex++;
|
iconIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (iconIndex <= 7 && existsState(id + '.SWING') && getState(id + '.SWING').val != null) {
|
if (iconIndex <= 7 && existsState(id + '.SWING') && getState(id + '.SWING').val != null) {
|
||||||
if (getState(id + '.POWER').val && getState(id + '.SWING').val == 1) { //0=ON oder .SWING = true
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[7] !== '') {
|
||||||
bt[7] = Icons.GetIcon('swap-vertical-bold') + '~2016~1~' + 'SWING' + '~';
|
tempIcon = page.items[0].iconArray[7];
|
||||||
} else {
|
} else {
|
||||||
bt[7] = Icons.GetIcon('swap-vertical-bold') + '~35921~0~' + 'SWING' + '~';
|
tempIcon = 'swap-vertical-bold';
|
||||||
|
}
|
||||||
|
if (getState(id + '.POWER').val && getState(id + '.SWING').val == 1) { //0=ON oder .SWING = true
|
||||||
|
bt[7] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'SWING' + '~';
|
||||||
|
} else {
|
||||||
|
bt[7] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'SWING' + '~';
|
||||||
}
|
}
|
||||||
iconIndex++;
|
iconIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann
|
// Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann
|
||||||
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
||||||
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[0] !== '') {
|
||||||
|
tempIcon = page.items[0].iconArray[0];
|
||||||
|
} else {
|
||||||
|
tempIcon = 'power-standby';
|
||||||
|
}
|
||||||
if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) {
|
if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) {
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~';
|
bt[0] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'POWER' + '~';
|
||||||
statusStr = 'OFF';
|
statusStr = 'OFF';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
|
bt[0] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'POWER' + '~';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5558,7 +5769,14 @@ function HandleButtonEvent(words: any): void {
|
|||||||
case 'positionSlider':
|
case 'positionSlider':
|
||||||
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
||||||
timeoutSlider = setTimeout(async function () {
|
timeoutSlider = setTimeout(async function () {
|
||||||
|
let pageItem = findPageItem(id);
|
||||||
|
if (pageItem.minValueLevel != undefined && pageItem.maxValueLevel != undefined) {
|
||||||
|
let sliderPos = Math.trunc(scale(parseInt(words[4]), 0, 100, pageItem.maxValueLevel, pageItem.minValueLevel));
|
||||||
|
setIfExists(id + '.SET', sliderPos) ? true : setIfExists(id + '.ACTUAL', sliderPos);
|
||||||
|
} else {
|
||||||
setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4]));
|
setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4]));
|
||||||
|
}
|
||||||
|
// setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4]));
|
||||||
}, 250);
|
}, 250);
|
||||||
break;
|
break;
|
||||||
case 'tiltOpen':
|
case 'tiltOpen':
|
||||||
@@ -5573,7 +5791,14 @@ function HandleButtonEvent(words: any): void {
|
|||||||
case 'tiltSlider':
|
case 'tiltSlider':
|
||||||
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
||||||
timeoutSlider = setTimeout(async function () {
|
timeoutSlider = setTimeout(async function () {
|
||||||
|
let pageItem = findPageItem(id);
|
||||||
|
if (pageItem.minValueTilt != undefined && pageItem.maxValueTilt != undefined) {
|
||||||
|
let sliderPos = Math.trunc(scale(parseInt(words[4]), 0, 100, pageItem.maxValueTilt, pageItem.minValueTilt));
|
||||||
|
setIfExists(id + '.TILT_SET', sliderPos) ? true : setIfExists(id + '.TILT_ACTUAL', sliderPos);
|
||||||
|
} else {
|
||||||
setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4]));
|
setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4]));
|
||||||
|
}
|
||||||
|
// setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4]));
|
||||||
}, 250);
|
}, 250);
|
||||||
break;
|
break;
|
||||||
case 'brightnessSlider':
|
case 'brightnessSlider':
|
||||||
@@ -6560,14 +6785,32 @@ function GenerateDetailPage(type: string, optional: string, pageItem: PageItem):
|
|||||||
RegisterDetailEntityWatcher(id + '.TILT_SET', pageItem, type);
|
RegisterDetailEntityWatcher(id + '.TILT_SET', pageItem, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let min_Level: number = 0;
|
||||||
|
let max_Level: number = 100;
|
||||||
|
if (pageItem.minValueLevel !== undefined && pageItem.maxValueLevel !== undefined) {
|
||||||
|
min_Level = pageItem.minValueLevel;
|
||||||
|
max_Level = pageItem.maxValueLevel;
|
||||||
|
val = Math.trunc(scale(getState(id + '.ACTUAL').val, pageItem.minValueLevel, pageItem.maxValueLevel, 100, 0));
|
||||||
|
}
|
||||||
|
let min_Tilt: number = 0;
|
||||||
|
let max_Tilt: number = 100;
|
||||||
|
if (pageItem.minValueTilt !== undefined && pageItem.maxValueTilt !== undefined) {
|
||||||
|
min_Tilt = pageItem.minValueTilt;
|
||||||
|
max_Tilt = pageItem.maxValueTilt;
|
||||||
|
tilt_position = Math.trunc(scale(getState(id + '.TILT_ACTUAL').val, pageItem.minValueTilt, pageItem.maxValueTilt, 100, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Debug) console.log ('minLevel '+ min_Level + ' maxLevel ' + max_Level + ' Level ' + val);
|
||||||
|
if (Debug) console.log ('minTilt '+ min_Tilt + ' maxTilt ' + max_Tilt + ' TiltPosition ' + tilt_position);
|
||||||
|
|
||||||
let textSecondRow = '';
|
let textSecondRow = '';
|
||||||
let icon_id = icon;
|
let icon_id = icon;
|
||||||
let icon_up = Icons.GetIcon('arrow-up');
|
let icon_up = Icons.GetIcon('arrow-up');
|
||||||
let icon_stop = Icons.GetIcon('stop');
|
let icon_stop = Icons.GetIcon('stop');
|
||||||
let icon_down = Icons.GetIcon('arrow-down');
|
let icon_down = Icons.GetIcon('arrow-down');
|
||||||
let icon_up_status = getState(id + '.ACTUAL').val != 100 ? 'enable' : 'disable';
|
let icon_up_status = getState(id + '.ACTUAL').val != max_Level ? 'enable' : 'disable';
|
||||||
let icon_stop_status = 'enable';
|
let icon_stop_status = 'enable';
|
||||||
let icon_down_status = getState(id + '.ACTUAL').val != 0 ? 'enable' : 'disable';
|
let icon_down_status = getState(id + '.ACTUAL').val != min_Level ? 'enable' : 'disable';
|
||||||
let textTilt = '';
|
let textTilt = '';
|
||||||
let iconTiltLeft = '';
|
let iconTiltLeft = '';
|
||||||
let iconTiltStop = '';
|
let iconTiltStop = '';
|
||||||
@@ -6582,9 +6825,9 @@ function GenerateDetailPage(type: string, optional: string, pageItem: PageItem):
|
|||||||
iconTiltLeft = Icons.GetIcon('arrow-top-right');
|
iconTiltLeft = Icons.GetIcon('arrow-top-right');
|
||||||
iconTiltStop = Icons.GetIcon('stop');
|
iconTiltStop = Icons.GetIcon('stop');
|
||||||
iconTiltRight = Icons.GetIcon('arrow-bottom-left');
|
iconTiltRight = Icons.GetIcon('arrow-bottom-left');
|
||||||
iconTiltLeftStatus = getState(id + '.TILT_ACTUAL').val != 100 ? 'enable' : 'disable';
|
iconTiltLeftStatus = getState(id + '.TILT_ACTUAL').val != max_Tilt ? 'enable' : 'disable';
|
||||||
iconTiltStopStatus = 'enable';
|
iconTiltStopStatus = 'enable';
|
||||||
iconTiltRightStatus = getState(id + '.TILT_ACTUAL').val != 0 ? 'enable' : 'disable';
|
iconTiltRightStatus = getState(id + '.TILT_ACTUAL').val != min_Tilt ? 'enable' : 'disable';
|
||||||
tilt_pos = tilt_position;
|
tilt_pos = tilt_position;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8226,6 +8469,11 @@ interface PageGrid extends Page {
|
|||||||
items: PageItem[],
|
items: PageItem[],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface PageGrid2 extends Page {
|
||||||
|
type: 'cardGrid2',
|
||||||
|
items: PageItem[],
|
||||||
|
}
|
||||||
|
|
||||||
interface PageThermo extends Page {
|
interface PageThermo extends Page {
|
||||||
type: 'cardThermo',
|
type: 'cardThermo',
|
||||||
items: PageItem[],
|
items: PageItem[],
|
||||||
@@ -8273,6 +8521,10 @@ type PageItem = {
|
|||||||
maxValueBrightness: (number | undefined),
|
maxValueBrightness: (number | undefined),
|
||||||
minValueColorTemp: (number | undefined),
|
minValueColorTemp: (number | undefined),
|
||||||
maxValueColorTemp: (number | undefined),
|
maxValueColorTemp: (number | undefined),
|
||||||
|
minValueLevel: (number | undefined),
|
||||||
|
maxValueLevel: (number | undefined),
|
||||||
|
minValueTilt: (number | undefined),
|
||||||
|
maxValueTilt: (number | undefined),
|
||||||
minValue: (number | undefined),
|
minValue: (number | undefined),
|
||||||
maxValue: (number | undefined),
|
maxValue: (number | undefined),
|
||||||
stepValue: (number | undefined),
|
stepValue: (number | undefined),
|
||||||
@@ -8311,8 +8563,10 @@ type PageItem = {
|
|||||||
popupType: (string | undefined),
|
popupType: (string | undefined),
|
||||||
popupOptions: (string[] | undefined),
|
popupOptions: (string[] | undefined),
|
||||||
useValue: (boolean | undefined),
|
useValue: (boolean | undefined),
|
||||||
monobutton: (boolean | undefined)
|
monobutton: (boolean | undefined),
|
||||||
inSel_ChoiceState: (boolean | undefined)
|
inSel_ChoiceState: (boolean | undefined),
|
||||||
|
iconArray: (string[] | undefined),
|
||||||
|
fontSize: (number | undefined),
|
||||||
}
|
}
|
||||||
|
|
||||||
type DimMode = {
|
type DimMode = {
|
||||||
@@ -8325,7 +8579,7 @@ type DimMode = {
|
|||||||
|
|
||||||
type ConfigButtonFunction = {
|
type ConfigButtonFunction = {
|
||||||
mode: string | null,
|
mode: string | null,
|
||||||
page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | PageChart | PageUnlock | null),
|
page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PageGrid2 | PagePower | PageChart | PageUnlock | null),
|
||||||
entity: string | null,
|
entity: string | null,
|
||||||
setValue: string | number | null
|
setValue: string | number | null
|
||||||
}
|
}
|
||||||
@@ -8343,8 +8597,8 @@ type Config = {
|
|||||||
defaultOnColor: RGB,
|
defaultOnColor: RGB,
|
||||||
defaultOffColor: RGB,
|
defaultOffColor: RGB,
|
||||||
defaultBackgroundColor: RGB,
|
defaultBackgroundColor: RGB,
|
||||||
pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | PageChart | PageUnlock )[],
|
pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PageGrid2 | PagePower | PageChart | PageUnlock )[],
|
||||||
subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | PageChart | PageUnlock)[],
|
subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PageGrid2 | PagePower | PageChart | PageUnlock)[],
|
||||||
button1: ConfigButtonFunction,
|
button1: ConfigButtonFunction,
|
||||||
button2: ConfigButtonFunction
|
button2: ConfigButtonFunction
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
TypeScript v4.1.4.4 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom
|
TypeScript v4.2.1.5 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
|
||||||
- abgestimmt auf TFT 51 / v4.1.4 / BerryDriver 8 / Tasmota 13.0.0
|
- abgestimmt auf TFT 52 / v4.2.1 / BerryDriver 8 / Tasmota 13.1.0
|
||||||
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
|
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
|
||||||
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
|
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
|
||||||
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
|
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
|
||||||
@@ -8,17 +8,17 @@ ioBroker-Unterstützung: https://forum.iobroker.net/topic/50888/sonoff-nspanel
|
|||||||
WIKI zu diesem Projekt unter: https://github.com/joBr99/nspanel-lovelace-ui/wiki (siehe Sidebar)
|
WIKI zu diesem Projekt unter: https://github.com/joBr99/nspanel-lovelace-ui/wiki (siehe Sidebar)
|
||||||
Icons unter: https://htmlpreview.github.io/?https://github.com/jobr99/Generate-HASP-Fonts/blob/master/cheatsheet.html
|
Icons unter: https://htmlpreview.github.io/?https://github.com/jobr99/Generate-HASP-Fonts/blob/master/cheatsheet.html
|
||||||
|
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
Achtung Änderung des Sonoff ESP-Temperatursensors
|
Achtung Änderung des Sonoff ESP-Temperatursensors
|
||||||
!!! Bitte "SetOption146 1" in der Tasmota-Console ausführen !!!
|
!!! Bitte "SetOption146 1" in der Tasmota-Console ausführen !!!
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
In bestimmten Situationen kommt es vor, dass sich das Panel mit FlashNextion
|
In bestimmten Situationen kommt es vor, dass sich das Panel mit FlashNextion
|
||||||
unter Tasmota > 12.2.0 nicht flashen lässt. Für den Fall ein Tasmota Dowengrade
|
unter Tasmota > 12.2.0 nicht flashen lässt. Für den Fall ein Tasmota Dowengrade
|
||||||
durchführen und FlashNextion wiederholen.
|
durchführen und FlashNextion wiederholen.
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
Ab Tasmota > 13.0.0 ist für ein Upgrade ggfs. eine Umpartitionierung erforderlich
|
Ab Tasmota > 13.0.0 ist für ein Upgrade ggfs. eine Umpartitionierung erforderlich
|
||||||
https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Tasmota-FAQ#3-tasmota-update-probleme
|
https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Tasmota-FAQ#3-tasmota-update-probleme
|
||||||
*******************************************************************************
|
************************************************************************************************
|
||||||
|
|
||||||
ReleaseNotes:
|
ReleaseNotes:
|
||||||
Bugfixes und Erweiterungen:
|
Bugfixes und Erweiterungen:
|
||||||
@@ -149,6 +149,22 @@ ReleaseNotes:
|
|||||||
- 12.08.2023 - v4.1.4.2 Add onStop function() to Schedules
|
- 12.08.2023 - v4.1.4.2 Add onStop function() to Schedules
|
||||||
- 13.08.2023 - v4.1.4.3 Add InSel to popUpLight
|
- 13.08.2023 - v4.1.4.3 Add InSel to popUpLight
|
||||||
- 13.08.2023 - v4.1.4.4 Add Parameter inSel_ChoiceState to InSel to show/hide Focus
|
- 13.08.2023 - v4.1.4.4 Add Parameter inSel_ChoiceState to InSel to show/hide Focus
|
||||||
|
- 21.08.2023 - v4.2.0 Upgrade TFT 52 / 4.2.0
|
||||||
|
- 21.08.2023 - v4.2.0 Add new alias state for iconcolor and buttontext for icon for subpages
|
||||||
|
- 22.08.2023 - v4.2.0.1 Add iconArray to Alias "Klimaanlage" (airCondition)
|
||||||
|
- 23.08.2023 - v4.2.0.2 Add CardGrid2 with maxItems = 8
|
||||||
|
- 23.08.2023 - v4.2.1 Upgrade TFT 52 / 4.2.1
|
||||||
|
- 23.08.2023 - v4.2.1.1 Add WINDOWOPEN to cardThermo (Thermostat)
|
||||||
|
- 25.08.2023 - v4.2.1.2 Add Parameter fontSize for v4.3.0
|
||||||
|
- 27.08.2023 - v4.2.1.3 Add MQTT-Port-Check (use with exec) --> function CheckMQTTPorts()
|
||||||
|
- 27.08.2023 - v4.2.1.3 Add MQTT-Port-Check for ServiceMenu
|
||||||
|
- 01.09.2023 - v4.2.1.4 Fix iconId2 in Alias door/window
|
||||||
|
- 02.09.2023 - v4.2.1.4 Add dynamically USERICON to Alias info
|
||||||
|
- 04.09.2023 - v4.2.1.5 Fix Debug with 0_userdata.0...
|
||||||
|
- 04.09.2023 - v4.2.1.5 Add minValue/maxValue to Blinds
|
||||||
|
|
||||||
|
Next Release with TFT DEV (always implemented)
|
||||||
|
- 25.08.2023 - v4.3.0 Add Parameter fontSize (0-4) to cardGrid (with useValue)
|
||||||
|
|
||||||
|
|
||||||
***********************************************************************************************************
|
***********************************************************************************************************
|
||||||
@@ -167,6 +183,7 @@ Mögliche Seiten-Ansichten:
|
|||||||
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
||||||
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
||||||
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
||||||
|
cardGrid2 Page - 8 horizontal angeordnete Steuerelemente in 2 Reihen a 4 Steuerelemente - auch als Subpage
|
||||||
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
||||||
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
||||||
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
||||||
@@ -239,7 +256,7 @@ Erforderliche Adapter:
|
|||||||
|
|
||||||
Upgrades in Konsole:
|
Upgrades in Konsole:
|
||||||
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
|
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
|
||||||
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.1.4.tft
|
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.2.1.tft
|
||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -247,7 +264,7 @@ let Icons = new IconsSelector();
|
|||||||
let timeoutSlider: any;
|
let timeoutSlider: any;
|
||||||
let vwIconColor = [];
|
let vwIconColor = [];
|
||||||
let weatherForecast: boolean;
|
let weatherForecast: boolean;
|
||||||
let Debug: boolean = false;
|
let Debug: boolean;
|
||||||
|
|
||||||
// Ab hier Anpassungen vornehmen
|
// Ab hier Anpassungen vornehmen
|
||||||
|
|
||||||
@@ -616,7 +633,8 @@ let NSPanel_Service = <PageEntities>
|
|||||||
'parent': NSPanel_Einstellungen,
|
'parent': NSPanel_Einstellungen,
|
||||||
'home': 'NSPanel_Service',
|
'home': 'NSPanel_Service',
|
||||||
'items': [
|
'items': [
|
||||||
<PageItem>{ id: AliasPath + 'Config.ScripgtDebugStatus', name: 'Debugmodus (aus/an)' ,icon: 'code-tags-check', offColor: HMIOff, onColor: HMIOn},
|
<PageItem>{ id: AliasPath + 'Config.ScripgtDebugStatus', name: 'Debugmode (aus/an)' ,icon: 'code-tags-check', offColor: HMIOff, onColor: HMIOn},
|
||||||
|
<PageItem>{ id: AliasPath + 'Config.MQTT.portCheck', name: 'Port-Check (aus/an)' ,icon: 'check-network', offColor: HMIOff, onColor: HMIOn},
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -841,8 +859,8 @@ export const config = <Config> {
|
|||||||
const request = require('request');
|
const request = require('request');
|
||||||
|
|
||||||
//Desired Firmware
|
//Desired Firmware
|
||||||
const tft_version: string = 'v4.1.4';
|
const tft_version: string = 'v4.2.1';
|
||||||
const desired_display_firmware_version = 51;
|
const desired_display_firmware_version = 52;
|
||||||
const berry_driver_version = 8;
|
const berry_driver_version = 8;
|
||||||
const tasmotaOtaUrl: string = 'http://ota.tasmota.com/tasmota32/release/';
|
const tasmotaOtaUrl: string = 'http://ota.tasmota.com/tasmota32/release/';
|
||||||
|
|
||||||
@@ -866,9 +884,81 @@ onStop (function scriptStop () {
|
|||||||
if (scheduleInitDimModeNight!=null) clearSchedule(scheduleInitDimModeNight);
|
if (scheduleInitDimModeNight!=null) clearSchedule(scheduleInitDimModeNight);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|
||||||
|
async function CheckDebugMode() {
|
||||||
|
try {
|
||||||
|
|
||||||
|
await createStateAsync(NSPanel_Path + 'Config.ScripgtDebugStatus', false, { type: 'boolean' });
|
||||||
|
setObject(AliasPath + 'Config.ScripgtDebugStatus', {type: 'channel', common: {role: 'socket', name:'ScripgtDebugStatus'}, native: {}});
|
||||||
|
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.ACTUAL', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'ACTUAL' });
|
||||||
|
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.SET', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'SET' });
|
||||||
|
|
||||||
|
if(getState(NSPanel_Path + 'Config.ScripgtDebugStatus').val){
|
||||||
|
Debug = true;
|
||||||
|
console.log('Debugmodus aktiviert');
|
||||||
|
}else{
|
||||||
|
Debug = false;
|
||||||
|
console.log('Debugmodus deaktiviert');
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('error at function CheckDebugModus: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CheckDebugMode();
|
||||||
|
|
||||||
|
async function CheckMQTTPorts() {
|
||||||
|
try {
|
||||||
|
let instanceName: string = config.panelRecvTopic.substring(0,6);
|
||||||
|
|
||||||
|
await createStateAsync(NSPanel_Path + 'Config.MQTT.portCheck', true, { type: 'boolean' });
|
||||||
|
setObject(AliasPath + 'Config.MQTT.portCheck', {type: 'channel', common: {role: 'socket', name:'mqttPortCheck'}, native: {}});
|
||||||
|
await createAliasAsync(AliasPath + 'Config.MQTT.portCheck.ACTUAL', NSPanel_Path + 'Config.MQTT.portCheck', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'ACTUAL' });
|
||||||
|
await createAliasAsync(AliasPath + 'Config.MQTT.portCheck.SET', NSPanel_Path + 'Config.MQTT.portCheck', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'SET' });
|
||||||
|
|
||||||
|
if (getState(NSPanel_Path + 'Config.MQTT.portCheck').val) {
|
||||||
|
let adapterArray: any = [];
|
||||||
|
let portArray: any = [];
|
||||||
|
exec('iob l i --port --enabled', async (error, result, stderr) => {
|
||||||
|
if (error == null){
|
||||||
|
if (result != undefined) {
|
||||||
|
console.log('Start MQTT-Port-Check -------------------------------------');
|
||||||
|
let resultString1 = result.split('+');
|
||||||
|
for (let i: number = 1; i < resultString1.length -1; i++) {
|
||||||
|
let resultString2: any = resultString1[i].split(':')
|
||||||
|
let adapterInstanceName: string = resultString2[0].substring(16);
|
||||||
|
let adapterInstancePort: string = resultString2[3].substring(1,5);
|
||||||
|
console.log('-- '+ adapterInstanceName + ' - ' + adapterInstancePort);
|
||||||
|
adapterArray[i] = adapterInstanceName.trim();
|
||||||
|
portArray[i] = adapterInstancePort.trim();
|
||||||
|
}
|
||||||
|
let mqttInstance = adapterArray.indexOf(instanceName);
|
||||||
|
for (let j: number = 1; j < portArray.length; j++) {
|
||||||
|
if (portArray[j] == portArray[mqttInstance] && adapterArray[j] == adapterArray[mqttInstance]) {
|
||||||
|
console.log('- MQTT-Port-Check OK: Instance of Adapter: ' + adapterArray[j] + ' is running on Port:' + portArray[j]);
|
||||||
|
} else if (portArray[j] == portArray[mqttInstance] && adapterArray[j] != adapterArray[mqttInstance]) {
|
||||||
|
console.warn('Instance of Adapter: ' + adapterArray[j] + ' is running on same Port:' + portArray[j] + ' as ' + adapterArray[mqttInstance]);
|
||||||
|
console.warn('Please Change Port of Instance: ' + adapterArray[j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log('End MQTT-Port-Check ---------------------------------------');
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (error.toString().substring(0,21) == 'exec is not available') {
|
||||||
|
console.warn('MQTT-Portcheck not possible - exec is not available. Please enable exec option in JS-Adapter instance settings');
|
||||||
|
console.warn('MQTT-Portcheck nicht möglich - exec ist nicht verfügbar. Bitte Haken bei -- Kommando Exec erlauben -- in JS-Adapter-Instanz setzen');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('error at function CheckMQTTPorts: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CheckMQTTPorts();
|
||||||
|
|
||||||
async function Init_Release() {
|
async function Init_Release() {
|
||||||
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53]
|
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53]
|
||||||
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.0','4.3.0']
|
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.1','4.3.0']
|
||||||
try {
|
try {
|
||||||
if (existsObject(NSPanel_Path + 'Display_Firmware.desiredVersion') == false) {
|
if (existsObject(NSPanel_Path + 'Display_Firmware.desiredVersion') == false) {
|
||||||
await createStateAsync(NSPanel_Path + 'Display_Firmware.desiredVersion', desired_display_firmware_version, { type: 'number' });
|
await createStateAsync(NSPanel_Path + 'Display_Firmware.desiredVersion', desired_display_firmware_version, { type: 'number' });
|
||||||
@@ -964,13 +1054,6 @@ async function InitConfigParameters() {
|
|||||||
setObject(AliasPath + 'Config.temperatureUnitNumber', {type: 'channel', common: {role: 'buttonSensor', name:'temperatureUnitNumber'}, native: {}});
|
setObject(AliasPath + 'Config.temperatureUnitNumber', {type: 'channel', common: {role: 'buttonSensor', name:'temperatureUnitNumber'}, native: {}});
|
||||||
await createAliasAsync(AliasPath + 'Config.temperatureUnitNumber.VALUE', NSPanel_Path + 'Config.temperatureUnitNumber', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'VALUE' });
|
await createAliasAsync(AliasPath + 'Config.temperatureUnitNumber.VALUE', NSPanel_Path + 'Config.temperatureUnitNumber', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'VALUE' });
|
||||||
}
|
}
|
||||||
// Script Debug - Medlungen socket
|
|
||||||
if (existsObject(NSPanel_Path + 'Config.ScripgtDebugStatus') == false) {
|
|
||||||
await createStateAsync(NSPanel_Path + 'Config.ScripgtDebugStatus', false, { type: 'boolean' });
|
|
||||||
setObject(AliasPath + 'Config.ScripgtDebugStatus', {type: 'channel', common: {role: 'socket', name:'ScripgtDebugStatus'}, native: {}});
|
|
||||||
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.ACTUAL', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'ACTUAL' });
|
|
||||||
await createAliasAsync(AliasPath + 'Config.ScripgtDebugStatus.SET', NSPanel_Path + 'Config.ScripgtDebugStatus', true, <iobJS.StateCommon>{ type: 'boolean', role: 'switch', name: 'SET' });
|
|
||||||
}
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('error at function InitConfigParameters: ' + err.message);
|
console.warn('error at function InitConfigParameters: ' + err.message);
|
||||||
}
|
}
|
||||||
@@ -979,6 +1062,7 @@ InitConfigParameters();
|
|||||||
|
|
||||||
on({id: [].concat(NSPanel_Path + 'Config.ScripgtDebugStatus'), change: "ne"}, async function (obj) {
|
on({id: [].concat(NSPanel_Path + 'Config.ScripgtDebugStatus'), change: "ne"}, async function (obj) {
|
||||||
try {
|
try {
|
||||||
|
obj.state.val ? console.log('Debugmodus aktiviert') : console.log('Debugmodus deaktiviert');
|
||||||
Debug = obj.state.val
|
Debug = obj.state.val
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('error at Trigger ScripgtDebugStatus: ' + err.message);
|
console.warn('error at Trigger ScripgtDebugStatus: ' + err.message);
|
||||||
@@ -2565,6 +2649,9 @@ function GeneratePage(page: Page): void {
|
|||||||
case 'cardGrid':
|
case 'cardGrid':
|
||||||
SendToPanel(GenerateGridPage(<PageGrid>page));
|
SendToPanel(GenerateGridPage(<PageGrid>page));
|
||||||
break;
|
break;
|
||||||
|
case 'cardGrid2':
|
||||||
|
SendToPanel(GenerateGridPage2(<PageGrid2>page));
|
||||||
|
break;
|
||||||
case 'cardMedia':
|
case 'cardMedia':
|
||||||
useMediaEvents = true;
|
useMediaEvents = true;
|
||||||
SendToPanel(GenerateMediaPage(<PageMedia>page));
|
SendToPanel(GenerateMediaPage(<PageMedia>page));
|
||||||
@@ -2695,6 +2782,16 @@ function GenerateGridPage(page: PageGrid): Payload[] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function GenerateGridPage2(page: PageGrid2): Payload[] {
|
||||||
|
try {
|
||||||
|
let out_msgs: Array<Payload> = [{ payload: 'pageType~cardGrid2' }];
|
||||||
|
out_msgs.push({ payload: GeneratePageElements(page) });
|
||||||
|
return out_msgs;
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('error at function GenerateGridPage2: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function GeneratePageElements(page: Page): string {
|
function GeneratePageElements(page: Page): string {
|
||||||
try {
|
try {
|
||||||
activePage = page;
|
activePage = page;
|
||||||
@@ -2729,6 +2826,9 @@ function GeneratePageElements(page: Page): string {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'cardGrid':
|
case 'cardGrid':
|
||||||
|
maxItems = 6;
|
||||||
|
break;
|
||||||
|
case 'cardGrid2':
|
||||||
maxItems = 8;
|
maxItems = 8;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -2756,6 +2856,7 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
}
|
}
|
||||||
|
|
||||||
let name: string;
|
let name: string;
|
||||||
|
let buttonText: string = 'PRESS';
|
||||||
let type: string;
|
let type: string;
|
||||||
|
|
||||||
// ioBroker
|
// ioBroker
|
||||||
@@ -2817,78 +2918,101 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
|
|
||||||
if (pageItem.navigate) {
|
if (pageItem.navigate) {
|
||||||
|
|
||||||
if (pageItem.id == null && pageItem.targetPage != undefined){
|
if (pageItem.id == null && pageItem.targetPage != undefined) {
|
||||||
let buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
||||||
type = 'button';
|
type = 'button';
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity statisch Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText)
|
if (Debug) console.log('CreateEntity statisch Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText)
|
||||||
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText;
|
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + pageItem.name + '~' + buttonText;
|
||||||
} else if (pageItem.id != null && pageItem.targetPage != undefined){
|
|
||||||
let buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
} else if (pageItem.id != null && pageItem.targetPage != undefined) {
|
||||||
|
|
||||||
type = 'button';
|
type = 'button';
|
||||||
|
|
||||||
switch (o.common.role) {
|
switch (o.common.role) {
|
||||||
case 'socket':
|
case 'socket':
|
||||||
case 'light':
|
case 'light':
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'socket' ? Icons.GetIcon('power-socket-de') : Icons.GetIcon('lightbulb');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'socket' ? Icons.GetIcon('power-socket-de') : Icons.GetIcon('lightbulb');
|
||||||
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : o.common.role == 'socket' ? Icons.GetIcon('power-socket-de') : Icons.GetIcon('lightbulb');
|
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : iconId;
|
||||||
optVal = '0';
|
|
||||||
|
|
||||||
if (val === true || val === 'true') {
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
optVal = '1';
|
if (existsState(pageItem.id + '.COLORDEC')) {
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = getState(pageItem.id + '.COLORDEC').val;
|
||||||
} else {
|
} else {
|
||||||
|
if (val === true || val === 'true') {
|
||||||
iconColor = GetIconColor(pageItem, false, useColors);
|
iconColor = GetIconColor(pageItem, false, useColors);
|
||||||
if (pageItem.icon !== undefined) {
|
} else {
|
||||||
if (pageItem.icon2 !== undefined) {
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
iconId = iconId2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (val === true || val === 'true') { iconId = iconId2 };
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'blind':
|
case 'blind':
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('window-open');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('window-open');
|
||||||
iconColor = GetIconColor(pageItem, existsState(pageItem.id + '.ACTUAL') ? getState(pageItem.id + '.ACTUAL').val : true, useColors);
|
iconColor = existsState(pageItem.id + '.COLORDEC') ? getState(pageItem.id + '.COLORDEC').val : GetIconColor(pageItem, existsState(pageItem.id + '.ACTUAL') ? getState(pageItem.id + '.ACTUAL').val : true, useColors);
|
||||||
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'door':
|
case 'door':
|
||||||
case 'window':
|
case 'window':
|
||||||
if (existsState(pageItem.id + '.ACTUAL')) {
|
|
||||||
if (getState(pageItem.id + '.ACTUAL').val) {
|
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-open') : Icons.GetIcon('window-open-variant');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-open') : Icons.GetIcon('window-open-variant');
|
||||||
|
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
||||||
|
|
||||||
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
|
if (existsState(pageItem.id + '.COLORDEC')) {
|
||||||
|
iconColor = getState(pageItem.id + '.COLORDEC').val;
|
||||||
|
} else {
|
||||||
|
if (val === true || val === 'true') {
|
||||||
iconColor = GetIconColor(pageItem, false, useColors);
|
iconColor = GetIconColor(pageItem, false, useColors);
|
||||||
} else {
|
} else {
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (val === true || val === 'true') { iconId = iconId2 };
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'info':
|
case 'info':
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : Icons.GetIcon('gesture-tap-button');
|
iconId2 = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : iconId;
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
|
||||||
if (val === true || val === 'true') {
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
if (existsState(pageItem.id + '.COLORDEC')) {
|
||||||
|
iconColor = getState(pageItem.id + '.COLORDEC').val;
|
||||||
} else {
|
} else {
|
||||||
|
if (val === true || val === 'true') {
|
||||||
iconColor = GetIconColor(pageItem, false, useColors);
|
iconColor = GetIconColor(pageItem, false, useColors);
|
||||||
if (pageItem.icon !== undefined) {
|
} else {
|
||||||
if (pageItem.icon2 !== undefined) {
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
iconId = iconId2;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
if (val === true || val === 'true') { iconId = iconId2 };
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'warning':
|
||||||
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
|
iconColor = pageItem.onColor !== undefined ? GetIconColor(pageItem, true, useColors) : getState(pageItem.id + '.LEVEL').val;
|
||||||
|
name = pageItem.name !== undefined ? pageItem.name : getState(pageItem.id + '.INFO').val;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return '~delete~~~~~';
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : existsState(pageItem.id + '.BUTTONTEXT') ? getState(pageItem.id + '.BUTTONTEXT').val : 'PRESS';
|
||||||
|
iconColor = pageItem.onColor !== undefined ? GetIconColor(pageItem, true, useColors) : existsState(pageItem.id + '.COLORDEC') ? getState(pageItem.id + '.COLORDEC').val : 65535;
|
||||||
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
|
break;
|
||||||
|
// return '~delete~~~~~';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity Dynamische Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
if (Debug) console.log('CreateEntity Dynamische Icon Navi ~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
||||||
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
return '~' + type + '~' + 'navigate.' + pageItem.targetPage + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
type = 'button';
|
type = 'button';
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon('gesture-tap-button');
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
let buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
buttonText = pageItem.buttonText !== undefined ? pageItem.buttonText : 'PRESS';
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity Standard ~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
if (Debug) console.log('CreateEntity Standard ~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText)
|
||||||
return '~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
return '~' + type + '~' + 'navigate.' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + buttonText;
|
||||||
@@ -3091,6 +3215,7 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
windowState = findLocale('window', 'opened');
|
windowState = findLocale('window', 'opened');
|
||||||
} else {
|
} else {
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'door' ? Icons.GetIcon('door-closed') : Icons.GetIcon('window-closed-variant');
|
||||||
|
iconId = pageItem.icon2 !== undefined ? Icons.GetIcon(pageItem.icon2) : iconId;
|
||||||
iconColor = GetIconColor(pageItem, true, useColors);
|
iconColor = GetIconColor(pageItem, true, useColors);
|
||||||
windowState = findLocale('window', 'closed');
|
windowState = findLocale('window', 'closed');
|
||||||
}
|
}
|
||||||
@@ -3130,7 +3255,9 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
|
|
||||||
case 'thermostat':
|
case 'thermostat':
|
||||||
type = 'text';
|
type = 'text';
|
||||||
|
|
||||||
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'value.temperature' || o.common.role == 'thermostat' ? Icons.GetIcon('thermometer') : Icons.GetIcon('information-outline');
|
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == 'value.temperature' || o.common.role == 'thermostat' ? Icons.GetIcon('thermometer') : Icons.GetIcon('information-outline');
|
||||||
|
|
||||||
let unit = '';
|
let unit = '';
|
||||||
optVal = '0';
|
optVal = '0';
|
||||||
|
|
||||||
@@ -3173,9 +3300,19 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (existsState(pageItem.id + '.USERICON')) {
|
||||||
|
iconId = Icons.GetIcon(getState(pageItem.id + '.USERICON').val);
|
||||||
|
console.log(iconId);
|
||||||
|
RegisterEntityWatcher(pageItem.id + '.USERICON');
|
||||||
|
}
|
||||||
|
|
||||||
if (pageItem.useValue) {
|
if (pageItem.useValue) {
|
||||||
|
if (pageItem.fontSize != undefined) {
|
||||||
|
iconId = optVal + '¬' + pageItem.fontSize;
|
||||||
|
} else {
|
||||||
iconId = optVal;
|
iconId = optVal;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (Debug) console.log('CreateEntity Icon role info, humidity, temperature, value.temperature, value.humidity, sensor.door, sensor.window, thermostat');
|
if (Debug) console.log('CreateEntity Icon role info, humidity, temperature, value.temperature, value.humidity, sensor.door, sensor.window, thermostat');
|
||||||
if (Debug) console.log('CreateEntity ~' + type + '~' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + optVal+ ' ' + unit);
|
if (Debug) console.log('CreateEntity ~' + type + '~' + pageItem.id + '~' + iconId + '~' + iconColor + '~' + name + '~' + optVal+ ' ' + unit);
|
||||||
@@ -3498,6 +3635,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
//Attribute hinzufügen, wenn im Alias definiert
|
//Attribute hinzufügen, wenn im Alias definiert
|
||||||
let i_list = Array.prototype.slice.apply($('[state.id="' + id + '.*"]'));
|
let i_list = Array.prototype.slice.apply($('[state.id="' + id + '.*"]'));
|
||||||
let bt = ['~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~'];
|
let bt = ['~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~', '~~~~'];
|
||||||
|
|
||||||
|
let tempIcon: string = '';
|
||||||
|
|
||||||
if ((i_list.length - 3) != 0) {
|
if ((i_list.length - 3) != 0) {
|
||||||
|
|
||||||
let i = 0;
|
let i = 0;
|
||||||
@@ -3624,6 +3764,15 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
}
|
}
|
||||||
} else i--;
|
} else i--;
|
||||||
break;
|
break;
|
||||||
|
case 'WINDOWOPEN':
|
||||||
|
if (existsState(id + '.WINDOWOPEN') && getState(id + '.WINDOWOPEN').val != null) {
|
||||||
|
if (getState(id + '.WINDOWOPEN').val) {
|
||||||
|
bt[i - 1] = Icons.GetIcon('window-open-variant') + '~63488~1~' + 'WIN' + '~';
|
||||||
|
} else {
|
||||||
|
bt[i - 1] = Icons.GetIcon('window-closed-variant') + '~2016~1~' + 'WIN' + '~';
|
||||||
|
}
|
||||||
|
} else i--;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
i--;
|
i--;
|
||||||
break;
|
break;
|
||||||
@@ -3651,47 +3800,78 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
if(stateKeyNumber == Mode) {
|
if(stateKeyNumber == Mode) {
|
||||||
statusStr = stateName.replace('_', ' ');
|
statusStr = stateName.replace('_', ' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(stateName) {
|
switch(stateName) {
|
||||||
case 'AUTO':
|
case 'AUTO':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[1] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~1024~1~' + 'AUTO' + '~';
|
tempIcon = page.items[0].iconArray[1];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('air-conditioner') + '~35921~0~' + 'AUTO' + '~';
|
tempIcon = 'air-conditioner';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~1024~1~' + 'AUTO' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'AUTO' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'COOL':
|
case 'COOL':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[2] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('snowflake') + '~11487~1~' + 'COOL' + '~';
|
tempIcon = page.items[0].iconArray[2];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('snowflake') + '~35921~0~' + 'COOL' + '~';
|
tempIcon = 'snowflake';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~11487~1~' + 'COOL' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'COOL' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'HEAT':
|
case 'HEAT':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[3] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('fire') + '~64512~1~' + 'HEAT' + '~';
|
tempIcon = page.items[0].iconArray[3];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('fire') + '~35921~0~' + 'HEAT' + '~';
|
tempIcon = 'fire';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~64512~1~' + 'HEAT' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'HEAT' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'ECO':
|
case 'ECO':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[4] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~';
|
tempIcon = page.items[0].iconArray[4];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~';
|
tempIcon = 'alpha-e-circle-outline';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'ECO' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'ECO' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'FAN_ONLY':
|
case 'FAN_ONLY':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[5] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('fan') + '~11487~1~' + 'FAN_ONLY' + '~';
|
tempIcon = page.items[0].iconArray[5];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('fan') + '~35921~0~' + 'FAN_ONLY' + '~';
|
tempIcon = 'fan';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~11487~1~' + 'FAN_ONLY' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'FAN_ONLY' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'DRY':
|
case 'DRY':
|
||||||
if(stateKeyNumber == Mode) {
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[6] !== '') {
|
||||||
bt[iconIndex] = Icons.GetIcon('water-percent') + '~60897~1~' + 'DRY' + '~';
|
tempIcon = page.items[0].iconArray[6];
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('water-percent') + '~35921~0~' + 'DRY' + '~';
|
tempIcon = 'water-percent';
|
||||||
|
}
|
||||||
|
if(stateKeyNumber == Mode) {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~60897~1~' + 'DRY' + '~';
|
||||||
|
} else {
|
||||||
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'DRY' + '~';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -3699,32 +3879,47 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (iconIndex <= 7 && existsState(id + '.ECO') && getState(id + '.ECO').val != null) {
|
if (iconIndex <= 7 && existsState(id + '.ECO') && getState(id + '.ECO').val != null) {
|
||||||
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[4] !== '') {
|
||||||
|
tempIcon = page.items[0].iconArray[4];
|
||||||
|
} else {
|
||||||
|
tempIcon = 'alpha-e-circle-outline';
|
||||||
|
}
|
||||||
if (getState(id + '.ECO').val && getState(id + '.ECO').val == 1) {
|
if (getState(id + '.ECO').val && getState(id + '.ECO').val == 1) {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~2016~1~' + 'ECO' + '~';
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'ECO' + '~';
|
||||||
statusStr = 'ECO';
|
statusStr = 'ECO';
|
||||||
} else {
|
} else {
|
||||||
bt[iconIndex] = Icons.GetIcon('alpha-e-circle-outline') + '~35921~0~' + 'ECO' + '~';
|
bt[iconIndex] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'ECO' + '~';
|
||||||
}
|
}
|
||||||
iconIndex++;
|
iconIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (iconIndex <= 7 && existsState(id + '.SWING') && getState(id + '.SWING').val != null) {
|
if (iconIndex <= 7 && existsState(id + '.SWING') && getState(id + '.SWING').val != null) {
|
||||||
if (getState(id + '.POWER').val && getState(id + '.SWING').val == 1) { //0=ON oder .SWING = true
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[7] !== '') {
|
||||||
bt[7] = Icons.GetIcon('swap-vertical-bold') + '~2016~1~' + 'SWING' + '~';
|
tempIcon = page.items[0].iconArray[7];
|
||||||
} else {
|
} else {
|
||||||
bt[7] = Icons.GetIcon('swap-vertical-bold') + '~35921~0~' + 'SWING' + '~';
|
tempIcon = 'swap-vertical-bold';
|
||||||
|
}
|
||||||
|
if (getState(id + '.POWER').val && getState(id + '.SWING').val == 1) { //0=ON oder .SWING = true
|
||||||
|
bt[7] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'SWING' + '~';
|
||||||
|
} else {
|
||||||
|
bt[7] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'SWING' + '~';
|
||||||
}
|
}
|
||||||
iconIndex++;
|
iconIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann
|
// Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann
|
||||||
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
||||||
|
if (page.items[0].iconArray !== undefined && page.items[0].iconArray[0] !== '') {
|
||||||
|
tempIcon = page.items[0].iconArray[0];
|
||||||
|
} else {
|
||||||
|
tempIcon = 'power-standby';
|
||||||
|
}
|
||||||
if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) {
|
if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) {
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~';
|
bt[0] = Icons.GetIcon(tempIcon) + '~35921~0~' + 'POWER' + '~';
|
||||||
statusStr = 'OFF';
|
statusStr = 'OFF';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
|
bt[0] = Icons.GetIcon(tempIcon) + '~2016~1~' + 'POWER' + '~';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5059,7 +5254,14 @@ function HandleButtonEvent(words: any): void {
|
|||||||
case 'positionSlider':
|
case 'positionSlider':
|
||||||
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
||||||
timeoutSlider = setTimeout(async function () {
|
timeoutSlider = setTimeout(async function () {
|
||||||
|
let pageItem = findPageItem(id);
|
||||||
|
if (pageItem.minValueLevel != undefined && pageItem.maxValueLevel != undefined) {
|
||||||
|
let sliderPos = Math.trunc(scale(parseInt(words[4]), 0, 100, pageItem.maxValueLevel, pageItem.minValueLevel));
|
||||||
|
setIfExists(id + '.SET', sliderPos) ? true : setIfExists(id + '.ACTUAL', sliderPos);
|
||||||
|
} else {
|
||||||
setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4]));
|
setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4]));
|
||||||
|
}
|
||||||
|
// setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4]));
|
||||||
}, 250);
|
}, 250);
|
||||||
break;
|
break;
|
||||||
case 'tiltOpen':
|
case 'tiltOpen':
|
||||||
@@ -5074,7 +5276,14 @@ function HandleButtonEvent(words: any): void {
|
|||||||
case 'tiltSlider':
|
case 'tiltSlider':
|
||||||
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
||||||
timeoutSlider = setTimeout(async function () {
|
timeoutSlider = setTimeout(async function () {
|
||||||
|
let pageItem = findPageItem(id);
|
||||||
|
if (pageItem.minValueTilt != undefined && pageItem.maxValueTilt != undefined) {
|
||||||
|
let sliderPos = Math.trunc(scale(parseInt(words[4]), 0, 100, pageItem.maxValueTilt, pageItem.minValueTilt));
|
||||||
|
setIfExists(id + '.TILT_SET', sliderPos) ? true : setIfExists(id + '.TILT_ACTUAL', sliderPos);
|
||||||
|
} else {
|
||||||
setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4]));
|
setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4]));
|
||||||
|
}
|
||||||
|
// setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4]));
|
||||||
}, 250);
|
}, 250);
|
||||||
break;
|
break;
|
||||||
case 'brightnessSlider':
|
case 'brightnessSlider':
|
||||||
@@ -6061,14 +6270,32 @@ function GenerateDetailPage(type: string, optional: string, pageItem: PageItem):
|
|||||||
RegisterDetailEntityWatcher(id + '.TILT_SET', pageItem, type);
|
RegisterDetailEntityWatcher(id + '.TILT_SET', pageItem, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let min_Level: number = 0;
|
||||||
|
let max_Level: number = 100;
|
||||||
|
if (pageItem.minValueLevel !== undefined && pageItem.maxValueLevel !== undefined) {
|
||||||
|
min_Level = pageItem.minValueLevel;
|
||||||
|
max_Level = pageItem.maxValueLevel;
|
||||||
|
val = Math.trunc(scale(getState(id + '.ACTUAL').val, pageItem.minValueLevel, pageItem.maxValueLevel, 100, 0));
|
||||||
|
}
|
||||||
|
let min_Tilt: number = 0;
|
||||||
|
let max_Tilt: number = 100;
|
||||||
|
if (pageItem.minValueTilt !== undefined && pageItem.maxValueTilt !== undefined) {
|
||||||
|
min_Tilt = pageItem.minValueTilt;
|
||||||
|
max_Tilt = pageItem.maxValueTilt;
|
||||||
|
tilt_position = Math.trunc(scale(getState(id + '.TILT_ACTUAL').val, pageItem.minValueTilt, pageItem.maxValueTilt, 100, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Debug) console.log ('minLevel '+ min_Level + ' maxLevel ' + max_Level + ' Level ' + val);
|
||||||
|
if (Debug) console.log ('minTilt '+ min_Tilt + ' maxTilt ' + max_Tilt + ' TiltPosition ' + tilt_position);
|
||||||
|
|
||||||
let textSecondRow = '';
|
let textSecondRow = '';
|
||||||
let icon_id = icon;
|
let icon_id = icon;
|
||||||
let icon_up = Icons.GetIcon('arrow-up');
|
let icon_up = Icons.GetIcon('arrow-up');
|
||||||
let icon_stop = Icons.GetIcon('stop');
|
let icon_stop = Icons.GetIcon('stop');
|
||||||
let icon_down = Icons.GetIcon('arrow-down');
|
let icon_down = Icons.GetIcon('arrow-down');
|
||||||
let icon_up_status = getState(id + '.ACTUAL').val != 100 ? 'enable' : 'disable';
|
let icon_up_status = getState(id + '.ACTUAL').val != max_Level ? 'enable' : 'disable';
|
||||||
let icon_stop_status = 'enable';
|
let icon_stop_status = 'enable';
|
||||||
let icon_down_status = getState(id + '.ACTUAL').val != 0 ? 'enable' : 'disable';
|
let icon_down_status = getState(id + '.ACTUAL').val != min_Level ? 'enable' : 'disable';
|
||||||
let textTilt = '';
|
let textTilt = '';
|
||||||
let iconTiltLeft = '';
|
let iconTiltLeft = '';
|
||||||
let iconTiltStop = '';
|
let iconTiltStop = '';
|
||||||
@@ -6083,9 +6310,9 @@ function GenerateDetailPage(type: string, optional: string, pageItem: PageItem):
|
|||||||
iconTiltLeft = Icons.GetIcon('arrow-top-right');
|
iconTiltLeft = Icons.GetIcon('arrow-top-right');
|
||||||
iconTiltStop = Icons.GetIcon('stop');
|
iconTiltStop = Icons.GetIcon('stop');
|
||||||
iconTiltRight = Icons.GetIcon('arrow-bottom-left');
|
iconTiltRight = Icons.GetIcon('arrow-bottom-left');
|
||||||
iconTiltLeftStatus = getState(id + '.TILT_ACTUAL').val != 100 ? 'enable' : 'disable';
|
iconTiltLeftStatus = getState(id + '.TILT_ACTUAL').val != max_Tilt ? 'enable' : 'disable';
|
||||||
iconTiltStopStatus = 'enable';
|
iconTiltStopStatus = 'enable';
|
||||||
iconTiltRightStatus = getState(id + '.TILT_ACTUAL').val != 0 ? 'enable' : 'disable';
|
iconTiltRightStatus = getState(id + '.TILT_ACTUAL').val != min_Tilt ? 'enable' : 'disable';
|
||||||
tilt_pos = tilt_position;
|
tilt_pos = tilt_position;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -7727,6 +7954,11 @@ interface PageGrid extends Page {
|
|||||||
items: PageItem[],
|
items: PageItem[],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface PageGrid2 extends Page {
|
||||||
|
type: 'cardGrid2',
|
||||||
|
items: PageItem[],
|
||||||
|
}
|
||||||
|
|
||||||
interface PageThermo extends Page {
|
interface PageThermo extends Page {
|
||||||
type: 'cardThermo',
|
type: 'cardThermo',
|
||||||
items: PageItem[],
|
items: PageItem[],
|
||||||
@@ -7774,6 +8006,10 @@ type PageItem = {
|
|||||||
maxValueBrightness: (number | undefined),
|
maxValueBrightness: (number | undefined),
|
||||||
minValueColorTemp: (number | undefined),
|
minValueColorTemp: (number | undefined),
|
||||||
maxValueColorTemp: (number | undefined),
|
maxValueColorTemp: (number | undefined),
|
||||||
|
minValueLevel: (number | undefined),
|
||||||
|
maxValueLevel: (number | undefined),
|
||||||
|
minValueTilt: (number | undefined),
|
||||||
|
maxValueTilt: (number | undefined),
|
||||||
minValue: (number | undefined),
|
minValue: (number | undefined),
|
||||||
maxValue: (number | undefined),
|
maxValue: (number | undefined),
|
||||||
stepValue: (number | undefined),
|
stepValue: (number | undefined),
|
||||||
@@ -7812,8 +8048,10 @@ type PageItem = {
|
|||||||
popupType: (string | undefined),
|
popupType: (string | undefined),
|
||||||
popupOptions: (string[] | undefined),
|
popupOptions: (string[] | undefined),
|
||||||
useValue: (boolean | undefined),
|
useValue: (boolean | undefined),
|
||||||
monobutton: (boolean | undefined)
|
monobutton: (boolean | undefined),
|
||||||
inSel_ChoiceState: (boolean | undefined)
|
inSel_ChoiceState: (boolean | undefined),
|
||||||
|
iconArray: (string[] | undefined),
|
||||||
|
fontSize: (number | undefined),
|
||||||
}
|
}
|
||||||
|
|
||||||
type DimMode = {
|
type DimMode = {
|
||||||
@@ -7826,7 +8064,7 @@ type DimMode = {
|
|||||||
|
|
||||||
type ConfigButtonFunction = {
|
type ConfigButtonFunction = {
|
||||||
mode: string | null,
|
mode: string | null,
|
||||||
page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | PageChart | PageUnlock | null),
|
page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PageGrid2 | PagePower | PageChart | PageUnlock | null),
|
||||||
entity: string | null,
|
entity: string | null,
|
||||||
setValue: string | number | null
|
setValue: string | number | null
|
||||||
}
|
}
|
||||||
@@ -7844,8 +8082,8 @@ type Config = {
|
|||||||
defaultOnColor: RGB,
|
defaultOnColor: RGB,
|
||||||
defaultOffColor: RGB,
|
defaultOffColor: RGB,
|
||||||
defaultBackgroundColor: RGB,
|
defaultBackgroundColor: RGB,
|
||||||
pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | PageChart | PageUnlock )[],
|
pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PageGrid2 | PagePower | PageChart | PageUnlock )[],
|
||||||
subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | PageChart | PageUnlock)[],
|
subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PageGrid2 | PagePower | PageChart | PageUnlock)[],
|
||||||
button1: ConfigButtonFunction,
|
button1: ConfigButtonFunction,
|
||||||
button2: ConfigButtonFunction
|
button2: ConfigButtonFunction
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user