mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-11 23:57:42 +01:00
fix disable (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
6ad9e20c5a
commit
ecb90d4bfd
@@ -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-22 08:17:12.774830515 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:17:13.906863322 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:36:43.131639685 +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-22 08:17:12.774830515 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:17:13.906863322 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:36:43.131639685 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -2253,38 +2253,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",8
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp1.pco=65535
|
||||
tsw bUp1,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp1.pco=27501
|
||||
tsw bUp1,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp1.pco=65535
|
||||
bUp1.txt=tTmp.txt
|
||||
tsw bUp1,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop1.pco=27501
|
||||
tsw bStop1,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop1.pco=65535
|
||||
bStop1.txt=tTmp.txt
|
||||
tsw bStop1,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop1.pco=27501
|
||||
tsw bStop1,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown1.pco=27501
|
||||
tsw bDown1,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown1.pco=65535
|
||||
bDown1.txt=tTmp.txt
|
||||
tsw bDown1,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown1.pco=27501
|
||||
tsw bDown1,0
|
||||
}
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
@@ -2412,38 +2413,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",14
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp2.pco=65535
|
||||
tsw bUp2,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp2.pco=27501
|
||||
tsw bUp2,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp2.pco=65535
|
||||
bUp2.txt=tTmp.txt
|
||||
tsw bUp2,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop2.pco=27501
|
||||
tsw bStop2,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop2.pco=65535
|
||||
bStop2.txt=tTmp.txt
|
||||
tsw bStop2,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop2.pco=27501
|
||||
tsw bStop2,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown2.pco=27501
|
||||
tsw bDown2,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown2.pco=65535
|
||||
bDown2.txt=tTmp.txt
|
||||
tsw bDown2,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown2.pco=27501
|
||||
tsw bDown2,0
|
||||
}
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
@@ -2571,38 +2573,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",20
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp3.pco=65535
|
||||
tsw bUp3,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp3.pco=27501
|
||||
tsw bUp3,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp3.pco=65535
|
||||
bUp3.txt=tTmp.txt
|
||||
tsw bUp3,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop3.pco=27501
|
||||
tsw bStop3,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop3.pco=65535
|
||||
bStop3.txt=tTmp.txt
|
||||
tsw bStop3,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop3.pco=27501
|
||||
tsw bStop3,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown3.pco=27501
|
||||
tsw bDown3,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown3.pco=65535
|
||||
bDown3.txt=tTmp.txt
|
||||
tsw bDown3,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown3.pco=27501
|
||||
tsw bDown3,0
|
||||
}
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
@@ -2730,38 +2733,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",26
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp4.pco=65535
|
||||
tsw bUp4,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp4.pco=27501
|
||||
tsw bUp4,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp4.pco=65535
|
||||
bUp4.txt=tTmp.txt
|
||||
tsw bUp4,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop4.pco=27501
|
||||
tsw bStop4,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop4.pco=65535
|
||||
bStop4.txt=tTmp.txt
|
||||
tsw bStop4,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop4.pco=27501
|
||||
tsw bStop4,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown4.pco=27501
|
||||
tsw bDown4,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown4.pco=65535
|
||||
bDown4.txt=tTmp.txt
|
||||
tsw bDown4,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown4.pco=27501
|
||||
tsw bDown4,0
|
||||
}
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
|
||||
@@ -52,11 +52,11 @@ cardQR
|
||||
205 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1117 Line(s) of event code
|
||||
487 Unique line(s) of event code
|
||||
1121 Line(s) of event code
|
||||
491 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
13 Page(s)
|
||||
402 Component(s)
|
||||
4439 Line(s) of event code
|
||||
1163 Unique line(s) of event code
|
||||
4443 Line(s) of event code
|
||||
1167 Unique line(s) of event code
|
||||
|
||||
@@ -647,39 +647,39 @@ Timer tmSerial
|
||||
}
|
||||
// set icon bUp
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bUp1,0
|
||||
bUp1.pco=27501
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp1.txt=tTmp.txt
|
||||
tsw bUp1,1
|
||||
bUp1.pco=65535
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bUp1,0
|
||||
bUp1.pco=27501
|
||||
}
|
||||
// set icon bStop
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bStop1,0
|
||||
bStop1.pco=27501
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop1.txt=tTmp.txt
|
||||
tsw bStop1,1
|
||||
bStop1.pco=65535
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bStop1,0
|
||||
bStop1.pco=27501
|
||||
}
|
||||
// set icon bDown
|
||||
spstr strCommand.txt,tTmp.txt,"~",7
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bDown1,0
|
||||
bDown1.pco=27501
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown1.txt=tTmp.txt
|
||||
tsw bDown1,1
|
||||
bDown1.pco=65535
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bDown1,0
|
||||
bDown1.pco=27501
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
|
||||
@@ -1281,38 +1281,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",8
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp1.pco=65535
|
||||
tsw bUp1,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp1.pco=27501
|
||||
tsw bUp1,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp1.pco=65535
|
||||
bUp1.txt=tTmp.txt
|
||||
tsw bUp1,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop1.pco=27501
|
||||
tsw bStop1,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop1.pco=65535
|
||||
bStop1.txt=tTmp.txt
|
||||
tsw bStop1,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop1.pco=27501
|
||||
tsw bStop1,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown1.pco=27501
|
||||
tsw bDown1,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown1.pco=65535
|
||||
bDown1.txt=tTmp.txt
|
||||
tsw bDown1,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown1.pco=27501
|
||||
tsw bDown1,0
|
||||
}
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
@@ -1440,38 +1441,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",14
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp2.pco=65535
|
||||
tsw bUp2,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp2.pco=27501
|
||||
tsw bUp2,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp2.pco=65535
|
||||
bUp2.txt=tTmp.txt
|
||||
tsw bUp2,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop2.pco=27501
|
||||
tsw bStop2,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop2.pco=65535
|
||||
bStop2.txt=tTmp.txt
|
||||
tsw bStop2,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop2.pco=27501
|
||||
tsw bStop2,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown2.pco=27501
|
||||
tsw bDown2,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown2.pco=65535
|
||||
bDown2.txt=tTmp.txt
|
||||
tsw bDown2,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown2.pco=27501
|
||||
tsw bDown2,0
|
||||
}
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
@@ -1599,38 +1601,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",20
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp3.pco=65535
|
||||
tsw bUp3,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp3.pco=27501
|
||||
tsw bUp3,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp3.pco=65535
|
||||
bUp3.txt=tTmp.txt
|
||||
tsw bUp3,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop3.pco=27501
|
||||
tsw bStop3,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop3.pco=65535
|
||||
bStop3.txt=tTmp.txt
|
||||
tsw bStop3,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop3.pco=27501
|
||||
tsw bStop3,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown3.pco=27501
|
||||
tsw bDown3,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown3.pco=65535
|
||||
bDown3.txt=tTmp.txt
|
||||
tsw bDown3,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown3.pco=27501
|
||||
tsw bDown3,0
|
||||
}
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
@@ -1758,38 +1761,39 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tId.txt,"~",26
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
bUp4.pco=65535
|
||||
tsw bUp4,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp4.pco=27501
|
||||
tsw bUp4,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp4.pco=65535
|
||||
bUp4.txt=tTmp.txt
|
||||
tsw bUp4,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop4.pco=27501
|
||||
tsw bStop4,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop4.pco=65535
|
||||
bStop4.txt=tTmp.txt
|
||||
tsw bStop4,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop4.pco=27501
|
||||
tsw bStop4,0
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",2
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown4.pco=27501
|
||||
tsw bDown4,0
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown4.pco=65535
|
||||
bDown4.txt=tTmp.txt
|
||||
tsw bDown4,1
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown4.pco=27501
|
||||
tsw bDown4,0
|
||||
}
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
|
||||
@@ -362,39 +362,39 @@ Timer tmSerial
|
||||
}
|
||||
// set icon bUp
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bUp1,0
|
||||
bUp1.pco=27501
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bUp1.txt=tTmp.txt
|
||||
tsw bUp1,1
|
||||
bUp1.pco=65535
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bUp1,0
|
||||
bUp1.pco=27501
|
||||
}
|
||||
// set icon bStop
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bStop1,0
|
||||
bStop1.pco=27501
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bStop1.txt=tTmp.txt
|
||||
tsw bStop1,1
|
||||
bStop1.pco=65535
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bStop1,0
|
||||
bStop1.pco=27501
|
||||
}
|
||||
// set icon bDown
|
||||
spstr strCommand.txt,tTmp.txt,"~",7
|
||||
if(tTmp.txt!="")
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bDown1,0
|
||||
bDown1.pco=27501
|
||||
}else if(tTmp.txt!="")
|
||||
{
|
||||
bDown1.txt=tTmp.txt
|
||||
tsw bDown1,1
|
||||
bDown1.pco=65535
|
||||
}else if(tTmp.txt=="disable")
|
||||
{
|
||||
tsw bDown1,0
|
||||
bDown1.pco=27501
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
|
||||
Reference in New Issue
Block a user