h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-06 14:45:46 +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 5b4064ced4
commit 88e20b5c36
5 changed files with 56 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
--- HMI/n2t-out/Program.s.txt 2022-09-17 13:59:14.951896133 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 13:59:15.403902750 +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 17:53:20.875848746 +0000
@@ -14,6 +14,6 @@
//color vars
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
page pageStartup
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/US/portrait/n2t-out/cardEntities.txt 2022-09-17 13:59:15.403902750 +0000
--- HMI/n2t-out/cardEntities.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 17:53:20.875848746 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -127,42 +127,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
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 @@
prints tSend.txt,0
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
+ State : unpressed
+ Text :
+ Max. Text Size : 20
+ Max. Text Size : 45
+
+ Events
+ 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
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/US/portrait/n2t-out/pageStartup.txt 2022-09-17 13:59:15.403902750 +0000
--- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 17:53:20.875848746 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
crcrest 1,0xffff // reset CRC
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/US/portrait/n2t-out/pageTest.txt 2022-09-17 13:59:15.403902750 +0000
--- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 17:53:20.875848746 +0000
@@ -13,36 +13,6 @@
Events
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
--- HMI/n2t-out/popupFan.txt 2022-09-17 13:59:14.951896133 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 13:59:15.403902750 +0000
--- HMI/n2t-out/popupFan.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 17:53:20.875848746 +0000
@@ -81,23 +81,23 @@
Scope: local
Value: 0