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

This commit is contained in:
joBr99
2022-05-06 16:09:55 +00:00
committed by github-actions[bot]
parent baa6b6bcb1
commit ea0f1f3825
5 changed files with 63 additions and 295 deletions

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-05-06 16:05:10.964544420 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:05:11.768549110 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:09:55.031738318 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:05:11.768549110 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:09:55.031738318 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,8 +21,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-06 16:05:10.968544443 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:05:11.768549110 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:09:55.031738318 +0000
@@ -535,12 +535,6 @@
vis pColorWheel,1
}
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:05:11.768549110 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:09:55.031738318 +0000
@@ -109,7 +109,7 @@
Text :
Max. Text Size : 20