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

fix #727 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-01-30 16:39:37 +00:00
committed by github-actions[bot]
parent 15436c04cb
commit 77b3d7e324
14 changed files with 316 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,93 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -475,85 +475,79 @@
│ h0.val=h0.minval
│ }
│ if(sys0<h0.minval)
│ {
│ h0.val=h0.maxval
│ }
│ h0.val+=t0Speed.val
│ - ref t0u
│ }
│ if(t1Speed.val!=0)
│ {
│ 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
│ - ref t1u
│ }
│ if(t2Speed.val!=0)
│ {
│ 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
│ - ref t2u
│ }
│ if(t3Speed.val!=0)
│ {
│ 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
│ - ref t3u
│ }
│ if(t4Speed.val!=0)
│ {
│ 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
│ - ref t4u
│ }
│ if(t5Speed.val!=0)
│ {
│ 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
│ - ref t5u
│ }
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -179,15 +179,15 @@
@@ -36,7 +124,7 @@
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 400
│ Max. Text Size: 600
│
│ Variable (string) strTmp
│ @@ -103,35 +100,14 @@

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -46,6 +46,10 @@ pageStartup
20 Component(s)
185 Line(s) of event code
131 Unique line(s) of event code
screensaver
46 Component(s)
418 Line(s) of event code
298 Unique line(s) of event code
cardGrid
44 Component(s)
515 Line(s) of event code
@@ -78,10 +82,6 @@ cardPower
48 Component(s)
487 Line(s) of event code
326 Unique line(s) of event code
screensaver
46 Component(s)
418 Line(s) of event code
299 Unique line(s) of event code
Total
20 Page(s)

6
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -46,7 +46,7 @@ Variable (string) strCommand
ID : 4
Scope : local
Text :
Max. Text Size: 400
Max. Text Size: 600
Variable (string) strTmp
Attributes
@@ -1238,9 +1238,7 @@ Timer tmSerial
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tMainTextAlt2.pco,0,0
//spstr strCommand.txt,tTmp.txt,"~",16
//covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320)
{

6
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -37,7 +37,7 @@ Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 400
Max. Text Size: 600
Variable (string) strTmp
Attributes
@@ -665,9 +665,7 @@ Timer tmSerial
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tMainTextAlt2.pco,0,0
//spstr strCommand.txt,tTmp.txt,"~",16
//covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320)
{

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

@@ -1047,6 +1047,94 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -475,85 +475,79 @@
│ h0.val=h0.minval
│ }
│ if(sys0<h0.minval)
│ {
│ h0.val=h0.maxval
│ }
│ h0.val+=t0Speed.val
│ - ref t0u
│ }
│ if(t1Speed.val!=0)
│ {
│ 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
│ - ref t1u
│ }
│ if(t2Speed.val!=0)
│ {
│ 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
│ - ref t2u
│ }
│ if(t3Speed.val!=0)
│ {
│ 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
│ - ref t3u
│ }
│ if(t4Speed.val!=0)
│ {
│ 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
│ - ref t4u
│ }
│ if(t5Speed.val!=0)
│ {
│ 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
│ - ref t5u
│ }
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@
@@ -1121,7 +1209,7 @@
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 400
│ Max. Text Size: 600
│
│ Variable (string) strTmp
│ @@ -103,35 +100,14 @@

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-25 19:09:43.447986033 +0000
+++ /dev/fd/62 2023-01-30 16:39:29.795510871 +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
@@ -466,6 +466,94 @@
+ covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0
+ }
+I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt
+85 +475,79 @@
+ h0.val=h0.minval
+ }
+ if(sys0<h0.minval)
+ {
+ h0.val=h0.maxval
+ }
+ h0.val+=t0Speed.val
+ ref t0u
+ }
+ if(t1Speed.val!=0)
+ {
+ 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
+ ref t1u
+ }
+ if(t2Speed.val!=0)
+ {
+ 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
+ ref t2u
+ }
+ if(t3Speed.val!=0)
+ {
+ 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
+ ref t3u
+ }
+ if(t4Speed.val!=0)
+ {
+ 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
+ ref t4u
+ }
+ if(t5Speed.val!=0)
+ {
+ 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
+ ref t5u
+ }
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@
@@ -506,7 +594,7 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 400
+ Max. Text Size: 600
+
+e (string) strTmp
+35 +100,14 @@

2
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -61,7 +61,7 @@ cardChart
screensaver
46 Component(s)
418 Line(s) of event code
299 Unique line(s) of event code
298 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code

6
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -46,7 +46,7 @@ Variable (string) strCommand
ID : 4
Scope : local
Text :
Max. Text Size: 400
Max. Text Size: 600
Variable (string) strTmp
Attributes
@@ -1238,9 +1238,7 @@ Timer tmSerial
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tMainTextAlt2.pco,0,0
//spstr strCommand.txt,tTmp.txt,"~",16
//covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320)
{

6
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -37,7 +37,7 @@ Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 400
Max. Text Size: 600
Variable (string) strTmp
Attributes
@@ -665,9 +665,7 @@ Timer tmSerial
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tMainTextAlt2.pco,0,0
//spstr strCommand.txt,tTmp.txt,"~",16
//covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320)
{