mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-07 22:08:55 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
c9220f6759
commit
6bcd5e1e50
@@ -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-05-28 05:04:50.360986275 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:04:51.228984325 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:17:01.093876698 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -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
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||
--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:04:51.232984331 +0000
|
||||
--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:17:01.093876698 +0000
|
||||
@@ -34,7 +34,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:04:51.228984325 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:17:01.093876698 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -33,8 +33,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/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:04:51.228984325 +0000
|
||||
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:17:01.093876698 +0000
|
||||
@@ -209,9 +209,6 @@
|
||||
sys0=sys0-pColorWheel.y
|
||||
covx sys0,tTmp.txt,0,0
|
||||
@@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:04:51.232984331 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:17:01.093876698 +0000
|
||||
@@ -62,12 +62,6 @@
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Reference in New Issue
Block a user