h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-09 23:06:34 +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-05-21 14:55:47 +00:00
committed by github-actions[bot]
parent a4775f95f4
commit 0e34839e5a
6 changed files with 25 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
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-05-21 14:48:41.110663520 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:48:41.554666346 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +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-05-21 14:48:41.114663546 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:48:41.554666346 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:55:46.025052311 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -448,30 +448,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 14:48:41.110663520 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:48:41.554666346 +0000
@@ -137,7 +137,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : testHeading
Max. Text Size : 40
Picture p0
@@ -153,7 +153,7 @@
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Text :
+ Text : WIFI:S:SSID;T:WPA;P:PASSWORD;;
Max. Text Size : 105
Button bNext
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:48:41.110663520 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:48:41.554666346 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled