h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 15:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pr/203

Browse Source
This commit is contained in:
joBr99
2022-05-22 10:55:41 +02:00
parent 7c02e238a5 a2693de6ea
commit 386eb16bfe
27 changed files with 710 additions and 668 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 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 07:58:25.897799068 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:58:27.009807303 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:52:06.663941704 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 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 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:58:27.009807303 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:52:06.667941783 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

@@ -2253,38 +2253,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
}else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
}else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
}else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -2412,38 +2413,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
}else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
}else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
}else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -2571,38 +2573,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
}else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
}else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
}else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -2730,38 +2733,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
}else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
}else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
}else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

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

@@ -52,11 +52,11 @@ cardQR
205 Unique line(s) of event code 205 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1117 Line(s) of event code 1121 Line(s) of event code
487 Unique line(s) of event code 491 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
402 Component(s) 402 Component(s)
4439 Line(s) of event code 4443 Line(s) of event code
1163 Unique line(s) of event code 1167 Unique line(s) of event code

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

@@ -50,7 +50,7 @@ Variable (string) strCommand
ID : 10 ID : 10
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -647,39 +647,39 @@ Timer tmSerial
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5 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 bUp1.txt=tTmp.txt
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bUp1,0
bUp1.pco=27501
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6 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 bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bStop1,0
bStop1.pco=27501
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7 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 bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
bDown1.pco=65535 bDown1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bDown1,0
bDown1.pco=27501
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")

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

@@ -1281,38 +1281,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
}else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
}else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
}else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -1440,38 +1441,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
}else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
}else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
}else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -1599,38 +1601,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
}else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
}else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
}else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -1758,38 +1761,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
}else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
}else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
}else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

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

@@ -41,7 +41,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -362,39 +362,39 @@ Timer tmSerial
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5 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 bUp1.txt=tTmp.txt
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bUp1,0
bUp1.pco=27501
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6 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 bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bStop1,0
bStop1.pco=27501
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7 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 bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
bDown1.pco=65535 bDown1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bDown1,0
bDown1.pco=27501
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")

BIN
HMI/US/landscape/nspanel_US_L.HMI
View File

Binary file not shown.

BIN
HMI/US/landscape/nspanel_US_L.tft
View File

Binary file not shown.

46
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-22 07:58:25.897799068 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:58:25.901799098 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -297,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -1876,6 +2104,165 @@ @@ -1880,6 +2108,166 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -342,38 +342,39 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ spstr strCommand.txt,tId.txt,"~",32 + spstr strCommand.txt,tId.txt,"~",32
+ // up button + // up button
+ spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt!="") + if(tTmp.txt=="disable")
+ {
+ bUp5.pco=65535
+ tsw bUp5,1
+ }else if(tTmp.txt!="disable")
+ { + {
+ bUp5.pco=27501 + bUp5.pco=27501
+ tsw bUp5,0 + tsw bUp5,0
+ }else if(tTmp.txt!="")
+ {
+ bUp5.pco=65535
+ bUp5.txt=tTmp.txt
+ tsw bUp5,1
+ } + }
+ // stop button + // stop button
+ spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt!="") + if(tTmp.txt=="disable")
+ {
+ bStop5.pco=27501
+ tsw bStop5,0
+ }else if(tTmp.txt!="")
+ { + {
+ bStop5.pco=65535 + bStop5.pco=65535
+ bStop5.txt=tTmp.txt + bStop5.txt=tTmp.txt
+ tsw bStop5,1 + tsw bStop5,1
+ }else if(tTmp.txt!="disable")
+ {
+ bStop5.pco=27501
+ tsw bStop5,0
+ } + }
+ // down button + // down button
+ spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",2
+ if(tTmp.txt!="") + if(tTmp.txt=="disable")
+ {
+ bDown5.pco=27501
+ tsw bDown5,0
+ }else if(tTmp.txt!="")
+ { + {
+ bDown5.pco=65535 + bDown5.pco=65535
+ bDown5.txt=tTmp.txt + bDown5.txt=tTmp.txt
+ tsw bDown5,1 + tsw bDown5,1
+ }else if(tTmp.txt!="disable")
+ {
+ bDown5.pco=27501
+ tsw bDown5,0
+ } + }
+ } + }
+ if(type5.txt=="light") + if(type5.txt=="light")
@@ -464,13 +465,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
- Text : please check your backend configuration
+ Text : pls check your backend configuration + Text : pls check your backend configuration
Max. Text Size : 100 Max. Text Size : 100

40
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,34 +1,28 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:58:26.469803304 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:52:06.071870294 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 07:58:25.897799068 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:58:25.901799098 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1876,6 +2104,165 @@ +@@ -1880,6 +2108,166 @@
++ // up button ++ // up button
++ if(tTmp.txt!="") ++ if(tTmp.txt=="disable")
++ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt!="")
++ { ++ bUp5.txt=tTmp.txt
++ bUp5.pco=27501
++ tsw bUp5,0
++ // stop button ++ // stop button
++ if(tTmp.txt!="") ++ if(tTmp.txt=="disable")
++ bStop5.pco=65535
++ bStop5.txt=tTmp.txt
++ tsw bStop5,1
++ }else if(tTmp.txt!="disable")
++ { ++ {
++ bStop5.pco=27501 ++ bStop5.pco=27501
++ tsw bStop5,0 ++ tsw bStop5,0
++ }else if(tTmp.txt!="")
++ {
++ bStop5.pco=65535
++ bStop5.txt=tTmp.txt
++ tsw bStop5,1
++ } ++ }
++ // down button ++ // down button
++ spstr tId.txt,tTmp.txt,"|",2 ++ spstr tId.txt,tTmp.txt,"|",2
++ if(tTmp.txt!="") ++ if(tTmp.txt=="disable")
++ }else if(tTmp.txt!="")
++ bDown5.txt=tTmp.txt ++ bDown5.txt=tTmp.txt
++ }else if(tTmp.txt!="disable")
++ {
++ bDown5.pco=27501
++ tsw bDown5,0
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +0000

155
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -2674,38 +2674,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
}else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
}else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
}else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -2833,38 +2834,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
}else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
}else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
}else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -2992,38 +2994,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
}else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
}else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
}else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -3151,38 +3154,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
}else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
}else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
}else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
} }
} }
if(type4.txt=="light") if(type4.txt=="light")
@@ -3310,38 +3314,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",32 spstr strCommand.txt,tId.txt,"~",32
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp5.pco=65535
tsw bUp5,1
}else if(tTmp.txt!="disable")
{ {
bUp5.pco=27501 bUp5.pco=27501
tsw bUp5,0 tsw bUp5,0
}else if(tTmp.txt!="")
{
bUp5.pco=65535
bUp5.txt=tTmp.txt
tsw bUp5,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bStop5.pco=27501
tsw bStop5,0
}else if(tTmp.txt!="")
{ {
bStop5.pco=65535 bStop5.pco=65535
bStop5.txt=tTmp.txt bStop5.txt=tTmp.txt
tsw bStop5,1 tsw bStop5,1
}else if(tTmp.txt!="disable")
{
bStop5.pco=27501
tsw bStop5,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bDown5.pco=27501
tsw bDown5,0
}else if(tTmp.txt!="")
{ {
bDown5.pco=65535 bDown5.pco=65535
bDown5.txt=tTmp.txt bDown5.txt=tTmp.txt
tsw bDown5,1 tsw bDown5,1
}else if(tTmp.txt!="disable")
{
bDown5.pco=27501
tsw bDown5,0
} }
} }
if(type5.txt=="light") if(type5.txt=="light")

16
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -18,6 +18,10 @@ pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
115 Unique line(s) of event code 115 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
138 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
345 Line(s) of event code 345 Line(s) of event code
@@ -48,15 +52,11 @@ screensaver
237 Unique line(s) of event code 237 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1343 Line(s) of event code 1348 Line(s) of event code
571 Unique line(s) of event code 576 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
138 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
414 Component(s) 414 Component(s)
4665 Line(s) of event code 4670 Line(s) of event code
1234 Unique line(s) of event code 1239 Unique line(s) of event code

32
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -50,7 +50,7 @@ Variable (string) strCommand
ID : 10 ID : 10
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -647,39 +647,39 @@ Timer tmSerial
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5 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 bUp1.txt=tTmp.txt
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bUp1,0
bUp1.pco=27501
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6 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 bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bStop1,0
bStop1.pco=27501
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7 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 bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
bDown1.pco=65535 bDown1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bDown1,0
bDown1.pco=27501
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")

155
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -1509,38 +1509,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
}else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
}else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
}else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -1668,38 +1669,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
}else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
}else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
}else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -1827,38 +1829,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
}else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
}else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
}else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -1986,38 +1989,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
}else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
}else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
}else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
} }
} }
if(type4.txt=="light") if(type4.txt=="light")
@@ -2145,38 +2149,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",32 spstr strCommand.txt,tId.txt,"~",32
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp5.pco=65535
tsw bUp5,1
}else if(tTmp.txt!="disable")
{ {
bUp5.pco=27501 bUp5.pco=27501
tsw bUp5,0 tsw bUp5,0
}else if(tTmp.txt!="")
{
bUp5.pco=65535
bUp5.txt=tTmp.txt
tsw bUp5,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bStop5.pco=27501
tsw bStop5,0
}else if(tTmp.txt!="")
{ {
bStop5.pco=65535 bStop5.pco=65535
bStop5.txt=tTmp.txt bStop5.txt=tTmp.txt
tsw bStop5,1 tsw bStop5,1
}else if(tTmp.txt!="disable")
{
bStop5.pco=27501
tsw bStop5,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bDown5.pco=27501
tsw bDown5,0
}else if(tTmp.txt!="")
{ {
bDown5.pco=65535 bDown5.pco=65535
bDown5.txt=tTmp.txt bDown5.txt=tTmp.txt
tsw bDown5,1 tsw bDown5,1
}else if(tTmp.txt!="disable")
{
bDown5.pco=27501
tsw bDown5,0
} }
} }
if(type5.txt=="light") if(type5.txt=="light")

32
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -41,7 +41,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -362,39 +362,39 @@ Timer tmSerial
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5 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 bUp1.txt=tTmp.txt
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bUp1,0
bUp1.pco=27501
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6 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 bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bStop1,0
bStop1.pco=27501
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7 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 bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
bDown1.pco=65535 bDown1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bDown1,0
bDown1.pco=27501
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")

BIN
HMI/US/portrait/nspanel_US_P.HMI
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.tft
View File

Binary file not shown.

40
HMI/code_gen/pages/cardEntitiesSerial.py
View File

@@ -50,44 +50,48 @@ for i in range(1,6):
vis nNum{i},0 vis nNum{i},0
// get Button State (optional Value) // get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",{idxstart+5} spstr strCommand.txt,tId.txt,"~",{idxstart+5}
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{{
bUp{i}.pco=65535
tsw bUp{i},1
}}
else if(tTmp.txt!="disable")
{{ {{
bUp{i}.pco=27501 bUp{i}.pco=27501
tsw bUp{i},0 tsw bUp{i},0
}} }}
else if(tTmp.txt!="")
{{
bUp{i}.pco=65535
bUp{i}.txt=tTmp.txt
tsw bUp{i},1
}}
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt!="") if(tTmp.txt=="disable")
{{
bStop{i}.pco=27501
tsw bStop{i},0
}}
else if(tTmp.txt!="")
{{ {{
bStop{i}.pco=65535 bStop{i}.pco=65535
bStop{i}.txt=tTmp.txt bStop{i}.txt=tTmp.txt
tsw bStop{i},1 tsw bStop{i},1
}} }}
else if(tTmp.txt!="disable")
{{
bStop{i}.pco=27501
tsw bStop{i},0
}}
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="") if(tTmp.txt=="disable")
{{
bDown{i}.pco=27501
tsw bDown{i},0
}}
else if(tTmp.txt!="")
{{ {{
bDown{i}.pco=65535 bDown{i}.pco=65535
bDown{i}.txt=tTmp.txt bDown{i}.txt=tTmp.txt
tsw bDown{i},1 tsw bDown{i},1
}} }}
else if(tTmp.txt!="disable")
{{
bDown{i}.pco=27501
tsw bDown{i},0
}}
}} }}
if(type{i}.txt=="light") if(type{i}.txt=="light")
{{ {{

200
HMI/code_gen/pages/out.txt
View File

@@ -117,44 +117,48 @@ if(usize>1)
vis nNum1,0 vis nNum1,0
// get Button State (optional Value) // get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}
else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
} }
else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
}
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
} }
else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
}
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
} }
else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
}
} }
if(type1.txt=="light") if(type1.txt=="light")
{ {
@@ -285,44 +289,48 @@ if(usize>1)
vis nNum2,0 vis nNum2,0
// get Button State (optional Value) // get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}
else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
} }
else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
}
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
} }
else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
}
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
} }
else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
}
} }
if(type2.txt=="light") if(type2.txt=="light")
{ {
@@ -453,44 +461,48 @@ if(usize>1)
vis nNum3,0 vis nNum3,0
// get Button State (optional Value) // get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}
else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
} }
else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
}
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
} }
else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
}
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
} }
else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
}
} }
if(type3.txt=="light") if(type3.txt=="light")
{ {
@@ -621,44 +633,48 @@ if(usize>1)
vis nNum4,0 vis nNum4,0
// get Button State (optional Value) // get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}
else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
} }
else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
}
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
} }
else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
}
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
} }
else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
}
} }
if(type4.txt=="light") if(type4.txt=="light")
{ {
@@ -789,44 +805,48 @@ if(usize>1)
vis nNum5,0 vis nNum5,0
// get Button State (optional Value) // get Button State (optional Value)
spstr strCommand.txt,tId.txt,"~",32 spstr strCommand.txt,tId.txt,"~",32
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp5.pco=65535
tsw bUp5,1
}
else if(tTmp.txt!="disable")
{ {
bUp5.pco=27501 bUp5.pco=27501
tsw bUp5,0 tsw bUp5,0
} }
else if(tTmp.txt!="")
{
bUp5.pco=65535
bUp5.txt=tTmp.txt
tsw bUp5,1
}
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bStop5.pco=27501
tsw bStop5,0
}
else if(tTmp.txt!="")
{ {
bStop5.pco=65535 bStop5.pco=65535
bStop5.txt=tTmp.txt bStop5.txt=tTmp.txt
tsw bStop5,1 tsw bStop5,1
} }
else if(tTmp.txt!="disable")
{
bStop5.pco=27501
tsw bStop5,0
}
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bDown5.pco=27501
tsw bDown5,0
}
else if(tTmp.txt!="")
{ {
bDown5.pco=65535 bDown5.pco=65535
bDown5.txt=tTmp.txt bDown5.txt=tTmp.txt
tsw bDown5,1 tsw bDown5,1
} }
else if(tTmp.txt!="disable")
{
bDown5.pco=27501
tsw bDown5,0
}
} }
if(type5.txt=="light") if(type5.txt=="light")
{ {

124
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -2253,38 +2253,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
}else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
}else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
}else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -2412,38 +2413,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
}else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
}else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
}else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -2571,38 +2573,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
}else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
}else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
}else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -2730,38 +2733,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
}else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
}else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
}else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

16
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -22,6 +22,10 @@ popupNotify
17 Component(s) 17 Component(s)
200 Line(s) of event code 200 Line(s) of event code
125 Unique line(s) of event code 125 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
138 Unique line(s) of event code
screensaver screensaver
35 Component(s) 35 Component(s)
296 Line(s) of event code 296 Line(s) of event code
@@ -34,10 +38,6 @@ cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
205 Unique line(s) of event code 205 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
138 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code
@@ -52,11 +52,11 @@ cardThermo
290 Unique line(s) of event code 290 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1117 Line(s) of event code 1121 Line(s) of event code
487 Unique line(s) of event code 491 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
402 Component(s) 402 Component(s)
4440 Line(s) of event code 4444 Line(s) of event code
1164 Unique line(s) of event code 1168 Unique line(s) of event code

32
HMI/n2t-out-visual/popupShutter.txt
View File

@@ -50,7 +50,7 @@ Variable (string) strCommand
ID : 10 ID : 10
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -647,39 +647,39 @@ Timer tmSerial
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5 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 bUp1.txt=tTmp.txt
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bUp1,0
bUp1.pco=27501
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6 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 bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bStop1,0
bStop1.pco=27501
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7 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 bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
bDown1.pco=65535 bDown1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bDown1,0
bDown1.pco=27501
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")

124
HMI/n2t-out/cardEntities.txt
View File

@@ -1281,38 +1281,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",8 spstr strCommand.txt,tId.txt,"~",8
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp1.pco=65535
tsw bUp1,1
}else if(tTmp.txt!="disable")
{ {
bUp1.pco=27501 bUp1.pco=27501
tsw bUp1,0 tsw bUp1,0
}else if(tTmp.txt!="")
{
bUp1.pco=65535
bUp1.txt=tTmp.txt
tsw bUp1,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop1.txt=tTmp.txt bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
}else if(tTmp.txt!="disable")
{
bStop1.pco=27501
tsw bStop1,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown1.txt=tTmp.txt bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
}else if(tTmp.txt!="disable")
{
bDown1.pco=27501
tsw bDown1,0
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -1440,38 +1441,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",14 spstr strCommand.txt,tId.txt,"~",14
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp2.pco=65535
tsw bUp2,1
}else if(tTmp.txt!="disable")
{ {
bUp2.pco=27501 bUp2.pco=27501
tsw bUp2,0 tsw bUp2,0
}else if(tTmp.txt!="")
{
bUp2.pco=65535
bUp2.txt=tTmp.txt
tsw bUp2,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop2.txt=tTmp.txt bStop2.txt=tTmp.txt
tsw bStop2,1 tsw bStop2,1
}else if(tTmp.txt!="disable")
{
bStop2.pco=27501
tsw bStop2,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown2.txt=tTmp.txt bDown2.txt=tTmp.txt
tsw bDown2,1 tsw bDown2,1
}else if(tTmp.txt!="disable")
{
bDown2.pco=27501
tsw bDown2,0
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -1599,38 +1601,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",20 spstr strCommand.txt,tId.txt,"~",20
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp3.pco=65535
tsw bUp3,1
}else if(tTmp.txt!="disable")
{ {
bUp3.pco=27501 bUp3.pco=27501
tsw bUp3,0 tsw bUp3,0
}else if(tTmp.txt!="")
{
bUp3.pco=65535
bUp3.txt=tTmp.txt
tsw bUp3,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop3.txt=tTmp.txt bStop3.txt=tTmp.txt
tsw bStop3,1 tsw bStop3,1
}else if(tTmp.txt!="disable")
{
bStop3.pco=27501
tsw bStop3,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown3.txt=tTmp.txt bDown3.txt=tTmp.txt
tsw bDown3,1 tsw bDown3,1
}else if(tTmp.txt!="disable")
{
bDown3.pco=27501
tsw bDown3,0
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -1758,38 +1761,39 @@ Timer tmSerial
spstr strCommand.txt,tId.txt,"~",26 spstr strCommand.txt,tId.txt,"~",26
// up button // up button
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt!="") if(tTmp.txt=="disable")
{
bUp4.pco=65535
tsw bUp4,1
}else if(tTmp.txt!="disable")
{ {
bUp4.pco=27501 bUp4.pco=27501
tsw bUp4,0 tsw bUp4,0
}else if(tTmp.txt!="")
{
bUp4.pco=65535
bUp4.txt=tTmp.txt
tsw bUp4,1
} }
// stop button // stop button
spstr tId.txt,tTmp.txt,"|",1 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.pco=65535
bStop4.txt=tTmp.txt bStop4.txt=tTmp.txt
tsw bStop4,1 tsw bStop4,1
}else if(tTmp.txt!="disable")
{
bStop4.pco=27501
tsw bStop4,0
} }
// down button // down button
spstr tId.txt,tTmp.txt,"|",2 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.pco=65535
bDown4.txt=tTmp.txt bDown4.txt=tTmp.txt
tsw bDown4,1 tsw bDown4,1
}else if(tTmp.txt!="disable")
{
bDown4.pco=27501
tsw bDown4,0
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

32
HMI/n2t-out/popupShutter.txt
View File

@@ -41,7 +41,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -362,39 +362,39 @@ Timer tmSerial
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5 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 bUp1.txt=tTmp.txt
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bUp1,0
bUp1.pco=27501
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",6 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 bStop1.txt=tTmp.txt
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bStop1,0
bStop1.pco=27501
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",7 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 bDown1.txt=tTmp.txt
tsw bDown1,1 tsw bDown1,1
bDown1.pco=65535 bDown1.pco=65535
}else if(tTmp.txt!="disable")
{
tsw bDown1,0
bDown1.pco=27501
} }
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")

BIN
HMI/nspanel.HMI
View File

Binary file not shown.

BIN
HMI/nspanel.tft
View File

Binary file not shown.

6
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -426,13 +426,15 @@ class LuiPagesGen(object):
def generate_shutter_detail_page(self, entity): def generate_shutter_detail_page(self, entity):
entity = self._ha_api.get_entity(entity) entity = self._ha_api.get_entity(entity)
icon = entity.iconOverride icon_id = get_icon_id_ha("cover", state=entity.state)
icon_id = get_icon_id_ha("cover", state=entity.state, overwrite=icon)
pos = entity.attributes.get("current_position") pos = entity.attributes.get("current_position")
if pos is None: if pos is None:
pos_status = entity.state pos_status = entity.state
pos = "disable" pos = "disable"
else:
pos_status = pos
icon_up = get_icon_id("arrow-up") icon_up = get_icon_id("arrow-up")
icon_stop = get_icon_id("stop") icon_stop = get_icon_id("stop")