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

extended length of bText to 20 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-16 16:54:49 +00:00
committed by github-actions[bot]
parent 229002088f
commit 5c50bad008
9 changed files with 147 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-15 18:19:09.456835563 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-15 18:19:09.456835563 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000
@@ -63,6 +63,16 @@
vis bText4,0
vis hSlider4,0
@@ -127,50 +127,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -769,8 +848,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text :
- Max. Text Size : 15
+ Text : newtxt
+ Max. Text Size : 10
Events
Touch Press Event
@@ -794,8 +873,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text :
- Max. Text Size : 15
+ Text : newtxt
+ Max. Text Size : 10
Events
Touch Press Event
@@ -819,8 +898,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text :
- Max. Text Size : 15
+ Text : newtxt
+ Max. Text Size : 10
Events
Touch Press Event
@@ -844,8 +923,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text :
- Max. Text Size : 15
+ Text : newtxt
+ Max. Text Size : 10
Events
Touch Press Event
@@ -862,6 +941,106 @@
prints tSend.txt,0
prints crcval,2
@@ -257,8 +213,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+ Text : newtxt
+ Max. Text Size : 10
+ Text :
+ Max. Text Size : 20
+
+ Events
+ Touch Press Event
@@ -512,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-15 18:19:09.456835563 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,60 +1,18 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-15 18:19:09.468836328 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-15 18:19:09.032808526 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-15 18:19:09.456835563 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-15 18:19:09.456835563 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-16 16:54:48.258472024 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000
+@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@
+@@ -286,6 +317,26 @@
+@@ -405,6 +456,34 @@
+@@ -769,8 +848,8 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text :
+- Max. Text Size : 15
++ Text : newtxt
++ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+@@ -794,8 +873,8 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text :
+- Max. Text Size : 15
++ Text : newtxt
++ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+@@ -819,8 +898,8 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text :
+- Max. Text Size : 15
++ Text : newtxt
++ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+@@ -844,8 +923,8 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text :
+- Max. Text Size : 15
++ Text : newtxt
++ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+@@ -862,6 +941,106 @@
++ Text :
++ Max. Text Size : 20
+@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-15 18:19:09.456835563 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000

20
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -1684,8 +1684,8 @@ Button bText1
Horizontal Alignment : right
Vertical Alignment : center
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1731,8 +1731,8 @@ Button bText2
Horizontal Alignment : right
Vertical Alignment : center
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1778,8 +1778,8 @@ Button bText3
Horizontal Alignment : right
Vertical Alignment : center
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1825,8 +1825,8 @@ Button bText4
Horizontal Alignment : right
Vertical Alignment : center
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -2013,8 +2013,8 @@ Button bText5
Horizontal Alignment : right
Vertical Alignment : center
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

20
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -848,8 +848,8 @@ Button bText1
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Events
Touch Press Event
@@ -873,8 +873,8 @@ Button bText2
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Events
Touch Press Event
@@ -898,8 +898,8 @@ Button bText3
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Events
Touch Press Event
@@ -923,8 +923,8 @@ Button bText4
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Events
Touch Press Event
@@ -1023,8 +1023,8 @@ Button bText5
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Text :
Max. Text Size : 20
Events
Touch Press Event