h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-24 15:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix flicker on speed 0 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-01-14 14:44:36 +00:00
committed by github-actions[bot]
parent e3fe22e915
commit 3a056e770e
6 changed files with 564 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
HMI/US/landscape/diff-eu-version.txt
View File

@@ -586,7 +586,148 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -618,141 +588,131 @@ │ @@ -463,92 +433,74 @@
│ Attributes
│ Scope : local
│ Period (ms): 100
│ Enabled : yes
│
│ Events
│ Timer Event
│ - if(t0Speed.val!=0)
│ + sys0=h0.val+t0Speed.val
│ + if(sys0>h0.maxval)
│ {
│ - 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=h0.minval
│ }
│ - if(t1Speed.val!=0)
│ + if(sys0<h0.minval)
│ {
│ - 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
│ + h0.val=h0.maxval
│ }
│ - if(t2Speed.val!=0)
│ + h0.val+=t0Speed.val
│ + sys0=h1.val+t1Speed.val
│ + if(sys0>h1.maxval)
│ {
│ - 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
│ + h1.val=h1.minval
│ }
│ - if(t3Speed.val!=0)
│ + if(sys0<h1.minval)
│ {
│ - 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
│ + h1.val=h1.maxval
│ }
│ - if(t4Speed.val!=0)
│ + h1.val+=t1Speed.val
│ + sys0=h2.val+t2Speed.val
│ + if(sys0>h2.maxval)
│ {
│ - 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
│ + h2.val=h2.minval
│ }
│ - if(t5Speed.val!=0)
│ + if(sys0<h2.minval)
│ {
│ - 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
│ + h2.val=h2.maxval
│ + }
│ + 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
│ + 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
│ + 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
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│
│ @@ -636,141 +588,131 @@
│ vis bNext,1 │ vis bNext,1
│ } │ }
│ // icon color home │ // icon color home

143
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1601,7 +1601,148 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -618,141 +588,131 @@ │ @@ -463,92 +433,74 @@
│ Attributes
│ Scope : local
│ Period (ms): 100
│ Enabled : yes
│
│ Events
│ Timer Event
│ - if(t0Speed.val!=0)
│ + sys0=h0.val+t0Speed.val
│ + if(sys0>h0.maxval)
│ {
│ - 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=h0.minval
│ }
│ - if(t1Speed.val!=0)
│ + if(sys0<h0.minval)
│ {
│ - 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
│ + h0.val=h0.maxval
│ }
│ - if(t2Speed.val!=0)
│ + h0.val+=t0Speed.val
│ + sys0=h1.val+t1Speed.val
│ + if(sys0>h1.maxval)
│ {
│ - 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
│ + h1.val=h1.minval
│ }
│ - if(t3Speed.val!=0)
│ + if(sys0<h1.minval)
│ {
│ - 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
│ + h1.val=h1.maxval
│ }
│ - if(t4Speed.val!=0)
│ + h1.val+=t1Speed.val
│ + sys0=h2.val+t2Speed.val
│ + if(sys0>h2.maxval)
│ {
│ - 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
│ + h2.val=h2.minval
│ }
│ - if(t5Speed.val!=0)
│ + if(sys0<h2.minval)
│ {
│ - 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
│ + h2.val=h2.maxval
│ + }
│ + 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
│ + 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
│ + 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
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│
│ @@ -636,141 +588,131 @@
│ vis bNext,1 │ vis bNext,1
│ } │ }
│ // icon color home │ // icon color home

143
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-14 13:50:48.538380619 +0000 +++ /dev/fd/62 2023-01-14 14:44:28.229131210 +0000
+le list +le list
+ +1,12 @@ + +1,12 @@
+.s.txt +.s.txt
@@ -1020,6 +1020,147 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ +
+92 +433,74 @@
+ributes
+ Scope : local
+ Period (ms): 100
+ Enabled : yes
+
+nts
+ Timer Event
+ if(t0Speed.val!=0)
+ sys0=h0.val+t0Speed.val
+ if(sys0>h0.maxval)
+ {
+ 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=h0.minval
+ }
+ if(t1Speed.val!=0)
+ if(sys0<h0.minval)
+ {
+ 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
+ h0.val=h0.maxval
+ }
+ if(t2Speed.val!=0)
+ h0.val+=t0Speed.val
+ sys0=h1.val+t1Speed.val
+ if(sys0>h1.maxval)
+ {
+ 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
+ h1.val=h1.minval
+ }
+ if(t3Speed.val!=0)
+ if(sys0<h1.minval)
+ {
+ 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
+ h1.val=h1.maxval
+ }
+ if(t4Speed.val!=0)
+ h1.val+=t1Speed.val
+ sys0=h2.val+t2Speed.val
+ if(sys0>h2.maxval)
+ {
+ 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
+ h2.val=h2.minval
+ }
+ if(t5Speed.val!=0)
+ if(sys0<h2.minval)
+ {
+ 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
+ h2.val=h2.maxval
+ }
+ 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
+ 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
+ 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
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+
+141 +588,131 @@ +141 +588,131 @@
+ vis bNext,1 + vis bNext,1
+ } + }

18
HMI/n2t-out-visual/cardPower.txt
View File

@@ -1034,6 +1034,8 @@ Timer tm0
Events Events
Timer Event Timer Event
if(t0Speed.val!=0)
{
sys0=h0.val+t0Speed.val sys0=h0.val+t0Speed.val
if(sys0>h0.maxval) if(sys0>h0.maxval)
{ {
@@ -1044,6 +1046,9 @@ Timer tm0
h0.val=h0.maxval h0.val=h0.maxval
} }
h0.val+=t0Speed.val h0.val+=t0Speed.val
}
if(t1Speed.val!=0)
{
sys0=h1.val+t1Speed.val sys0=h1.val+t1Speed.val
if(sys0>h1.maxval) if(sys0>h1.maxval)
{ {
@@ -1054,6 +1059,9 @@ Timer tm0
h1.val=h1.maxval h1.val=h1.maxval
} }
h1.val+=t1Speed.val h1.val+=t1Speed.val
}
if(t2Speed.val!=0)
{
sys0=h2.val+t2Speed.val sys0=h2.val+t2Speed.val
if(sys0>h2.maxval) if(sys0>h2.maxval)
{ {
@@ -1064,6 +1072,9 @@ Timer tm0
h2.val=h2.maxval h2.val=h2.maxval
} }
h2.val+=t2Speed.val h2.val+=t2Speed.val
}
if(t3Speed.val!=0)
{
sys0=h3.val+t3Speed.val sys0=h3.val+t3Speed.val
if(sys0>h3.maxval) if(sys0>h3.maxval)
{ {
@@ -1074,6 +1085,9 @@ Timer tm0
h3.val=h3.maxval h3.val=h3.maxval
} }
h3.val+=t3Speed.val h3.val+=t3Speed.val
}
if(t4Speed.val!=0)
{
sys0=h4.val+t4Speed.val sys0=h4.val+t4Speed.val
if(sys0>h4.maxval) if(sys0>h4.maxval)
{ {
@@ -1084,6 +1098,9 @@ Timer tm0
h4.val=h4.maxval h4.val=h4.maxval
} }
h4.val+=t4Speed.val h4.val+=t4Speed.val
}
if(t5Speed.val!=0)
{
sys0=h5.val+t5Speed.val sys0=h5.val+t5Speed.val
if(sys0>h5.maxval) if(sys0>h5.maxval)
{ {
@@ -1094,6 +1111,7 @@ Timer tm0
h5.val=h5.maxval h5.val=h5.maxval
} }
h5.val+=t5Speed.val h5.val+=t5Speed.val
}
Timer tmSerial Timer tmSerial
Attributes Attributes

12
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -46,10 +46,6 @@ screensaver
47 Component(s) 47 Component(s)
443 Line(s) of event code 443 Line(s) of event code
311 Unique line(s) of event code 311 Unique line(s) of event code
cardPower
48 Component(s)
417 Line(s) of event code
294 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -62,6 +58,10 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
cardPower
48 Component(s)
435 Line(s) of event code
300 Unique line(s) of event code
cardMedia cardMedia
59 Component(s) 59 Component(s)
641 Line(s) of event code 641 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
737 Component(s) 737 Component(s)
8736 Line(s) of event code 8754 Line(s) of event code
2241 Unique line(s) of event code 2247 Unique line(s) of event code

18
HMI/n2t-out/cardPower.txt
View File

@@ -467,6 +467,8 @@ Timer tm0
Events Events
Timer Event Timer Event
if(t0Speed.val!=0)
{
sys0=h0.val+t0Speed.val sys0=h0.val+t0Speed.val
if(sys0>h0.maxval) if(sys0>h0.maxval)
{ {
@@ -477,6 +479,9 @@ Timer tm0
h0.val=h0.maxval h0.val=h0.maxval
} }
h0.val+=t0Speed.val h0.val+=t0Speed.val
}
if(t1Speed.val!=0)
{
sys0=h1.val+t1Speed.val sys0=h1.val+t1Speed.val
if(sys0>h1.maxval) if(sys0>h1.maxval)
{ {
@@ -487,6 +492,9 @@ Timer tm0
h1.val=h1.maxval h1.val=h1.maxval
} }
h1.val+=t1Speed.val h1.val+=t1Speed.val
}
if(t2Speed.val!=0)
{
sys0=h2.val+t2Speed.val sys0=h2.val+t2Speed.val
if(sys0>h2.maxval) if(sys0>h2.maxval)
{ {
@@ -497,6 +505,9 @@ Timer tm0
h2.val=h2.maxval h2.val=h2.maxval
} }
h2.val+=t2Speed.val h2.val+=t2Speed.val
}
if(t3Speed.val!=0)
{
sys0=h3.val+t3Speed.val sys0=h3.val+t3Speed.val
if(sys0>h3.maxval) if(sys0>h3.maxval)
{ {
@@ -507,6 +518,9 @@ Timer tm0
h3.val=h3.maxval h3.val=h3.maxval
} }
h3.val+=t3Speed.val h3.val+=t3Speed.val
}
if(t4Speed.val!=0)
{
sys0=h4.val+t4Speed.val sys0=h4.val+t4Speed.val
if(sys0>h4.maxval) if(sys0>h4.maxval)
{ {
@@ -517,6 +531,9 @@ Timer tm0
h4.val=h4.maxval h4.val=h4.maxval
} }
h4.val+=t4Speed.val h4.val+=t4Speed.val
}
if(t5Speed.val!=0)
{
sys0=h5.val+t5Speed.val sys0=h5.val+t5Speed.val
if(sys0>h5.maxval) if(sys0>h5.maxval)
{ {
@@ -527,6 +544,7 @@ Timer tm0
h5.val=h5.maxval h5.val=h5.maxval
} }
h5.val+=t5Speed.val h5.val+=t5Speed.val
}
Timer tmSerial Timer tmSerial
Attributes Attributes