h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 23:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-09-17 17:53:26 +00:00
committed by github-actions[bot]
parent 82bc52e85b
commit a0bbdf67f1
5 changed files with 56 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/Program.s.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 13:59:15.879909718 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 17:53:21.343850547 +0000
@@ -14,6 +14,3 @@ @@ -14,6 +14,3 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/landscape/n2t-out/cardEntities.txt 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/n2t-out/cardEntities.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 13:59:15.883909777 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 17:53:21.347850562 +0000
@@ -786,7 +786,7 @@ @@ -786,7 +786,7 @@
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
@@ -49,8 +49,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Touch Press Event Touch Press Event
Only in HMI/n2t-out: cardPower.txt Only in HMI/n2t-out: cardPower.txt
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-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 13:59:15.879909718 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 17:53:21.347850562 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -61,8 +61,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 13:59:15.883909777 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 17:53:21.347850562 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event

58
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-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/Program.s.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 13:59:15.403902750 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 17:53:20.875848746 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -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-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/cardEntities.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 13:59:15.403902750 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 17:53:20.875848746 +0000
@@ -65,6 +65,16 @@ @@ -65,6 +65,16 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
@@ -127,42 +127,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -786,7 +865,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 20
Events
Touch Press Event
@@ -811,7 +890,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 20
Events
Touch Press Event
@@ -836,7 +915,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 20
Events
Touch Press Event
@@ -861,7 +940,7 @@
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 45
+ Max. Text Size : 20
Events
Touch Press Event
@@ -878,6 +957,106 @@ @@ -878,6 +957,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -250,7 +214,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Send Component ID : disabled + Send Component ID : disabled
+ State : unpressed + State : unpressed
+ Text : + Text :
+ Max. Text Size : 20 + Max. Text Size : 45
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
@@ -495,8 +459,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
{ {
Only in HMI/n2t-out: cardPower.txt Only in HMI/n2t-out: cardPower.txt
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-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 13:59:15.403902750 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 17:53:20.875848746 +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
@@ -516,8 +480,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 13:59:15.403902750 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 17:53:20.875848746 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -653,8 +617,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- } - }
- -
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
--- HMI/n2t-out/popupFan.txt 2022-09-17 13:59:14.951896133 +0000 --- HMI/n2t-out/popupFan.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 13:59:15.403902750 +0000 +++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 17:53:20.875848746 +0000
@@ -81,23 +81,23 @@ @@ -81,23 +81,23 @@
Scope: local Scope: local
Value: 0 Value: 0

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 13:59:15.415902926 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 17:53:20.887848792 +0000
+--- HMI/n2t-out/Program.s.txt 2022-09-17 13:59:14.951896133 +0000 +--- HMI/n2t-out/Program.s.txt 2022-09-17 17:53:20.407846944 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 13:59:15.403902750 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 17:53:20.875848746 +0000
+@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@
+ //color vars + //color vars
+ int defaultFontColor=65535 + int defaultFontColor=65535
+ int defaultBcoColor=6371 + int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-09-17 13:59:14.951896133 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-09-17 17:53:20.407846944 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 13:59:15.403902750 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 17:53:20.875848746 +0000
+@@ -65,6 +65,16 @@ +@@ -65,6 +65,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -19,43 +19,8 @@
+@@ -182,6 +204,15 @@ +@@ -182,6 +204,15 @@
+@@ -302,6 +333,26 @@ +@@ -302,6 +333,26 @@
+@@ -421,6 +472,34 @@ +@@ -421,6 +472,34 @@
+@@ -786,7 +865,7 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text :
+- Max. Text Size : 45
++ Max. Text Size : 20
+
+ Events
+ Touch Press Event
+@@ -811,7 +890,7 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text :
+- Max. Text Size : 45
++ Max. Text Size : 20
+
+ Events
+ Touch Press Event
+@@ -836,7 +915,7 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text :
+- Max. Text Size : 45
++ Max. Text Size : 20
+
+ Events
+ Touch Press Event
+@@ -861,7 +940,7 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text :
+- Max. Text Size : 45
++ Max. Text Size : 20
+
+ Events
+ Touch Press Event
+@@ -878,6 +957,106 @@ +@@ -878,6 +957,106 @@
++ Max. Text Size : 45
+@@ -986,6 +1165,33 @@ +@@ -986,6 +1165,33 @@
+@@ -1107,6 +1313,32 @@ +@@ -1107,6 +1313,32 @@
+ page popupFan + page popupFan
@@ -72,11 +37,11 @@
++ covx tTmp.txt,sys0,0,0 ++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0 ++ btOnOff5.val=sys0
+Only in HMI/n2t-out: cardPower.txt +Only in HMI/n2t-out: cardPower.txt
+--- HMI/n2t-out/pageStartup.txt 2022-09-17 13:59:14.951896133 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 13:59:15.403902750 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 17:53:20.875848746 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000 +--- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 13:59:15.403902750 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 17:53:20.875848746 +0000
+@@ -13,36 +13,6 @@ +@@ -13,36 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -212,8 +177,8 @@
+- } +- }
+- +-
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt +diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
+--- HMI/n2t-out/popupFan.txt 2022-09-17 13:59:14.951896133 +0000 +--- HMI/n2t-out/popupFan.txt 2022-09-17 17:53:20.407846944 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 13:59:15.403902750 +0000 ++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 17:53:20.875848746 +0000
+@@ -81,23 +81,23 @@ +@@ -81,23 +81,23 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0

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

@@ -1664,9 +1664,9 @@ Button bText1
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 165 x coordinate : 165
y coordinate : 82 y coordinate : 76
Width : 145 Width : 145
Height : 30 Height : 53
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1682,8 +1682,8 @@ Button bText1
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Word wrap : disabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1711,9 +1711,9 @@ Button bText2
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 165 x coordinate : 165
y coordinate : 159 y coordinate : 152
Width : 145 Width : 145
Height : 30 Height : 53
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1729,8 +1729,8 @@ Button bText2
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Word wrap : disabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1758,9 +1758,9 @@ Button bText3
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 165 x coordinate : 165
y coordinate : 242 y coordinate : 230
Width : 145 Width : 145
Height : 30 Height : 53
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1776,8 +1776,8 @@ Button bText3
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Word wrap : disabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1805,9 +1805,9 @@ Button bText4
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 165 x coordinate : 165
y coordinate : 321 y coordinate : 310
Width : 145 Width : 145
Height : 30 Height : 53
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1823,8 +1823,8 @@ Button bText4
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Word wrap : disabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1993,9 +1993,9 @@ Button bText5
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 168 x coordinate : 168
y coordinate : 401 y coordinate : 390
Width : 145 Width : 145
Height : 30 Height : 53
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -2011,8 +2011,8 @@ Button bText5
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Word wrap : disabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

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

@@ -865,7 +865,7 @@ Button bText1
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -890,7 +890,7 @@ Button bText2
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -915,7 +915,7 @@ Button bText3
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -940,7 +940,7 @@ Button bText4
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -1040,7 +1040,7 @@ Button bText5
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 20 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event