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

extend bText to two line (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-09-17 13:59:20 +00:00
committed by github-actions[bot]
parent d9e328aa52
commit de2cd5a9f7
7 changed files with 178 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
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
--- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-15 18:53:19.233011610 +0000
--- HMI/n2t-out/Program.s.txt 2022-09-17 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 13:59:15.879909718 +0000
@@ -14,6 +14,3 @@
//color vars
int defaultFontColor=65535
@@ -8,10 +8,49 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
- page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-09-17 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 13:59:15.883909777 +0000
@@ -786,7 +786,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 40
Events
Touch Press Event
@@ -811,7 +811,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 40
Events
Touch Press Event
@@ -836,7 +836,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 40
Events
Touch Press Event
@@ -861,7 +861,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 40
Events
Touch Press Event
Only in HMI/n2t-out: cardPower.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-15 18:53:19.233011610 +0000
--- HMI/n2t-out/pageStartup.txt 2022-09-17 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 13:59:15.879909718 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -22,8 +61,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-15 18:53:19.233011610 +0000
--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 13:59:15.883909777 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event

32
HMI/US/landscape/n2t-out-visual/cardEntities.txt
View File

@@ -1507,9 +1507,9 @@ Button bText1
Send Component ID : disabled
Opacity : 127
x coordinate : 276
y coordinate : 84
y coordinate : 75
Width : 166
Height : 30
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -1525,8 +1525,8 @@ Button bText1
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 20
Word wrap : disabled
Max. Text Size : 40
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1554,9 +1554,9 @@ Button bText2
Send Component ID : disabled
Opacity : 127
x coordinate : 276
y coordinate : 140
y coordinate : 131
Width : 166
Height : 30
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -1572,8 +1572,8 @@ Button bText2
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 20
Word wrap : disabled
Max. Text Size : 40
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1601,9 +1601,9 @@ Button bText3
Send Component ID : disabled
Opacity : 127
x coordinate : 277
y coordinate : 197
y coordinate : 188
Width : 166
Height : 30
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -1619,8 +1619,8 @@ Button bText3
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 20
Word wrap : disabled
Max. Text Size : 40
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1648,9 +1648,9 @@ Button bText4
Send Component ID : disabled
Opacity : 127
x coordinate : 277
y coordinate : 254
y coordinate : 245
Width : 166
Height : 30
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -1666,8 +1666,8 @@ Button bText4
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 20
Word wrap : disabled
Max. Text Size : 40
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0

8
HMI/US/landscape/n2t-out/cardEntities.txt
View File

@@ -786,7 +786,7 @@ Button bText1
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 20
Max. Text Size : 40
Events
Touch Press Event
@@ -811,7 +811,7 @@ Button bText2
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 20
Max. Text Size : 40
Events
Touch Press Event
@@ -836,7 +836,7 @@ Button bText3
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 20
Max. Text Size : 40
Events
Touch Press Event
@@ -861,7 +861,7 @@ Button bText4
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 20
Max. Text Size : 40
Events
Touch Press Event