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

extended cardEntities value char limit to 15 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-15 18:19:11 +00:00
committed by github-actions[bot]
parent 0be532bbce
commit 035a4b5129
5 changed files with 168 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:21:19.348768343 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-15 18:19:09.900863875 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,9 +8,56 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-15 18:19:09.900863875 +0000
@@ -769,8 +769,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 +794,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 +819,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 +844,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
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:21:19.348768343 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-15 18:19:09.900863875 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

56
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +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-12 12:21:18.872762109 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-15 18:19:09.456835563 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-15 18:19:09.456835563 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -127,6 +127,50 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local 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 @@ @@ -862,6 +941,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -468,8 +512,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-15 18:19:09.456835563 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,16 +1,60 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-12 12:21:18.904762528 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-15 18:19:09.468836328 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +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-12 12:21:18.872762109 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-15 18:19:09.456835563 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-15 18:19:09.456835563 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
+@@ -286,6 +317,26 @@ +@@ -286,6 +317,26 @@
+@@ -405,6 +456,34 @@ +@@ -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 @@ +@@ -862,6 +941,106 @@
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-15 18:19:09.456835563 +0000

16
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -1527,8 +1527,8 @@ Button bText1
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1574,8 +1574,8 @@ Button bText2
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1621,8 +1621,8 @@ Button bText3
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1668,8 +1668,8 @@ Button bText4
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

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

@@ -769,8 +769,8 @@ Button bText1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Events Events
Touch Press Event Touch Press Event
@@ -794,8 +794,8 @@ Button bText2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Events Events
Touch Press Event Touch Press Event
@@ -819,8 +819,8 @@ Button bText3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Events Events
Touch Press Event Touch Press Event
@@ -844,8 +844,8 @@ Button bText4
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 15
Events Events
Touch Press Event Touch Press Event