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

This commit is contained in:
joBr99
2023-11-04 20:26:17 +00:00
committed by github-actions[bot]
parent 25d169b14e
commit eb1e5d2d85
8 changed files with 199 additions and 104 deletions

View File

@@ -1,5 +1,17 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
├── file list
│ @@ -1,10 +1,9 @@
│ Program.s.txt
│ cardAlarm.txt
│ -cardBurnRec.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ cardGrid2.txt
│ cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -13,10 +13,10 @@

View File

@@ -1,5 +1,17 @@
--- HMI/n2t-out
+++ HMI/US/portrait/n2t-out
├── file list
│ @@ -1,10 +1,9 @@
│ Program.s.txt
│ cardAlarm.txt
│ -cardBurnRec.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ cardGrid2.txt
│ cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -12,11 +12,11 @@

View File

@@ -1,4 +1,16 @@
+++ /dev/fd/62 2023-10-14 14:36:40.102098093 +0000
+++ /dev/fd/62 2023-11-04 20:26:09.601109365 +0000
+le list
+ +1,9 @@
+.s.txt
+rm.txt
+nRec.txt
+rt.txt
+ities.txt
+d.txt
+d2.txt
+art.txt
+ia.txt
+er.txt
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@

View File

@@ -0,0 +1,63 @@
Page cardBurnRec
Attributes
ID : 0
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
Width : 480
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 65535
Timer tm0
Attributes
ID : 1
Scope : local
Period (ms): 4000
Enabled : yes
Events
Timer Event
dim=100
sys0=0
sys1=0
if(sys2==WHITE)
{
sys2=BLACK
}else
{
sys2=WHITE
}
sya1=sys2
while(sys0<8)
{
sya0=sys0%2
if(sya1==WHITE)
{
sya1=BLACK
}else
{
sya1=WHITE
}
fill 0,40*sys0,480,40,sya1
sys0++
}
TouchCap tc0
Attributes
ID : 2
Scope: local
Value: 0
Events
Touch Press Event
page pageStartup

View File

@@ -2,12 +2,16 @@ Program.s
0 Component(s)
15 Line(s) of event code
15 Unique line(s) of event code
cardBurnRec
3 Component(s)
25 Line(s) of event code
21 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageTest
27 Component(s)
25 Component(s)
68 Line(s) of event code
66 Unique line(s) of event code
cardLChart
@@ -96,7 +100,7 @@ cardEntities
535 Unique line(s) of event code
Total
23 Page(s)
878 Component(s)
10588 Line(s) of event code
2459 Unique line(s) of event code
24 Page(s)
879 Component(s)
10613 Line(s) of event code
2472 Unique line(s) of event code

View File

@@ -32,7 +32,7 @@ Variable (string) strCommand
Variable (string) strTmp
Attributes
ID : 25
ID : 24
Scope : local
Text :
Max. Text Size: 2
@@ -58,9 +58,9 @@ Text tBench
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 288
y coordinate : 90
Width : 152
x coordinate : 207
y coordinate : 287
Width : 88
Height : 30
Effect : load
Effect Priority : 0
@@ -82,14 +82,14 @@ Text tBench
Text tTmp
Attributes
ID : 24
ID : 23
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 49
y coordinate : 48
Width : 257
x coordinate : 212
y coordinate : 253
Width : 71
Height : 30
Effect : load
Effect Priority : 0
@@ -103,7 +103,7 @@ Text tTmp
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : test123test123
Text : x
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
@@ -135,7 +135,7 @@ Button b0
x coordinate : 0
y coordinate : 0
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -203,9 +203,9 @@ Button b10
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 98
y coordinate : 81
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -238,9 +238,9 @@ Button b11
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 145
y coordinate : 121
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -273,9 +273,9 @@ Button b12
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 242
y coordinate : 202
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -335,46 +335,15 @@ Button b13
Touch Press Event
showqq
Button b14
Button b15
Attributes
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 0
Back. Color : 50712
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : newtxt
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Button b15
Attributes
ID : 22
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 263
x coordinate : 99
y coordinate : 270
Width : 100
Height : 50
Effect : load
@@ -403,13 +372,13 @@ Button b15
Button b16
Attributes
ID : 23
ID : 22
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 135
y coordinate : 263
x coordinate : 0
y coordinate : 270
Width : 100
Height : 50
Effect : load
@@ -444,9 +413,9 @@ Button b2
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 195
y coordinate : 162
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -514,9 +483,9 @@ Button b4
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 96
y coordinate : 82
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -551,7 +520,7 @@ Button b5
x coordinate : 100
y coordinate : 0
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -584,9 +553,9 @@ Button b6
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 49
y coordinate : 41
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -619,9 +588,9 @@ Button b7
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 49
y coordinate : 41
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -653,10 +622,10 @@ Button b8
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 341
y coordinate : 9
x coordinate : 94
y coordinate : 161
Width : 106
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -690,9 +659,9 @@ Button b9
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 146
y coordinate : 122
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -717,21 +686,6 @@ Button b9
Touch Press Event
page popupNotify
Hotspot m0
Attributes
ID : 26
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 213
y coordinate : 115
Width : 210
Height : 191
Effect : load
Effect Priority : 0
Effect Time : 300
Timer tmSerial
Attributes
ID : 14

View File

@@ -0,0 +1,53 @@
Page cardBurnRec
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Timer tm0
Attributes
Scope : local
Period (ms): 4000
Enabled : yes
Events
Timer Event
dim=100
sys0=0
sys1=0
if(sys2==WHITE)
{
sys2=BLACK
}else
{
sys2=WHITE
}
sya1=sys2
while(sys0<8)
{
sya0=sys0%2
if(sya1==WHITE)
{
sya1=BLACK
}else
{
sya1=WHITE
}
fill 0,40*sys0,480,40,sya1
sys0++
}
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
page pageStartup

View File

@@ -54,7 +54,7 @@ Text tTmp
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : test123test123
Text : x
Max. Text Size : 30
Picture p0
@@ -141,15 +141,6 @@ Button b13
Touch Press Event
showqq
Button b14
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Button b15
Attributes
Scope : local
@@ -281,12 +272,6 @@ Button b9
Touch Press Event
page popupNotify
Hotspot m0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Timer tmSerial
Attributes
Scope : local