Compare commits

..

21 Commits

Author SHA1 Message Date
Johannes
4600458da3 Update entities.md 2023-09-16 13:28:56 +02:00
joBr99
67bc1533bf bump tft version (add nextion2text) 2023-09-16 10:55:25 +00:00
joBr99
e5f5546352 bump tft version 2023-09-16 12:51:46 +02:00
Johannes
40896473b2 Update pages.py 2023-09-16 12:43:51 +02:00
Johannes
83e820d037 Update pages.py 2023-09-16 12:39:31 +02:00
Johannes
fb8a1003f9 Update config.py 2023-09-16 12:25:30 +02:00
Armilar
1eef2bc96f Merge pull request #973 from tt-tom17/main
v4.2.1.5
2023-09-04 13:14:54 +02:00
Thomas
015d9c29c7 v4.2.1.5
- Fix Debug with 0_userdata.0
- Add minValue/maxValue to Blinds
2023-09-04 10:42:15 +02:00
Armilar
164467d435 v4.2.1.4 - Update NsPanelTs.ts
- 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

        Todo
        - XX.XX.XXXX - v4.3.0    Fix Debug with 0_userdata.0... 
        - XX.XX.XXXX - v4.3.0    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)
2023-09-02 12:46:35 +02:00
Armilar
e8e8b0fc29 v4.2.1.4 - Update NsPanelTs_without_Examples.ts
- 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

        Todo
        - XX.XX.XXXX - v4.3.0    Fix Debug with 0_userdata.0... 
        - XX.XX.XXXX - v4.3.0    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)
2023-09-02 12:46:29 +02:00
Armilar
b95b35f10c v4.2.1.3 - Add MQTT-Portcheck + Support Menu Item
- Add MQTT-Port-Check (use with exec) --> function CheckMQTTPorts()
- Add MQTT-Port-Check for ServiceMenu
2023-08-27 20:53:26 +02:00
Armilar
7d52df1f11 v4.2.1.3 - Add MQTT-Portcheck + Support Menu Item
- Add MQTT-Port-Check (use with exec) --> function CheckMQTTPorts()
- Add MQTT-Port-Check for ServiceMenu
2023-08-27 20:53:19 +02:00
Armilar
ff2208a646 v4.2.1.2 - New pageItem-Parameter fontSize
Use with DEV-Version
FlashNextion http://nspanel.pky.eu/lui.tft
2023-08-25 10:49:45 +02:00
Armilar
205f45ba48 v4.2.1.2 - New pageItem-Parameter fontSize
Use with DEV-Version
FlashNextion http://nspanel.pky.eu/lui.tft
2023-08-25 10:49:39 +02:00
joBr99
1712098f61 sync (add nextion2text) 2023-08-24 14:50:22 +00:00
joBr99
84585499d5 sync 2023-08-24 16:45:45 +02:00
joBr99
1a4f7a7754 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-08-24 14:39:55 +00:00
joBr99
632663cd9f Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-08-24 16:35:29 +02:00
joBr99
059619a636 implement way to change icon font changes on entities 2023-08-24 16:35:21 +02:00
Armilar
49352c7ca0 v4.2.1.1 - Add WINDOWOPEN to cardThermo (Thermostat)
Add WINDOWOPEN to cardThermo (Thermostat)
2023-08-24 09:51:08 +02:00
Armilar
a44573cfc9 v4.2.1.1 - Add WINDOWOPEN to cardThermo (Thermostat)
Add WINDOWOPEN to cardThermo (Thermostat)
2023-08-24 09:50:59 +02:00
43 changed files with 1805 additions and 177 deletions

View File

@@ -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 @@

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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.

View File

@@ -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

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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.

View File

@@ -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}

View File

@@ -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 = """

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

View File

@@ -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")
{ {

View File

@@ -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

Binary file not shown.

Binary file not shown.

View File

@@ -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

View File

@@ -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):

View File

@@ -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)

View File

@@ -1,6 +1,6 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript v4.2.0.2 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne TypeScript v4.2.1.5 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 52 / v4.2.0 / BerryDriver 8 / Tasmota 13.1.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:
@@ -153,6 +153,19 @@ ReleaseNotes:
- 21.08.2023 - v4.2.0 Add new alias state for iconcolor and buttontext for icon for subpages - 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) - 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.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)
*********************************************************************************************************** ***********************************************************************************************************
* Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! * * Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! *
@@ -243,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.2.0.tft TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.2.1.tft
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
*/ */
@@ -251,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
@@ -1016,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},
] ]
}; };
@@ -1360,7 +1374,7 @@ export const config = <Config> {
const request = require('request'); const request = require('request');
//Desired Firmware //Desired Firmware
const tft_version: string = 'v4.2.0'; const tft_version: string = 'v4.2.1';
const desired_display_firmware_version = 52; 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/';
@@ -1385,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' });
@@ -1483,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);
} }
@@ -1498,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);
@@ -3650,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');
} }
@@ -3689,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';
@@ -3732,8 +3815,18 @@ 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) {
iconId = optVal; if (pageItem.fontSize != undefined) {
iconId = optVal + '¬' + pageItem.fontSize;
} else {
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');
@@ -4186,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;
@@ -5667,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 () {
setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4])); 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]));
}, 250); }, 250);
break; break;
case 'tiltOpen': case 'tiltOpen':
@@ -5682,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 () {
setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4])); 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]));
}, 250); }, 250);
break; break;
case 'brightnessSlider': case 'brightnessSlider':
@@ -6668,15 +6784,33 @@ function GenerateDetailPage(type: string, optional: string, pageItem: PageItem):
tilt_position = getState(id + '.TILT_SET').val; tilt_position = getState(id + '.TILT_SET').val;
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 = '';
@@ -6691,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;
} }
@@ -8387,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),
@@ -8427,7 +8565,8 @@ type PageItem = {
useValue: (boolean | undefined), useValue: (boolean | undefined),
monobutton: (boolean | undefined), monobutton: (boolean | undefined),
inSel_ChoiceState: (boolean | undefined), inSel_ChoiceState: (boolean | undefined),
iconArray: (string[] | undefined) iconArray: (string[] | undefined),
fontSize: (number | undefined),
} }
type DimMode = { type DimMode = {

View File

@@ -1,6 +1,6 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript v4.2.0.2 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne TypeScript v4.2.1.5 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 52 / v4.2.0 / BerryDriver 8 / Tasmota 13.1.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:
@@ -153,6 +153,19 @@ ReleaseNotes:
- 21.08.2023 - v4.2.0 Add new alias state for iconcolor and buttontext for icon for subpages - 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) - 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.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)
*********************************************************************************************************** ***********************************************************************************************************
* Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! * * Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! *
@@ -243,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.2.0.tft TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.2.1.tft
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
*/ */
@@ -251,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
@@ -620,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},
] ]
}; };
@@ -845,7 +859,7 @@ export const config = <Config> {
const request = require('request'); const request = require('request');
//Desired Firmware //Desired Firmware
const tft_version: string = 'v4.2.0'; const tft_version: string = 'v4.2.1';
const desired_display_firmware_version = 52; 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/';
@@ -870,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' });
@@ -968,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);
} }
@@ -983,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);
@@ -3135,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');
} }
@@ -3174,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';
@@ -3217,8 +3300,18 @@ 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) {
iconId = optVal; if (pageItem.fontSize != undefined) {
iconId = optVal + '¬' + pageItem.fontSize;
} else {
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');
@@ -3671,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;
@@ -5152,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 () {
setIfExists(id + '.SET', parseInt(words[4])) ? true : setIfExists(id + '.ACTUAL', parseInt(words[4])); 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]));
}, 250); }, 250);
break; break;
case 'tiltOpen': case 'tiltOpen':
@@ -5167,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 () {
setIfExists(id + '.TILT_SET', parseInt(words[4])) ? true : setIfExists(id + '.TILT_ACTUAL', parseInt(words[4])); 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]));
}, 250); }, 250);
break; break;
case 'brightnessSlider': case 'brightnessSlider':
@@ -6153,15 +6269,33 @@ function GenerateDetailPage(type: string, optional: string, pageItem: PageItem):
tilt_position = getState(id + '.TILT_SET').val; tilt_position = getState(id + '.TILT_SET').val;
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 = '';
@@ -6176,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;
} }
@@ -7872,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),
@@ -7912,7 +8050,8 @@ type PageItem = {
useValue: (boolean | undefined), useValue: (boolean | undefined),
monobutton: (boolean | undefined), monobutton: (boolean | undefined),
inSel_ChoiceState: (boolean | undefined), inSel_ChoiceState: (boolean | undefined),
iconArray: (string[] | undefined) iconArray: (string[] | undefined),
fontSize: (number | undefined),
} }
type DimMode = { type DimMode = {