diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 40e70606..19593d46 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -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 +18 +833,14 @@ + { diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index 31ec4836..15f5874c 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -74,37 +74,37 @@ Variable (int32) t0Speed Attributes ID : 36 Scope: local - Value: 0 + Value: 1 Variable (int32) t1Speed Attributes ID : 37 Scope: local - Value: 0 + Value: 2 Variable (int32) t3Speed Attributes ID : 38 Scope: local - Value: 0 + Value: 3 Variable (int32) t4Speed Attributes ID : 39 Scope: local - Value: 0 + Value: 4294967295 Variable (int32) t5Speed Attributes ID : 40 Scope: local - Value: 0 + Value: 4294967294 Variable (int32) t2Speed Attributes ID : 41 Scope: local - Value: 0 + Value: 4294967293 Text tHeading Attributes @@ -1273,42 +1273,66 @@ Timer tm0 Events Timer Event + sys0=h0.val+t0Speed.val + if(sys0>h0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys0=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 Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 2d14119e..4c7910c2 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -42,10 +42,6 @@ popupShutter 25 Component(s) 393 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 32 Component(s) 408 Line(s) of event code @@ -62,9 +58,13 @@ cardEntities 65 Component(s) 1136 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 15 Page(s) 488 Component(s) - 5725 Line(s) of event code - 1530 Unique line(s) of event code + 5749 Line(s) of event code + 1542 Unique line(s) of event code diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index 47ab3fce..b600b6ea 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -60,32 +60,32 @@ Variable (string) tInstruction Variable (int32) t0Speed Attributes Scope: local - Value: 0 + Value: 1 Variable (int32) t1Speed Attributes Scope: local - Value: 0 + Value: 2 Variable (int32) t3Speed Attributes Scope: local - Value: 0 + Value: 3 Variable (int32) t4Speed Attributes Scope: local - Value: 0 + Value: 4294967295 Variable (int32) t5Speed Attributes Scope: local - Value: 0 + Value: 4294967294 Variable (int32) t2Speed Attributes Scope: local - Value: 0 + Value: 4294967293 Text tHeading Attributes @@ -766,42 +766,66 @@ Timer tm0 Events Timer Event + sys0=h0.val+t0Speed.val + if(sys0>h0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys0=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 Attributes