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

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-01-11 21:44:58 +00:00
committed by github-actions[bot]
parent 99e3e3e773
commit a9ffbff2ed
10 changed files with 206 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,45 @@
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -173,15 +173,15 @@
│ @@ -35,20 +35,14 @@
│
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 50
│
│ -Variable (string) strTmp
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 2
│ -
│ Number frame_ptr
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -145,15 +139,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 30
│ + Max. Text Size : 10
│
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -179,15 +173,15 @@
│ Max. Text Size : 10
│
│ Events
@@ -215,7 +253,7 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -360,18 +360,14 @@
│ @@ -366,18 +360,14 @@
│ {
│ page cardPower
│ }
@@ -280,7 +318,7 @@
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ -
│ Text t10

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

@@ -1227,7 +1227,28 @@
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -118,15 +118,15 @@
│ @@ -35,20 +35,14 @@
│
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 50
│
│ -Variable (string) strTmp
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 2
│ -
│ Number frame_ptr
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -124,15 +118,15 @@
│ Text tMsg3
│ Attributes
│ Scope : local
@@ -1244,7 +1265,24 @@
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -173,15 +173,15 @@
│ @@ -145,15 +139,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 30
│ + Max. Text Size : 10
│
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -179,15 +173,15 @@
│ Max. Text Size : 10
│
│ Events
@@ -1261,7 +1299,7 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -360,18 +360,14 @@
│ @@ -366,18 +360,14 @@
│ {
│ page cardPower
│ }
@@ -1338,7 +1376,7 @@
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ -
│ Text t10

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-11 20:23:01.977591134 +0000
+++ /dev/fd/62 2023-01-11 21:44:49.861477938 +0000
+le list
+ +1,12 @@
+.s.txt
@@ -646,6 +646,44 @@
+ if(tInstruction.txt=="date")
+I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 50
+
+e (string) strTmp
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 2
+
+frame_ptr
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+15 +139,15 @@
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 30
+ Max. Text Size : 10
+
+ersion
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+18 +360,14 @@
+ {
+ page cardPower
@@ -723,7 +761,7 @@
+ for(sys0=0;sys0<sys1;sys0++)
+ {
+ substr tTmp.txt,strTmp.txt,sys0,1
+ xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
+ xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
+ }
+
+0

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

@@ -26,18 +26,22 @@ cardLChart
33 Component(s)
408 Line(s) of event code
268 Unique line(s) of event code
screensaver
47 Component(s)
443 Line(s) of event code
311 Unique line(s) of event code
pageStartup
19 Component(s)
185 Line(s) of event code
131 Unique line(s) of event code
pageTest
26 Component(s)
68 Line(s) of event code
66 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
204 Unique line(s) of event code
pageStartup
20 Component(s)
185 Line(s) of event code
131 Unique line(s) of event code
screensaver
47 Component(s)
443 Line(s) of event code
311 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
@@ -62,10 +66,6 @@ cardAlarm
42 Component(s)
419 Line(s) of event code
255 Unique line(s) of event code
pageTest
24 Component(s)
68 Line(s) of event code
66 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
@@ -85,6 +85,6 @@ cardEntities
Total
20 Page(s)
730 Component(s)
733 Component(s)
8695 Line(s) of event code
2223 Unique line(s) of event code

9
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -48,6 +48,13 @@ Variable (string) strCommand
Text :
Max. Text Size: 50
Variable (string) strTmp
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 2
Number frame_ptr
Attributes
ID : 10
@@ -373,7 +380,7 @@ Text tTmp
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

37
HMI/n2t-out-visual/pageTest.txt
View File

@@ -31,6 +31,13 @@ Variable (string) strCommand
Text :
Max. Text Size: 20
Variable (string) strTmp
Attributes
ID : 25
Scope : local
Text :
Max. Text Size: 2
Variable (string) tInstruction
Attributes
ID : 16
@@ -75,6 +82,36 @@ Text tBench
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 49
y coordinate : 48
Width : 257
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : test123test123
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1

2
HMI/n2t-out-visual/screensaver.txt
View File

@@ -166,7 +166,7 @@ Text m0
for(sys0=0;sys0<sys1;sys0++)
{
substr tTmp.txt,strTmp.txt,sys0,1
xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
}
Text t10

8
HMI/n2t-out/pageStartup.txt
View File

@@ -39,6 +39,12 @@ Variable (string) strCommand
Text :
Max. Text Size: 50
Variable (string) strTmp
Attributes
Scope : local
Text :
Max. Text Size: 2
Number frame_ptr
Attributes
Scope : local
@@ -143,7 +149,7 @@ Text tTmp
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 10
Max. Text Size : 30
Text tVersion
Attributes

16
HMI/n2t-out/pageTest.txt
View File

@@ -22,6 +22,12 @@ Variable (string) strCommand
Text :
Max. Text Size: 20
Variable (string) strTmp
Attributes
Scope : local
Text :
Max. Text Size: 2
Variable (string) tInstruction
Attributes
Scope : local
@@ -44,6 +50,16 @@ Text tBench
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : test123test123
Max. Text Size : 30
Picture p0
Attributes
Scope : local

2
HMI/n2t-out/screensaver.txt
View File

@@ -125,7 +125,7 @@ Text m0
for(sys0=0;sys0<sys1;sys0++)
{
substr tTmp.txt,strTmp.txt,sys0,1
xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
}
Text t10