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

This commit is contained in:
joBr99
2023-08-08 19:45:40 +00:00
committed by github-actions[bot]
parent ce0215c1d2
commit 43d21a4b6b
6 changed files with 62 additions and 11 deletions

View File

@@ -185,6 +185,23 @@
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -141,15 +141,15 @@
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 52
│ + Text : 51
│ Max. Text Size : 10
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +164,15 @@ │ @@ -164,15 +164,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10

View File

@@ -1688,6 +1688,23 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ @@ -141,15 +135,15 @@
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 52
│ + Text : 51
│ Max. Text Size : 10
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +158,15 @@ │ @@ -164,15 +158,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-08-06 20:32:34.816279572 +0000 +++ /dev/fd/62 2023-08-08 19:45:29.806219470 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@ +1 +12,11 @@
@@ -1245,6 +1245,23 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Send Component ID : disabled + Send Component ID : disabled
+15 +135,15 @@
+
+ersion
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 52
+ Text : 51
+ Max. Text Size : 10
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+15 +158,15 @@ +15 +158,15 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+20 +269,14 @@ +20 +269,14 @@

View File

@@ -18,10 +18,10 @@ popupFan
27 Component(s) 27 Component(s)
355 Line(s) of event code 355 Line(s) of event code
206 Unique line(s) of event code 206 Unique line(s) of event code
pageStartup popupNotify
20 Component(s) 19 Component(s)
198 Line(s) of event code 267 Line(s) of event code
137 Unique line(s) of event code 172 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -34,14 +34,14 @@ popupLight
28 Component(s) 28 Component(s)
408 Line(s) of event code 408 Line(s) of event code
225 Unique line(s) of event code 225 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
529 Line(s) of event code 529 Line(s) of event code
298 Unique line(s) of event code 298 Unique line(s) of event code
pageStartup
20 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
cardQR cardQR
34 Component(s) 34 Component(s)
410 Line(s) of event code 410 Line(s) of event code

View File

@@ -396,7 +396,7 @@ Text tVersion
Horizontal Alignment: center Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 51 Text : 52
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -145,7 +145,7 @@ Text tVersion
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : 51 Text : 52
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0