update cardPower (add nextion2text)

This commit is contained in:
joBr99
2022-10-07 15:38:53 +00:00
committed by github-actions[bot]
parent 8c6085f3c1
commit 62e9ba8371
4 changed files with 127 additions and 79 deletions

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-09-26 13:45:52.701819549 +0000 +++ /dev/fd/62 2022-10-07 15:38:49.884364386 +0000
+rdAlarm.txt +rdAlarm.txt
+18 +833,14 @@ +18 +833,14 @@
+ { + {

View File

@@ -74,37 +74,37 @@ Variable (int32) t0Speed
Attributes Attributes
ID : 36 ID : 36
Scope: local Scope: local
Value: 0 Value: 1
Variable (int32) t1Speed Variable (int32) t1Speed
Attributes Attributes
ID : 37 ID : 37
Scope: local Scope: local
Value: 0 Value: 2
Variable (int32) t3Speed Variable (int32) t3Speed
Attributes Attributes
ID : 38 ID : 38
Scope: local Scope: local
Value: 0 Value: 3
Variable (int32) t4Speed Variable (int32) t4Speed
Attributes Attributes
ID : 39 ID : 39
Scope: local Scope: local
Value: 0 Value: 4294967295
Variable (int32) t5Speed Variable (int32) t5Speed
Attributes Attributes
ID : 40 ID : 40
Scope: local Scope: local
Value: 0 Value: 4294967294
Variable (int32) t2Speed Variable (int32) t2Speed
Attributes Attributes
ID : 41 ID : 41
Scope: local Scope: local
Value: 0 Value: 4294967293
Text tHeading Text tHeading
Attributes Attributes
@@ -1273,42 +1273,66 @@ Timer tm0
Events Events
Timer Event Timer Event
sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val h0.val+=t0Speed.val
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val h1.val+=t1Speed.val
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val h5.val+=t5Speed.val
if(h0.val>=100&&h0.val<=150)
{
h0.val=0
}
if(h1.val>=100&&h1.val<=150)
{
h1.val=0
}
if(h2.val>=100&&h2.val<=150)
{
h2.val=0
}
if(h3.val>=100&&h3.val<=150)
{
h3.val=0
}
if(h4.val>=100&&h4.val<=150)
{
h4.val=0
}
if(h5.val>=100&&h5.val<=150)
{
h5.val=0
}
ref t0u
ref t1u
ref t2u
ref t3u
ref t4u
ref t5u
TouchCap tc0 TouchCap tc0
Attributes Attributes

View File

@@ -42,10 +42,6 @@ popupShutter
25 Component(s) 25 Component(s)
393 Line(s) of event code 393 Line(s) of event code
214 Unique line(s) of event code 214 Unique line(s) of event code
cardPower
43 Component(s)
364 Line(s) of event code
256 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
408 Line(s) of event code 408 Line(s) of event code
@@ -62,9 +58,13 @@ cardEntities
65 Component(s) 65 Component(s)
1136 Line(s) of event code 1136 Line(s) of event code
521 Unique line(s) of event code 521 Unique line(s) of event code
cardPower
43 Component(s)
388 Line(s) of event code
268 Unique line(s) of event code
Total Total
15 Page(s) 15 Page(s)
488 Component(s) 488 Component(s)
5725 Line(s) of event code 5749 Line(s) of event code
1530 Unique line(s) of event code 1542 Unique line(s) of event code

View File

@@ -60,32 +60,32 @@ Variable (string) tInstruction
Variable (int32) t0Speed Variable (int32) t0Speed
Attributes Attributes
Scope: local Scope: local
Value: 0 Value: 1
Variable (int32) t1Speed Variable (int32) t1Speed
Attributes Attributes
Scope: local Scope: local
Value: 0 Value: 2
Variable (int32) t3Speed Variable (int32) t3Speed
Attributes Attributes
Scope: local Scope: local
Value: 0 Value: 3
Variable (int32) t4Speed Variable (int32) t4Speed
Attributes Attributes
Scope: local Scope: local
Value: 0 Value: 4294967295
Variable (int32) t5Speed Variable (int32) t5Speed
Attributes Attributes
Scope: local Scope: local
Value: 0 Value: 4294967294
Variable (int32) t2Speed Variable (int32) t2Speed
Attributes Attributes
Scope: local Scope: local
Value: 0 Value: 4294967293
Text tHeading Text tHeading
Attributes Attributes
@@ -766,42 +766,66 @@ Timer tm0
Events Events
Timer Event Timer Event
sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val h0.val+=t0Speed.val
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val h1.val+=t1Speed.val
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val h5.val+=t5Speed.val
if(h0.val>=100&&h0.val<=150)
{
h0.val=0
}
if(h1.val>=100&&h1.val<=150)
{
h1.val=0
}
if(h2.val>=100&&h2.val<=150)
{
h2.val=0
}
if(h3.val>=100&&h3.val<=150)
{
h3.val=0
}
if(h4.val>=100&&h4.val<=150)
{
h4.val=0
}
if(h5.val>=100&&h5.val<=150)
{
h5.val=0
}
ref t0u
ref t1u
ref t2u
ref t3u
ref t4u
ref t5u
TouchCap tc0 TouchCap tc0
Attributes Attributes