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

This commit is contained in:
joBr99
2022-04-05 20:30:08 +00:00
committed by GitHub Actions
parent ac9ea168f3
commit 9e1b6044f5
8 changed files with 35 additions and 44 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-04-04 21:26:08.660575169 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 21:26:09.652584145 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-05 20:30:06.540918537 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-05 20:30:07.536951384 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,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-04-04 21:26:08.660575169 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 21:26:09.652584145 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-05 20:30:07.536951384 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

View File

@@ -1233,7 +1233,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",4
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6

View File

@@ -10,10 +10,6 @@ pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
245 Unique line(s) of event code
popupNotify
17 Component(s)
178 Line(s) of event code
@@ -42,6 +38,10 @@ cardGrid
39 Component(s)
418 Line(s) of event code
243 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
246 Unique line(s) of event code
screensaver
33 Component(s)
195 Line(s) of event code

View File

@@ -680,7 +680,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",4
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6