h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 00:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed shutter icon command format (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-22 14:52:30 +00:00
committed by github-actions[bot]
parent 11edb0b358
commit 2bb857c7b6
18 changed files with 442 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HMI/US/landscape/diff-eu-version.txt
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-22 08:56:32.972794177 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:56:34.028800991 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-22 14:52:29.008661186 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 14:52:29.872661064 +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:56:32.972794177 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:56:34.032801017 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-22 14:52:29.008661186 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 14:52:29.872661064 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

84
HMI/US/landscape/n2t-out-visual/cardEntities.txt
View File

@@ -2252,39 +2252,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",8
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp1.pco=27501
spstr tId.txt,bUp1.txt,"|",0
tsw bUp1,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
spstr tId.txt,bUp1.txt,"|",0
tsw bUp1,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop1.pco=27501
spstr tId.txt,bStop1.txt,"|",1
tsw bStop1,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop1.pco=65535
bStop1.txt=tTmp.txt
spstr tId.txt,bStop1.txt,"|",1
tsw bStop1,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown1.pco=27501
spstr tId.txt,bDown1.txt,"|",2
tsw bDown1,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
spstr tId.txt,bDown1.txt,"|",2
tsw bDown1,1
}
}
@@ -2412,39 +2415,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",14
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp2.pco=27501
spstr tId.txt,bUp2.txt,"|",0
tsw bUp2,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
spstr tId.txt,bUp2.txt,"|",0
tsw bUp2,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop2.pco=27501
spstr tId.txt,bStop2.txt,"|",1
tsw bStop2,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop2.pco=65535
bStop2.txt=tTmp.txt
spstr tId.txt,bStop2.txt,"|",1
tsw bStop2,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown2.pco=27501
spstr tId.txt,bDown2.txt,"|",2
tsw bDown2,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
spstr tId.txt,bDown2.txt,"|",2
tsw bDown2,1
}
}
@@ -2572,39 +2578,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",20
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp3.pco=27501
spstr tId.txt,bUp3.txt,"|",0
tsw bUp3,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
spstr tId.txt,bUp3.txt,"|",0
tsw bUp3,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop3.pco=27501
spstr tId.txt,bStop3.txt,"|",1
tsw bStop3,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop3.pco=65535
bStop3.txt=tTmp.txt
spstr tId.txt,bStop3.txt,"|",1
tsw bStop3,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown3.pco=27501
spstr tId.txt,bDown3.txt,"|",2
tsw bDown3,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
spstr tId.txt,bDown3.txt,"|",2
tsw bDown3,1
}
}
@@ -2732,39 +2741,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",26
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp4.pco=27501
spstr tId.txt,bUp4.txt,"|",0
tsw bUp4,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
spstr tId.txt,bUp4.txt,"|",0
tsw bUp4,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop4.pco=27501
spstr tId.txt,bStop4.txt,"|",1
tsw bStop4,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop4.pco=65535
bStop4.txt=tTmp.txt
spstr tId.txt,bStop4.txt,"|",1
tsw bStop4,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown4.pco=27501
spstr tId.txt,bDown4.txt,"|",2
tsw bDown4,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
spstr tId.txt,bDown4.txt,"|",2
tsw bDown4,1
}
}

6
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -28,7 +28,7 @@ cardAlarm
224 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
244 Line(s) of event code
138 Unique line(s) of event code
popupLight
27 Component(s)
@@ -52,11 +52,11 @@ cardQR
205 Unique line(s) of event code
cardEntities
65 Component(s)
1121 Line(s) of event code
1133 Line(s) of event code
491 Unique line(s) of event code
Total
13 Page(s)
402 Component(s)
4443 Line(s) of event code
4458 Line(s) of event code
1167 Unique line(s) of event code

21
HMI/US/landscape/n2t-out-visual/popupShutter.txt
View File

@@ -646,38 +646,41 @@ Timer tmSerial
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
spstr strCommand.txt,tTmp.txt,"~",8
if(tTmp.txt=="disable")
{
tsw bUp1,0
spstr strCommand.txt,bUp1.txt,"~",5
bUp1.pco=27501
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp1.txt=tTmp.txt
spstr strCommand.txt,bUp1.txt,"~",5
tsw bUp1,1
bUp1.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6
spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
tsw bStop1,0
spstr strCommand.txt,bStop1.txt,"~",6
bStop1.pco=27501
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop1.txt=tTmp.txt
spstr strCommand.txt,bStop1.txt,"~",6
tsw bStop1,1
bStop1.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7
spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown1.txt=tTmp.txt
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}

84
HMI/US/landscape/n2t-out/cardEntities.txt
View File

@@ -1280,39 +1280,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",8
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp1.pco=27501
spstr tId.txt,bUp1.txt,"|",0
tsw bUp1,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
spstr tId.txt,bUp1.txt,"|",0
tsw bUp1,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop1.pco=27501
spstr tId.txt,bStop1.txt,"|",1
tsw bStop1,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop1.pco=65535
bStop1.txt=tTmp.txt
spstr tId.txt,bStop1.txt,"|",1
tsw bStop1,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown1.pco=27501
spstr tId.txt,bDown1.txt,"|",2
tsw bDown1,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
spstr tId.txt,bDown1.txt,"|",2
tsw bDown1,1
}
}
@@ -1440,39 +1443,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",14
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp2.pco=27501
spstr tId.txt,bUp2.txt,"|",0
tsw bUp2,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
spstr tId.txt,bUp2.txt,"|",0
tsw bUp2,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop2.pco=27501
spstr tId.txt,bStop2.txt,"|",1
tsw bStop2,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop2.pco=65535
bStop2.txt=tTmp.txt
spstr tId.txt,bStop2.txt,"|",1
tsw bStop2,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown2.pco=27501
spstr tId.txt,bDown2.txt,"|",2
tsw bDown2,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
spstr tId.txt,bDown2.txt,"|",2
tsw bDown2,1
}
}
@@ -1600,39 +1606,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",20
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp3.pco=27501
spstr tId.txt,bUp3.txt,"|",0
tsw bUp3,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
spstr tId.txt,bUp3.txt,"|",0
tsw bUp3,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop3.pco=27501
spstr tId.txt,bStop3.txt,"|",1
tsw bStop3,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop3.pco=65535
bStop3.txt=tTmp.txt
spstr tId.txt,bStop3.txt,"|",1
tsw bStop3,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown3.pco=27501
spstr tId.txt,bDown3.txt,"|",2
tsw bDown3,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
spstr tId.txt,bDown3.txt,"|",2
tsw bDown3,1
}
}
@@ -1760,39 +1769,42 @@ Timer tmSerial
// get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",26
// up button
spstr tId.txt,tTmp.txt,"|",0
spstr tId.txt,tTmp.txt,"|",3
if(tTmp.txt=="disable")
{
bUp4.pco=27501
spstr tId.txt,bUp4.txt,"|",0
tsw bUp4,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
spstr tId.txt,bUp4.txt,"|",0
tsw bUp4,1
}
// stop button
spstr tId.txt,tTmp.txt,"|",1
spstr tId.txt,tTmp.txt,"|",4
if(tTmp.txt=="disable")
{
bStop4.pco=27501
spstr tId.txt,bStop4.txt,"|",1
tsw bStop4,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop4.pco=65535
bStop4.txt=tTmp.txt
spstr tId.txt,bStop4.txt,"|",1
tsw bStop4,1
}
// down button
spstr tId.txt,tTmp.txt,"|",2
spstr tId.txt,tTmp.txt,"|",5
if(tTmp.txt=="disable")
{
bDown4.pco=27501
spstr tId.txt,bDown4.txt,"|",2
tsw bDown4,0
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
spstr tId.txt,bDown4.txt,"|",2
tsw bDown4,1
}
}

21
HMI/US/landscape/n2t-out/popupShutter.txt
View File

@@ -361,38 +361,41 @@ Timer tmSerial
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
spstr strCommand.txt,tTmp.txt,"~",8
if(tTmp.txt=="disable")
{
tsw bUp1,0
spstr strCommand.txt,bUp1.txt,"~",5
bUp1.pco=27501
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bUp1.txt=tTmp.txt
spstr strCommand.txt,bUp1.txt,"~",5
tsw bUp1,1
bUp1.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6
spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
tsw bStop1,0
spstr strCommand.txt,bStop1.txt,"~",6
bStop1.pco=27501
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bStop1.txt=tTmp.txt
spstr strCommand.txt,bStop1.txt,"~",6
tsw bStop1,1
bStop1.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7
spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt!="")
}else if(tTmp.txt=="enable")
{
bDown1.txt=tTmp.txt
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}