mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 15:34:26 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui
This commit is contained in:
joBr99
@@ -1080,7 +1080,7 @@
|
||||
│
|
||||
│ Variable (string) nent1
|
||||
│ Attributes
|
||||
│ @@ -69,15 +69,15 @@
|
||||
│ @@ -69,46 +69,82 @@
|
||||
│ Text :
|
||||
│ Max. Text Size: 80
|
||||
│
|
||||
@@ -1096,8 +1096,75 @@
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t0o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t1Speed
|
||||
│ @@ -135,24 +135,14 @@
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t1o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t2Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t2o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t3Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t3o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t4Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t4o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t5Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t5o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (string) tId
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ Max. Text Size: 20
|
||||
│
|
||||
│ Variable (string) tInstruction
|
||||
│ @@ -135,24 +171,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1122,7 +1189,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -175,24 +165,14 @@
|
||||
│ @@ -175,24 +201,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1147,7 +1214,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -205,24 +185,14 @@
|
||||
│ @@ -205,24 +221,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1172,7 +1239,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -235,24 +205,14 @@
|
||||
│ @@ -235,24 +241,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1197,7 +1264,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -265,24 +225,14 @@
|
||||
│ @@ -265,24 +261,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1222,7 +1289,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -295,24 +245,14 @@
|
||||
│ @@ -295,24 +281,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1247,7 +1314,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -535,85 +475,79 @@
|
||||
│ @@ -535,85 +511,79 @@
|
||||
│ h0.val=h0.minval
|
||||
│ }
|
||||
│ if(sys0<h0.minval)
|
||||
@@ -1333,275 +1400,6 @@
|
||||
│ Scope : local
|
||||
│ Period (ms): 50
|
||||
│ Enabled : yes
|
||||
│ @@ -661,14 +595,15 @@
|
||||
│ // here is the location where acual code should be
|
||||
│ // write command to variable strCommand
|
||||
│ ucopy strCommand.txt,4,payloadLength-5,0
|
||||
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||
│ spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
│ if(tInstruction.txt=="entityUpd")
|
||||
│ {
|
||||
│ + // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
|
||||
│ spstr strCommand.txt,tHeading.txt,"~",1
|
||||
│ // navigation icon left
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
│ if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
│ {
|
||||
│ vis bPrev,0
|
||||
│ }else
|
||||
│ @@ -697,202 +632,193 @@
|
||||
│ // change icon color
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",11
|
||||
│ covx tTmp.txt,sys0,0,0
|
||||
│ bNext.pco=sys0
|
||||
│ vis bNext,1
|
||||
│ }
|
||||
│ // icon color home
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",17
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",14
|
||||
│ covx tTmp.txt,t1.pco,0,0
|
||||
│ // icon home
|
||||
│ - spstr strCommand.txt,t1.txt,"~",16
|
||||
│ + spstr strCommand.txt,t1.txt,"~",15
|
||||
│ // speed 16 ignored
|
||||
│ // text home
|
||||
│ - spstr strCommand.txt,tHome.txt,"~",19
|
||||
│ + spstr strCommand.txt,tHome.txt,"~",17
|
||||
│ spstr tHome.txt,tHome2.txt," ",1
|
||||
│ spstr tHome.txt,tHome.txt," ",0
|
||||
│ + // icon color 18 ignored
|
||||
│ + // icon 19 ignored
|
||||
│ + // speed 20 ignored
|
||||
│ // text home
|
||||
│ - spstr strCommand.txt,tHomeO.txt,"~",26
|
||||
│ + spstr strCommand.txt,tHomeO.txt,"~",21
|
||||
│ spstr tHomeO.txt,tHomeO2.txt," ",1
|
||||
│ spstr tHomeO.txt,tHomeO.txt," ",0
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",31
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ covx tTmp.txt,t0Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t0Icon.txt,"~",30
|
||||
│ + spstr strCommand.txt,t0Icon.txt,"~",23
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",34
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",24
|
||||
│ covx tTmp.txt,t0Speed.val,0,0
|
||||
│ if(t0Speed.val>120)
|
||||
│ {
|
||||
│ t0Speed.val=120
|
||||
│ }
|
||||
│ if(t0Speed.val<-120)
|
||||
│ {
|
||||
│ t0Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t0u.txt,"~",33
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t0o.txt,"~",32
|
||||
│ + spstr strCommand.txt,t0u.txt,"~",25
|
||||
│ if(t0Icon.txt!="")
|
||||
│ {
|
||||
│ vis t0Icon,1
|
||||
│ vis t0u,1
|
||||
│ vis h0,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t0Icon,0
|
||||
│ vis t0u,0
|
||||
│ vis h0,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",38
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",26
|
||||
│ covx tTmp.txt,t1Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t1Icon.txt,"~",37
|
||||
│ + spstr strCommand.txt,t1Icon.txt,"~",27
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",41
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",28
|
||||
│ covx tTmp.txt,t1Speed.val,0,0
|
||||
│ if(t1Speed.val>120)
|
||||
│ {
|
||||
│ t1Speed.val=120
|
||||
│ }
|
||||
│ if(t1Speed.val<-120)
|
||||
│ {
|
||||
│ t1Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t1u.txt,"~",40
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t1o.txt,"~",39
|
||||
│ + spstr strCommand.txt,t1u.txt,"~",29
|
||||
│ if(t1Icon.txt!="")
|
||||
│ {
|
||||
│ vis t1Icon,1
|
||||
│ vis t1u,1
|
||||
│ vis h1,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t1Icon,0
|
||||
│ vis t1u,0
|
||||
│ vis h1,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",45
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",30
|
||||
│ covx tTmp.txt,t2Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t2Icon.txt,"~",44
|
||||
│ + spstr strCommand.txt,t2Icon.txt,"~",31
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",48
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",32
|
||||
│ covx tTmp.txt,t2Speed.val,0,0
|
||||
│ if(t2Speed.val>120)
|
||||
│ {
|
||||
│ t2Speed.val=120
|
||||
│ }
|
||||
│ if(t2Speed.val<-120)
|
||||
│ {
|
||||
│ t2Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t2u.txt,"~",47
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t2o.txt,"~",46
|
||||
│ + spstr strCommand.txt,t2u.txt,"~",33
|
||||
│ if(t2Icon.txt!="")
|
||||
│ {
|
||||
│ vis t2Icon,1
|
||||
│ vis t2u,1
|
||||
│ vis h2,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t2Icon,0
|
||||
│ vis t2u,0
|
||||
│ vis h2,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",52
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",34
|
||||
│ covx tTmp.txt,t3Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t3Icon.txt,"~",51
|
||||
│ + spstr strCommand.txt,t3Icon.txt,"~",35
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",55
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",36
|
||||
│ covx tTmp.txt,t3Speed.val,0,0
|
||||
│ if(t3Speed.val>120)
|
||||
│ {
|
||||
│ t3Speed.val=120
|
||||
│ }
|
||||
│ if(t3Speed.val<-120)
|
||||
│ {
|
||||
│ t3Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t3u.txt,"~",54
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t3o.txt,"~",53
|
||||
│ + spstr strCommand.txt,t3u.txt,"~",37
|
||||
│ if(t3Icon.txt!="")
|
||||
│ {
|
||||
│ vis t3Icon,1
|
||||
│ vis t3u,1
|
||||
│ vis h3,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t3Icon,0
|
||||
│ vis t3u,0
|
||||
│ vis h3,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",59
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",38
|
||||
│ covx tTmp.txt,t4Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t4Icon.txt,"~",58
|
||||
│ + spstr strCommand.txt,t4Icon.txt,"~",39
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",62
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",40
|
||||
│ covx tTmp.txt,t4Speed.val,0,0
|
||||
│ if(t4Speed.val>120)
|
||||
│ {
|
||||
│ t4Speed.val=120
|
||||
│ }
|
||||
│ if(t4Speed.val<-120)
|
||||
│ {
|
||||
│ t4Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t4u.txt,"~",61
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t4o.txt,"~",60
|
||||
│ + spstr strCommand.txt,t4u.txt,"~",41
|
||||
│ if(t4Icon.txt!="")
|
||||
│ {
|
||||
│ vis t4Icon,1
|
||||
│ vis t4u,1
|
||||
│ vis h4,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t4Icon,0
|
||||
│ vis t4u,0
|
||||
│ vis h4,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",66
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",42
|
||||
│ covx tTmp.txt,t5Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t5Icon.txt,"~",65
|
||||
│ + spstr strCommand.txt,t5Icon.txt,"~",43
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",69
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",44
|
||||
│ covx tTmp.txt,t5Speed.val,0,0
|
||||
│ if(t5Speed.val>120)
|
||||
│ {
|
||||
│ t5Speed.val=120
|
||||
│ }
|
||||
│ if(t5Speed.val<-120)
|
||||
│ {
|
||||
│ t5Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t5u.txt,"~",68
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t5o.txt,"~",67
|
||||
│ + spstr strCommand.txt,t5u.txt,"~",45
|
||||
│ if(t5Icon.txt!="")
|
||||
│ {
|
||||
│ vis t5Icon,1
|
||||
│ vis t5u,1
|
||||
│ vis h5,1
|
||||
│ }else
|
||||
│ {
|
||||
│ @@ -965,14 +891,18 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
│ if(tId.txt=="cardChart")
|
||||
│ {
|
||||
│ page cardChart
|
||||
│ }
|
||||
│ + if(tId.txt=="cardLChart")
|
||||
│ + {
|
||||
│ + page cardLChart
|
||||
│ + }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="time")
|
||||
│ {
|
||||
│ // get set time to global variable
|
||||
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||
│ }
|
||||
│ if(tInstruction.txt=="date")
|
||||
│ --- HMI/n2t-out/pageStartup.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
│ @@ -35,20 +35,14 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2023-01-30 20:21:28.702188855 +0000
|
||||
+++ /dev/fd/62 2023-02-01 21:52:45.071014440 +0000
|
||||
+I/n2t-out/Program.s.txt
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+I/n2t-out/cardEntities.txt
|
||||
@@ -54,13 +54,13 @@
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 80
|
||||
+ Max. Text Size: 40
|
||||
+
|
||||
+e (string) nent2
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 80
|
||||
+ Max. Text Size: 40
|
||||
+14 +186,26 @@
|
||||
+e (string) type6
|
||||
@@ -499,7 +499,7 @@
|
||||
+
|
||||
+e (string) nent1
|
||||
+ributes
|
||||
+5 +69,15 @@
|
||||
+6 +69,82 @@
|
||||
+ Text :
|
||||
+ Max. Text Size: 80
|
||||
+
|
||||
@@ -515,8 +515,75 @@
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+e (string) t0o
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 1
|
||||
+
|
||||
+e (int32) t1Speed
|
||||
+24 +135,14 @@
|
||||
+ributes
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+e (string) t1o
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 1
|
||||
+
|
||||
+e (int32) t2Speed
|
||||
+ributes
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+e (string) t2o
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 1
|
||||
+
|
||||
+e (int32) t3Speed
|
||||
+ributes
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+e (string) t3o
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 1
|
||||
+
|
||||
+e (int32) t4Speed
|
||||
+ributes
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+e (string) t4o
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 1
|
||||
+
|
||||
+e (int32) t5Speed
|
||||
+ributes
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+e (string) t5o
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 1
|
||||
+
|
||||
+e (string) tId
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 20
|
||||
+
|
||||
+e (string) tInstruction
|
||||
+24 +171,14 @@
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -541,7 +608,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+24 +165,14 @@
|
||||
+24 +201,14 @@
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -566,7 +633,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+24 +185,14 @@
|
||||
+24 +221,14 @@
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -591,7 +658,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+24 +205,14 @@
|
||||
+24 +241,14 @@
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -616,7 +683,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+24 +225,14 @@
|
||||
+24 +261,14 @@
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -641,7 +708,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+24 +245,14 @@
|
||||
+24 +281,14 @@
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -666,7 +733,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+85 +475,79 @@
|
||||
+85 +511,79 @@
|
||||
+ h0.val=h0.minval
|
||||
+ }
|
||||
+ if(sys0<h0.minval)
|
||||
@@ -752,275 +819,6 @@
|
||||
+ Scope : local
|
||||
+ Period (ms): 50
|
||||
+ Enabled : yes
|
||||
+14 +595,15 @@
|
||||
+ // here is the location where acual code should be
|
||||
+ // write command to variable strCommand
|
||||
+ ucopy strCommand.txt,4,payloadLength-5,0
|
||||
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||
+ spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
+ if(tInstruction.txt=="entityUpd")
|
||||
+ {
|
||||
+ // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
|
||||
+ spstr strCommand.txt,tHeading.txt,"~",1
|
||||
+ // navigation icon left
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
+ if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
+ {
|
||||
+ vis bPrev,0
|
||||
+ }else
|
||||
+202 +632,193 @@
|
||||
+ // change icon color
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",11
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ bNext.pco=sys0
|
||||
+ vis bNext,1
|
||||
+ }
|
||||
+ // icon color home
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",17
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",14
|
||||
+ covx tTmp.txt,t1.pco,0,0
|
||||
+ // icon home
|
||||
+ spstr strCommand.txt,t1.txt,"~",16
|
||||
+ spstr strCommand.txt,t1.txt,"~",15
|
||||
+ // speed 16 ignored
|
||||
+ // text home
|
||||
+ spstr strCommand.txt,tHome.txt,"~",19
|
||||
+ spstr strCommand.txt,tHome.txt,"~",17
|
||||
+ spstr tHome.txt,tHome2.txt," ",1
|
||||
+ spstr tHome.txt,tHome.txt," ",0
|
||||
+ // icon color 18 ignored
|
||||
+ // icon 19 ignored
|
||||
+ // speed 20 ignored
|
||||
+ // text home
|
||||
+ spstr strCommand.txt,tHomeO.txt,"~",26
|
||||
+ spstr strCommand.txt,tHomeO.txt,"~",21
|
||||
+ spstr tHomeO.txt,tHomeO2.txt," ",1
|
||||
+ spstr tHomeO.txt,tHomeO.txt," ",0
|
||||
+ // iconColor
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",31
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",22
|
||||
+ covx tTmp.txt,t0Icon.pco,0,0
|
||||
+ // icon
|
||||
+ spstr strCommand.txt,t0Icon.txt,"~",30
|
||||
+ spstr strCommand.txt,t0Icon.txt,"~",23
|
||||
+ // speed
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",34
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",24
|
||||
+ covx tTmp.txt,t0Speed.val,0,0
|
||||
+ if(t0Speed.val>120)
|
||||
+ {
|
||||
+ t0Speed.val=120
|
||||
+ }
|
||||
+ if(t0Speed.val<-120)
|
||||
+ {
|
||||
+ t0Speed.val=-120
|
||||
+ }
|
||||
+ // lower text
|
||||
+ spstr strCommand.txt,t0u.txt,"~",33
|
||||
+ // upper text
|
||||
+ spstr strCommand.txt,t0o.txt,"~",32
|
||||
+ spstr strCommand.txt,t0u.txt,"~",25
|
||||
+ if(t0Icon.txt!="")
|
||||
+ {
|
||||
+ vis t0Icon,1
|
||||
+ vis t0u,1
|
||||
+ vis h0,1
|
||||
+ }else
|
||||
+ {
|
||||
+ vis t0Icon,0
|
||||
+ vis t0u,0
|
||||
+ vis h0,0
|
||||
+ }
|
||||
+ // iconColor
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",38
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",26
|
||||
+ covx tTmp.txt,t1Icon.pco,0,0
|
||||
+ // icon
|
||||
+ spstr strCommand.txt,t1Icon.txt,"~",37
|
||||
+ spstr strCommand.txt,t1Icon.txt,"~",27
|
||||
+ // speed
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",41
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",28
|
||||
+ covx tTmp.txt,t1Speed.val,0,0
|
||||
+ if(t1Speed.val>120)
|
||||
+ {
|
||||
+ t1Speed.val=120
|
||||
+ }
|
||||
+ if(t1Speed.val<-120)
|
||||
+ {
|
||||
+ t1Speed.val=-120
|
||||
+ }
|
||||
+ // lower text
|
||||
+ spstr strCommand.txt,t1u.txt,"~",40
|
||||
+ // upper text
|
||||
+ spstr strCommand.txt,t1o.txt,"~",39
|
||||
+ spstr strCommand.txt,t1u.txt,"~",29
|
||||
+ if(t1Icon.txt!="")
|
||||
+ {
|
||||
+ vis t1Icon,1
|
||||
+ vis t1u,1
|
||||
+ vis h1,1
|
||||
+ }else
|
||||
+ {
|
||||
+ vis t1Icon,0
|
||||
+ vis t1u,0
|
||||
+ vis h1,0
|
||||
+ }
|
||||
+ // iconColor
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",45
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",30
|
||||
+ covx tTmp.txt,t2Icon.pco,0,0
|
||||
+ // icon
|
||||
+ spstr strCommand.txt,t2Icon.txt,"~",44
|
||||
+ spstr strCommand.txt,t2Icon.txt,"~",31
|
||||
+ // speed
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",48
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",32
|
||||
+ covx tTmp.txt,t2Speed.val,0,0
|
||||
+ if(t2Speed.val>120)
|
||||
+ {
|
||||
+ t2Speed.val=120
|
||||
+ }
|
||||
+ if(t2Speed.val<-120)
|
||||
+ {
|
||||
+ t2Speed.val=-120
|
||||
+ }
|
||||
+ // lower text
|
||||
+ spstr strCommand.txt,t2u.txt,"~",47
|
||||
+ // upper text
|
||||
+ spstr strCommand.txt,t2o.txt,"~",46
|
||||
+ spstr strCommand.txt,t2u.txt,"~",33
|
||||
+ if(t2Icon.txt!="")
|
||||
+ {
|
||||
+ vis t2Icon,1
|
||||
+ vis t2u,1
|
||||
+ vis h2,1
|
||||
+ }else
|
||||
+ {
|
||||
+ vis t2Icon,0
|
||||
+ vis t2u,0
|
||||
+ vis h2,0
|
||||
+ }
|
||||
+ // iconColor
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",52
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",34
|
||||
+ covx tTmp.txt,t3Icon.pco,0,0
|
||||
+ // icon
|
||||
+ spstr strCommand.txt,t3Icon.txt,"~",51
|
||||
+ spstr strCommand.txt,t3Icon.txt,"~",35
|
||||
+ // speed
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",55
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",36
|
||||
+ covx tTmp.txt,t3Speed.val,0,0
|
||||
+ if(t3Speed.val>120)
|
||||
+ {
|
||||
+ t3Speed.val=120
|
||||
+ }
|
||||
+ if(t3Speed.val<-120)
|
||||
+ {
|
||||
+ t3Speed.val=-120
|
||||
+ }
|
||||
+ // lower text
|
||||
+ spstr strCommand.txt,t3u.txt,"~",54
|
||||
+ // upper text
|
||||
+ spstr strCommand.txt,t3o.txt,"~",53
|
||||
+ spstr strCommand.txt,t3u.txt,"~",37
|
||||
+ if(t3Icon.txt!="")
|
||||
+ {
|
||||
+ vis t3Icon,1
|
||||
+ vis t3u,1
|
||||
+ vis h3,1
|
||||
+ }else
|
||||
+ {
|
||||
+ vis t3Icon,0
|
||||
+ vis t3u,0
|
||||
+ vis h3,0
|
||||
+ }
|
||||
+ // iconColor
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",59
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",38
|
||||
+ covx tTmp.txt,t4Icon.pco,0,0
|
||||
+ // icon
|
||||
+ spstr strCommand.txt,t4Icon.txt,"~",58
|
||||
+ spstr strCommand.txt,t4Icon.txt,"~",39
|
||||
+ // speed
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",62
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",40
|
||||
+ covx tTmp.txt,t4Speed.val,0,0
|
||||
+ if(t4Speed.val>120)
|
||||
+ {
|
||||
+ t4Speed.val=120
|
||||
+ }
|
||||
+ if(t4Speed.val<-120)
|
||||
+ {
|
||||
+ t4Speed.val=-120
|
||||
+ }
|
||||
+ // lower text
|
||||
+ spstr strCommand.txt,t4u.txt,"~",61
|
||||
+ // upper text
|
||||
+ spstr strCommand.txt,t4o.txt,"~",60
|
||||
+ spstr strCommand.txt,t4u.txt,"~",41
|
||||
+ if(t4Icon.txt!="")
|
||||
+ {
|
||||
+ vis t4Icon,1
|
||||
+ vis t4u,1
|
||||
+ vis h4,1
|
||||
+ }else
|
||||
+ {
|
||||
+ vis t4Icon,0
|
||||
+ vis t4u,0
|
||||
+ vis h4,0
|
||||
+ }
|
||||
+ // iconColor
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",66
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",42
|
||||
+ covx tTmp.txt,t5Icon.pco,0,0
|
||||
+ // icon
|
||||
+ spstr strCommand.txt,t5Icon.txt,"~",65
|
||||
+ spstr strCommand.txt,t5Icon.txt,"~",43
|
||||
+ // speed
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",69
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",44
|
||||
+ covx tTmp.txt,t5Speed.val,0,0
|
||||
+ if(t5Speed.val>120)
|
||||
+ {
|
||||
+ t5Speed.val=120
|
||||
+ }
|
||||
+ if(t5Speed.val<-120)
|
||||
+ {
|
||||
+ t5Speed.val=-120
|
||||
+ }
|
||||
+ // lower text
|
||||
+ spstr strCommand.txt,t5u.txt,"~",68
|
||||
+ // upper text
|
||||
+ spstr strCommand.txt,t5o.txt,"~",67
|
||||
+ spstr strCommand.txt,t5u.txt,"~",45
|
||||
+ if(t5Icon.txt!="")
|
||||
+ {
|
||||
+ vis t5Icon,1
|
||||
+ vis t5u,1
|
||||
+ vis h5,1
|
||||
+ }else
|
||||
+ {
|
||||
+14 +891,18 @@
|
||||
+ {
|
||||
+ page cardPower
|
||||
+ }
|
||||
+ if(tId.txt=="cardChart")
|
||||
+ {
|
||||
+ page cardChart
|
||||
+ }
|
||||
+ if(tId.txt=="cardLChart")
|
||||
+ {
|
||||
+ page cardLChart
|
||||
+ }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="time")
|
||||
+ {
|
||||
+ // get set time to global variable
|
||||
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||
+ }
|
||||
+ if(tInstruction.txt=="date")
|
||||
+I/n2t-out/pageStartup.txt
|
||||
++ HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
+0 +35,14 @@
|
||||
|
||||
@@ -92,36 +92,78 @@ Variable (int32) t0Speed
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t0o
|
||||
Attributes
|
||||
ID : 48
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t1Speed
|
||||
Attributes
|
||||
ID : 37
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t1o
|
||||
Attributes
|
||||
ID : 49
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t2Speed
|
||||
Attributes
|
||||
ID : 41
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t2o
|
||||
Attributes
|
||||
ID : 50
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t3Speed
|
||||
Attributes
|
||||
ID : 38
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t3o
|
||||
Attributes
|
||||
ID : 51
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t4Speed
|
||||
Attributes
|
||||
ID : 39
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t4o
|
||||
Attributes
|
||||
ID : 52
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t5Speed
|
||||
Attributes
|
||||
ID : 40
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t5o
|
||||
Attributes
|
||||
ID : 53
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (string) tId
|
||||
Attributes
|
||||
ID : 13
|
||||
@@ -159,7 +201,7 @@ Text t0Icon
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 50
|
||||
y coordinate : 107
|
||||
y coordinate : 108
|
||||
Width : 60
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -221,7 +263,7 @@ Text t1
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 46
|
||||
y coordinate : 237
|
||||
y coordinate : 244
|
||||
Width : 230
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -253,7 +295,7 @@ Text t1Icon
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 130
|
||||
y coordinate : 107
|
||||
y coordinate : 108
|
||||
Width : 60
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -315,7 +357,7 @@ Text t2Icon
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 210
|
||||
y coordinate : 107
|
||||
y coordinate : 108
|
||||
Width : 60
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -377,7 +419,7 @@ Text t3Icon
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 50
|
||||
y coordinate : 369
|
||||
y coordinate : 378
|
||||
Width : 60
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -409,7 +451,7 @@ Text t3u
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 38
|
||||
y coordinate : 429
|
||||
y coordinate : 439
|
||||
Width : 80
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -439,7 +481,7 @@ Text t4Icon
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 129
|
||||
y coordinate : 369
|
||||
y coordinate : 378
|
||||
Width : 60
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -471,7 +513,7 @@ Text t4u
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 118
|
||||
y coordinate : 429
|
||||
y coordinate : 439
|
||||
Width : 80
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -501,7 +543,7 @@ Text t5Icon
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 208
|
||||
y coordinate : 369
|
||||
y coordinate : 378
|
||||
Width : 60
|
||||
Height : 60
|
||||
Effect : load
|
||||
@@ -533,7 +575,7 @@ Text t5u
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 197
|
||||
y coordinate : 429
|
||||
y coordinate : 439
|
||||
Width : 80
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -592,9 +634,9 @@ Text tHome
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 179
|
||||
y coordinate : 239
|
||||
Width : 61
|
||||
x coordinate : 178
|
||||
y coordinate : 245
|
||||
Width : 60
|
||||
Height : 55
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
@@ -623,7 +665,7 @@ Text tHome2
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 239
|
||||
y coordinate : 239
|
||||
y coordinate : 246
|
||||
Width : 35
|
||||
Height : 55
|
||||
Effect : load
|
||||
@@ -653,7 +695,7 @@ Text tHomeO
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 48
|
||||
y coordinate : 240
|
||||
y coordinate : 247
|
||||
Width : 61
|
||||
Height : 55
|
||||
Effect : load
|
||||
@@ -683,7 +725,7 @@ Text tHomeO2
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 108
|
||||
y coordinate : 240
|
||||
y coordinate : 247
|
||||
Width : 35
|
||||
Height : 55
|
||||
Effect : load
|
||||
@@ -730,7 +772,7 @@ Slider h0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 61
|
||||
y coordinate : 166
|
||||
y coordinate : 169
|
||||
Width : 44
|
||||
Height : 72
|
||||
Effect : load
|
||||
@@ -755,7 +797,7 @@ Slider h1
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 139
|
||||
y coordinate : 166
|
||||
y coordinate : 169
|
||||
Width : 44
|
||||
Height : 72
|
||||
Effect : load
|
||||
@@ -780,7 +822,7 @@ Slider h2
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 217
|
||||
y coordinate : 166
|
||||
y coordinate : 169
|
||||
Width : 44
|
||||
Height : 72
|
||||
Effect : load
|
||||
@@ -805,7 +847,7 @@ Slider h3
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 61
|
||||
y coordinate : 297
|
||||
y coordinate : 305
|
||||
Width : 44
|
||||
Height : 72
|
||||
Effect : load
|
||||
@@ -830,7 +872,7 @@ Slider h4
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 139
|
||||
y coordinate : 297
|
||||
y coordinate : 305
|
||||
Width : 44
|
||||
Height : 72
|
||||
Effect : load
|
||||
@@ -855,7 +897,7 @@ Slider h5
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 217
|
||||
y coordinate : 297
|
||||
y coordinate : 305
|
||||
Width : 44
|
||||
Height : 72
|
||||
Effect : load
|
||||
@@ -1167,7 +1209,6 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
|
||||
spstr strCommand.txt,tHeading.txt,"~",1
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
@@ -1204,29 +1245,26 @@ Timer tmSerial
|
||||
vis bNext,1
|
||||
}
|
||||
// icon color home
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
covx tTmp.txt,t1.pco,0,0
|
||||
// icon home
|
||||
spstr strCommand.txt,t1.txt,"~",15
|
||||
spstr strCommand.txt,t1.txt,"~",16
|
||||
// speed 16 ignored
|
||||
// text home
|
||||
spstr strCommand.txt,tHome.txt,"~",17
|
||||
spstr strCommand.txt,tHome.txt,"~",19
|
||||
spstr tHome.txt,tHome2.txt," ",1
|
||||
spstr tHome.txt,tHome.txt," ",0
|
||||
// icon color 18 ignored
|
||||
// icon 19 ignored
|
||||
// speed 20 ignored
|
||||
// text home
|
||||
spstr strCommand.txt,tHomeO.txt,"~",21
|
||||
spstr strCommand.txt,tHomeO.txt,"~",26
|
||||
spstr tHomeO.txt,tHomeO2.txt," ",1
|
||||
spstr tHomeO.txt,tHomeO.txt," ",0
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",22
|
||||
spstr strCommand.txt,tTmp.txt,"~",31
|
||||
covx tTmp.txt,t0Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t0Icon.txt,"~",23
|
||||
spstr strCommand.txt,t0Icon.txt,"~",30
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",24
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
covx tTmp.txt,t0Speed.val,0,0
|
||||
if(t0Speed.val>120)
|
||||
{
|
||||
@@ -1237,7 +1275,9 @@ Timer tmSerial
|
||||
t0Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t0u.txt,"~",25
|
||||
spstr strCommand.txt,t0u.txt,"~",33
|
||||
// upper text
|
||||
spstr strCommand.txt,t0o.txt,"~",32
|
||||
if(t0Icon.txt!="")
|
||||
{
|
||||
vis t0Icon,1
|
||||
@@ -1250,12 +1290,12 @@ Timer tmSerial
|
||||
vis h0,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",26
|
||||
spstr strCommand.txt,tTmp.txt,"~",38
|
||||
covx tTmp.txt,t1Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t1Icon.txt,"~",27
|
||||
spstr strCommand.txt,t1Icon.txt,"~",37
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",28
|
||||
spstr strCommand.txt,tTmp.txt,"~",41
|
||||
covx tTmp.txt,t1Speed.val,0,0
|
||||
if(t1Speed.val>120)
|
||||
{
|
||||
@@ -1266,7 +1306,9 @@ Timer tmSerial
|
||||
t1Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t1u.txt,"~",29
|
||||
spstr strCommand.txt,t1u.txt,"~",40
|
||||
// upper text
|
||||
spstr strCommand.txt,t1o.txt,"~",39
|
||||
if(t1Icon.txt!="")
|
||||
{
|
||||
vis t1Icon,1
|
||||
@@ -1279,12 +1321,12 @@ Timer tmSerial
|
||||
vis h1,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",30
|
||||
spstr strCommand.txt,tTmp.txt,"~",45
|
||||
covx tTmp.txt,t2Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t2Icon.txt,"~",31
|
||||
spstr strCommand.txt,t2Icon.txt,"~",44
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",32
|
||||
spstr strCommand.txt,tTmp.txt,"~",48
|
||||
covx tTmp.txt,t2Speed.val,0,0
|
||||
if(t2Speed.val>120)
|
||||
{
|
||||
@@ -1295,7 +1337,9 @@ Timer tmSerial
|
||||
t2Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t2u.txt,"~",33
|
||||
spstr strCommand.txt,t2u.txt,"~",47
|
||||
// upper text
|
||||
spstr strCommand.txt,t2o.txt,"~",46
|
||||
if(t2Icon.txt!="")
|
||||
{
|
||||
vis t2Icon,1
|
||||
@@ -1308,12 +1352,12 @@ Timer tmSerial
|
||||
vis h2,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
spstr strCommand.txt,tTmp.txt,"~",52
|
||||
covx tTmp.txt,t3Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t3Icon.txt,"~",35
|
||||
spstr strCommand.txt,t3Icon.txt,"~",51
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",36
|
||||
spstr strCommand.txt,tTmp.txt,"~",55
|
||||
covx tTmp.txt,t3Speed.val,0,0
|
||||
if(t3Speed.val>120)
|
||||
{
|
||||
@@ -1324,7 +1368,9 @@ Timer tmSerial
|
||||
t3Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t3u.txt,"~",37
|
||||
spstr strCommand.txt,t3u.txt,"~",54
|
||||
// upper text
|
||||
spstr strCommand.txt,t3o.txt,"~",53
|
||||
if(t3Icon.txt!="")
|
||||
{
|
||||
vis t3Icon,1
|
||||
@@ -1337,12 +1383,12 @@ Timer tmSerial
|
||||
vis h3,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",38
|
||||
spstr strCommand.txt,tTmp.txt,"~",59
|
||||
covx tTmp.txt,t4Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t4Icon.txt,"~",39
|
||||
spstr strCommand.txt,t4Icon.txt,"~",58
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",40
|
||||
spstr strCommand.txt,tTmp.txt,"~",62
|
||||
covx tTmp.txt,t4Speed.val,0,0
|
||||
if(t4Speed.val>120)
|
||||
{
|
||||
@@ -1353,7 +1399,9 @@ Timer tmSerial
|
||||
t4Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t4u.txt,"~",41
|
||||
spstr strCommand.txt,t4u.txt,"~",61
|
||||
// upper text
|
||||
spstr strCommand.txt,t4o.txt,"~",60
|
||||
if(t4Icon.txt!="")
|
||||
{
|
||||
vis t4Icon,1
|
||||
@@ -1366,12 +1414,12 @@ Timer tmSerial
|
||||
vis h4,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",42
|
||||
spstr strCommand.txt,tTmp.txt,"~",66
|
||||
covx tTmp.txt,t5Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t5Icon.txt,"~",43
|
||||
spstr strCommand.txt,t5Icon.txt,"~",65
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",44
|
||||
spstr strCommand.txt,tTmp.txt,"~",69
|
||||
covx tTmp.txt,t5Speed.val,0,0
|
||||
if(t5Speed.val>120)
|
||||
{
|
||||
@@ -1382,7 +1430,9 @@ Timer tmSerial
|
||||
t5Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t5u.txt,"~",45
|
||||
spstr strCommand.txt,t5u.txt,"~",68
|
||||
// upper text
|
||||
spstr strCommand.txt,t5o.txt,"~",67
|
||||
if(t5Icon.txt!="")
|
||||
{
|
||||
vis t5Icon,1
|
||||
@@ -1463,10 +1513,6 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -34,6 +34,10 @@ cardQR
|
||||
34 Component(s)
|
||||
402 Line(s) of event code
|
||||
234 Unique line(s) of event code
|
||||
cardPower
|
||||
54 Component(s)
|
||||
489 Line(s) of event code
|
||||
330 Unique line(s) of event code
|
||||
cardGrid
|
||||
44 Component(s)
|
||||
515 Line(s) of event code
|
||||
@@ -74,10 +78,6 @@ popupInSel
|
||||
34 Component(s)
|
||||
617 Line(s) of event code
|
||||
295 Unique line(s) of event code
|
||||
cardPower
|
||||
48 Component(s)
|
||||
487 Line(s) of event code
|
||||
326 Unique line(s) of event code
|
||||
cardEntities
|
||||
91 Component(s)
|
||||
1622 Line(s) of event code
|
||||
@@ -85,6 +85,6 @@ cardEntities
|
||||
|
||||
Total
|
||||
20 Page(s)
|
||||
747 Component(s)
|
||||
9205 Line(s) of event code
|
||||
2383 Unique line(s) of event code
|
||||
753 Component(s)
|
||||
9207 Line(s) of event code
|
||||
2393 Unique line(s) of event code
|
||||
|
||||
@@ -80,31 +80,67 @@ Variable (int32) t0Speed
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t0o
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t1Speed
|
||||
Attributes
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t1o
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t2Speed
|
||||
Attributes
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t2o
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t3Speed
|
||||
Attributes
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t3o
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t4Speed
|
||||
Attributes
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t4o
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (int32) t5Speed
|
||||
Attributes
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (string) t5o
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 1
|
||||
|
||||
Variable (string) tId
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -599,7 +635,6 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
|
||||
spstr strCommand.txt,tHeading.txt,"~",1
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
@@ -636,29 +671,26 @@ Timer tmSerial
|
||||
vis bNext,1
|
||||
}
|
||||
// icon color home
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
covx tTmp.txt,t1.pco,0,0
|
||||
// icon home
|
||||
spstr strCommand.txt,t1.txt,"~",15
|
||||
spstr strCommand.txt,t1.txt,"~",16
|
||||
// speed 16 ignored
|
||||
// text home
|
||||
spstr strCommand.txt,tHome.txt,"~",17
|
||||
spstr strCommand.txt,tHome.txt,"~",19
|
||||
spstr tHome.txt,tHome2.txt," ",1
|
||||
spstr tHome.txt,tHome.txt," ",0
|
||||
// icon color 18 ignored
|
||||
// icon 19 ignored
|
||||
// speed 20 ignored
|
||||
// text home
|
||||
spstr strCommand.txt,tHomeO.txt,"~",21
|
||||
spstr strCommand.txt,tHomeO.txt,"~",26
|
||||
spstr tHomeO.txt,tHomeO2.txt," ",1
|
||||
spstr tHomeO.txt,tHomeO.txt," ",0
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",22
|
||||
spstr strCommand.txt,tTmp.txt,"~",31
|
||||
covx tTmp.txt,t0Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t0Icon.txt,"~",23
|
||||
spstr strCommand.txt,t0Icon.txt,"~",30
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",24
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
covx tTmp.txt,t0Speed.val,0,0
|
||||
if(t0Speed.val>120)
|
||||
{
|
||||
@@ -669,7 +701,9 @@ Timer tmSerial
|
||||
t0Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t0u.txt,"~",25
|
||||
spstr strCommand.txt,t0u.txt,"~",33
|
||||
// upper text
|
||||
spstr strCommand.txt,t0o.txt,"~",32
|
||||
if(t0Icon.txt!="")
|
||||
{
|
||||
vis t0Icon,1
|
||||
@@ -682,12 +716,12 @@ Timer tmSerial
|
||||
vis h0,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",26
|
||||
spstr strCommand.txt,tTmp.txt,"~",38
|
||||
covx tTmp.txt,t1Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t1Icon.txt,"~",27
|
||||
spstr strCommand.txt,t1Icon.txt,"~",37
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",28
|
||||
spstr strCommand.txt,tTmp.txt,"~",41
|
||||
covx tTmp.txt,t1Speed.val,0,0
|
||||
if(t1Speed.val>120)
|
||||
{
|
||||
@@ -698,7 +732,9 @@ Timer tmSerial
|
||||
t1Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t1u.txt,"~",29
|
||||
spstr strCommand.txt,t1u.txt,"~",40
|
||||
// upper text
|
||||
spstr strCommand.txt,t1o.txt,"~",39
|
||||
if(t1Icon.txt!="")
|
||||
{
|
||||
vis t1Icon,1
|
||||
@@ -711,12 +747,12 @@ Timer tmSerial
|
||||
vis h1,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",30
|
||||
spstr strCommand.txt,tTmp.txt,"~",45
|
||||
covx tTmp.txt,t2Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t2Icon.txt,"~",31
|
||||
spstr strCommand.txt,t2Icon.txt,"~",44
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",32
|
||||
spstr strCommand.txt,tTmp.txt,"~",48
|
||||
covx tTmp.txt,t2Speed.val,0,0
|
||||
if(t2Speed.val>120)
|
||||
{
|
||||
@@ -727,7 +763,9 @@ Timer tmSerial
|
||||
t2Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t2u.txt,"~",33
|
||||
spstr strCommand.txt,t2u.txt,"~",47
|
||||
// upper text
|
||||
spstr strCommand.txt,t2o.txt,"~",46
|
||||
if(t2Icon.txt!="")
|
||||
{
|
||||
vis t2Icon,1
|
||||
@@ -740,12 +778,12 @@ Timer tmSerial
|
||||
vis h2,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
spstr strCommand.txt,tTmp.txt,"~",52
|
||||
covx tTmp.txt,t3Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t3Icon.txt,"~",35
|
||||
spstr strCommand.txt,t3Icon.txt,"~",51
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",36
|
||||
spstr strCommand.txt,tTmp.txt,"~",55
|
||||
covx tTmp.txt,t3Speed.val,0,0
|
||||
if(t3Speed.val>120)
|
||||
{
|
||||
@@ -756,7 +794,9 @@ Timer tmSerial
|
||||
t3Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t3u.txt,"~",37
|
||||
spstr strCommand.txt,t3u.txt,"~",54
|
||||
// upper text
|
||||
spstr strCommand.txt,t3o.txt,"~",53
|
||||
if(t3Icon.txt!="")
|
||||
{
|
||||
vis t3Icon,1
|
||||
@@ -769,12 +809,12 @@ Timer tmSerial
|
||||
vis h3,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",38
|
||||
spstr strCommand.txt,tTmp.txt,"~",59
|
||||
covx tTmp.txt,t4Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t4Icon.txt,"~",39
|
||||
spstr strCommand.txt,t4Icon.txt,"~",58
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",40
|
||||
spstr strCommand.txt,tTmp.txt,"~",62
|
||||
covx tTmp.txt,t4Speed.val,0,0
|
||||
if(t4Speed.val>120)
|
||||
{
|
||||
@@ -785,7 +825,9 @@ Timer tmSerial
|
||||
t4Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t4u.txt,"~",41
|
||||
spstr strCommand.txt,t4u.txt,"~",61
|
||||
// upper text
|
||||
spstr strCommand.txt,t4o.txt,"~",60
|
||||
if(t4Icon.txt!="")
|
||||
{
|
||||
vis t4Icon,1
|
||||
@@ -798,12 +840,12 @@ Timer tmSerial
|
||||
vis h4,0
|
||||
}
|
||||
// iconColor
|
||||
spstr strCommand.txt,tTmp.txt,"~",42
|
||||
spstr strCommand.txt,tTmp.txt,"~",66
|
||||
covx tTmp.txt,t5Icon.pco,0,0
|
||||
// icon
|
||||
spstr strCommand.txt,t5Icon.txt,"~",43
|
||||
spstr strCommand.txt,t5Icon.txt,"~",65
|
||||
// speed
|
||||
spstr strCommand.txt,tTmp.txt,"~",44
|
||||
spstr strCommand.txt,tTmp.txt,"~",69
|
||||
covx tTmp.txt,t5Speed.val,0,0
|
||||
if(t5Speed.val>120)
|
||||
{
|
||||
@@ -814,7 +856,9 @@ Timer tmSerial
|
||||
t5Speed.val=-120
|
||||
}
|
||||
// lower text
|
||||
spstr strCommand.txt,t5u.txt,"~",45
|
||||
spstr strCommand.txt,t5u.txt,"~",68
|
||||
// upper text
|
||||
spstr strCommand.txt,t5o.txt,"~",67
|
||||
if(t5Icon.txt!="")
|
||||
{
|
||||
vis t5Icon,1
|
||||
@@ -895,10 +939,6 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import datetime
|
||||
import dateutil.parser as dp
|
||||
import time
|
||||
|
||||
import apis
|
||||
|
||||
|
||||
Reference in New Issue
Block a user