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

Merge branch 'main' into main

Browse Source
This commit is contained in:
Johannes
2022-05-22 09:58:03 +02:00
committed by GitHub
parent 7e13d2ec42 bb65a3cc54
commit 9a0ae4aade
28 changed files with 2127 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HMI/README.md
View File

@@ -89,7 +89,7 @@ The following message can be used to update the content on the cardEntities Page
`~light~light.entityName~1~17299~Light1~0` `~light~light.entityName~1~17299~Light1~0`
`~shutter~cover.entityName~0~17299~Shutter2~` `~shutter~cover.entityName~0~17299~Shutter2~iconUp|iconStop|iconDown`
`~delete~~~~~` `~delete~~~~~`
@@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page
### popupShutter Page ### popupShutter Page
`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition` `entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition~icon1~iconUp~iconStop~iconDown`
`entityUpdateDetail~1~77` `entityUpdateDetail~1~77`

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-21 14:55:46.021052258 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:55:46.849063256 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:55:05.103784355 +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-21 14:55:46.025052311 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:55:46.849063256 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:55:05.107784400 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

@@ -2251,25 +2251,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp1.pco=27501
tsw bUp1,0
}else
{ {
bUp1.pco=65535 bUp1.pco=65535
tsw bUp1,1 tsw bUp1,1
}else if(tTmp.txt!="disable")
{
bUp1.pco=27501
tsw bUp1,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
tsw bDown1,1
}else if(tTmp.txt!="disable")
{ {
bDown1.pco=27501 bDown1.pco=27501
tsw bDown1,0 tsw bDown1,0
}else
{
bDown1.pco=65535
tsw bDown1,1
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -2395,25 +2410,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp2.pco=27501
tsw bUp2,0
}else
{ {
bUp2.pco=65535 bUp2.pco=65535
tsw bUp2,1 tsw bUp2,1
}else if(tTmp.txt!="disable")
{
bUp2.pco=27501
tsw bUp2,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
tsw bDown2,1
}else if(tTmp.txt!="disable")
{ {
bDown2.pco=27501 bDown2.pco=27501
tsw bDown2,0 tsw bDown2,0
}else
{
bDown2.pco=65535
tsw bDown2,1
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -2539,25 +2569,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp3.pco=27501
tsw bUp3,0
}else
{ {
bUp3.pco=65535 bUp3.pco=65535
tsw bUp3,1 tsw bUp3,1
}else if(tTmp.txt!="disable")
{
bUp3.pco=27501
tsw bUp3,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
tsw bDown3,1
}else if(tTmp.txt!="disable")
{ {
bDown3.pco=27501 bDown3.pco=27501
tsw bDown3,0 tsw bDown3,0
}else
{
bDown3.pco=65535
tsw bDown3,1
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -2683,25 +2728,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp4.pco=27501
tsw bUp4,0
}else
{ {
bUp4.pco=65535 bUp4.pco=65535
tsw bUp4,1 tsw bUp4,1
}else if(tTmp.txt!="disable")
{
bUp4.pco=27501
tsw bUp4,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
tsw bDown4,1
}else if(tTmp.txt!="disable")
{ {
bDown4.pco=27501 bDown4.pco=27501
tsw bDown4,0 tsw bDown4,0
}else
{
bDown4.pco=65535
tsw bDown4,1
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

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

@@ -28,8 +28,8 @@ cardAlarm
224 Unique line(s) of event code 224 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
197 Line(s) of event code 241 Line(s) of event code
111 Unique 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
@@ -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)
1069 Line(s) of event code 1117 Line(s) of event code
462 Unique line(s) of event code 487 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
402 Component(s) 402 Component(s)
4347 Line(s) of event code 4439 Line(s) of event code
1117 Unique line(s) of event code 1163 Unique line(s) of event code

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

@@ -624,12 +624,63 @@ Timer tmSerial
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 if(tTmp.txt=="disable")
hPosition.val=sys0 {
vis tPosHeading,0
vis hPosition,0
}else
{
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
vis tPosHeading,1
vis hPosition,1
}
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
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!="")
{
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!="")
{
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") if(tInstruction.txt=="dimmode")
{ {
@@ -722,15 +773,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
TouchCap tc0 TouchCap tc0

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

@@ -1279,25 +1279,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp1.pco=27501
tsw bUp1,0
}else
{ {
bUp1.pco=65535 bUp1.pco=65535
tsw bUp1,1 tsw bUp1,1
}else if(tTmp.txt!="disable")
{
bUp1.pco=27501
tsw bUp1,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
tsw bDown1,1
}else if(tTmp.txt!="disable")
{ {
bDown1.pco=27501 bDown1.pco=27501
tsw bDown1,0 tsw bDown1,0
}else
{
bDown1.pco=65535
tsw bDown1,1
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -1423,25 +1438,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp2.pco=27501
tsw bUp2,0
}else
{ {
bUp2.pco=65535 bUp2.pco=65535
tsw bUp2,1 tsw bUp2,1
}else if(tTmp.txt!="disable")
{
bUp2.pco=27501
tsw bUp2,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
tsw bDown2,1
}else if(tTmp.txt!="disable")
{ {
bDown2.pco=27501 bDown2.pco=27501
tsw bDown2,0 tsw bDown2,0
}else
{
bDown2.pco=65535
tsw bDown2,1
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -1567,25 +1597,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp3.pco=27501
tsw bUp3,0
}else
{ {
bUp3.pco=65535 bUp3.pco=65535
tsw bUp3,1 tsw bUp3,1
}else if(tTmp.txt!="disable")
{
bUp3.pco=27501
tsw bUp3,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
tsw bDown3,1
}else if(tTmp.txt!="disable")
{ {
bDown3.pco=27501 bDown3.pco=27501
tsw bDown3,0 tsw bDown3,0
}else
{
bDown3.pco=65535
tsw bDown3,1
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -1711,25 +1756,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp4.pco=27501
tsw bUp4,0
}else
{ {
bUp4.pco=65535 bUp4.pco=65535
tsw bUp4,1 tsw bUp4,1
}else if(tTmp.txt!="disable")
{
bUp4.pco=27501
tsw bUp4,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
tsw bDown4,1
}else if(tTmp.txt!="disable")
{ {
bDown4.pco=27501 bDown4.pco=27501
tsw bDown4,0 tsw bDown4,0
}else
{
bDown4.pco=65535
tsw bDown4,1
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

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

@@ -339,12 +339,63 @@ Timer tmSerial
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 if(tTmp.txt=="disable")
hPosition.val=sys0 {
vis tPosHeading,0
vis hPosition,0
}else
{
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
vis tPosHeading,1
vis hPosition,1
}
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
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!="")
{
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!="")
{
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") if(tInstruction.txt=="dimmode")
{ {
@@ -437,15 +488,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
TouchCap tc0 TouchCap tc0

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.

49
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-21 14:55:46.021052258 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +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-21 14:55:46.025052311 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +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
@@ -1816,6 +2044,150 @@ @@ -1876,6 +2104,165 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -340,25 +340,40 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ 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
+ spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt=="0") + if(tTmp.txt!="")
+ {
+ bUp5.pco=27501
+ tsw bUp5,0
+ }else
+ { + {
+ bUp5.pco=65535 + bUp5.pco=65535
+ tsw bUp5,1 + tsw bUp5,1
+ }else if(tTmp.txt!="disable")
+ {
+ bUp5.pco=27501
+ tsw bUp5,0
+ } + }
+ // stop button
+ spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="0") + if(tTmp.txt!="")
+ {
+ bStop5.pco=65535
+ bStop5.txt=tTmp.txt
+ tsw bStop5,1
+ }else if(tTmp.txt!="disable")
+ {
+ bStop5.pco=27501
+ tsw bStop5,0
+ }
+ // down button
+ spstr tId.txt,tTmp.txt,"|",2
+ if(tTmp.txt!="")
+ {
+ bDown5.pco=65535
+ bDown5.txt=tTmp.txt
+ tsw bDown5,1
+ }else if(tTmp.txt!="disable")
+ { + {
+ bDown5.pco=27501 + bDown5.pco=27501
+ tsw bDown5,0 + tsw bDown5,0
+ }else
+ {
+ bDown5.pco=65535
+ tsw bDown5,1
+ } + }
+ } + }
+ if(type5.txt=="light") + if(type5.txt=="light")
@@ -449,8 +464,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-21 14:55:46.025052311 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,10 +1,34 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 14:55:46.457058049 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:55:04.663779439 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:55:46.025052311 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1816,6 +2044,150 @@ +@@ -1876,6 +2104,165 @@
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000 ++ // up button
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000 ++ if(tTmp.txt!="")
++ }else if(tTmp.txt!="disable")
++ {
++ bUp5.pco=27501
++ tsw bUp5,0
++ // stop button
++ if(tTmp.txt!="")
++ bStop5.pco=65535
++ bStop5.txt=tTmp.txt
++ tsw bStop5,1
++ }else if(tTmp.txt!="disable")
++ {
++ bStop5.pco=27501
++ tsw bStop5,0
++ }
++ // down button
++ spstr tId.txt,tTmp.txt,"|",2
++ if(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:55:04.215774434 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000

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

@@ -2672,25 +2672,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp1.pco=27501
tsw bUp1,0
}else
{ {
bUp1.pco=65535 bUp1.pco=65535
tsw bUp1,1 tsw bUp1,1
}else if(tTmp.txt!="disable")
{
bUp1.pco=27501
tsw bUp1,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
tsw bDown1,1
}else if(tTmp.txt!="disable")
{ {
bDown1.pco=27501 bDown1.pco=27501
tsw bDown1,0 tsw bDown1,0
}else
{
bDown1.pco=65535
tsw bDown1,1
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -2816,25 +2831,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp2.pco=27501
tsw bUp2,0
}else
{ {
bUp2.pco=65535 bUp2.pco=65535
tsw bUp2,1 tsw bUp2,1
}else if(tTmp.txt!="disable")
{
bUp2.pco=27501
tsw bUp2,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
tsw bDown2,1
}else if(tTmp.txt!="disable")
{ {
bDown2.pco=27501 bDown2.pco=27501
tsw bDown2,0 tsw bDown2,0
}else
{
bDown2.pco=65535
tsw bDown2,1
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -2960,25 +2990,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp3.pco=27501
tsw bUp3,0
}else
{ {
bUp3.pco=65535 bUp3.pco=65535
tsw bUp3,1 tsw bUp3,1
}else if(tTmp.txt!="disable")
{
bUp3.pco=27501
tsw bUp3,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
tsw bDown3,1
}else if(tTmp.txt!="disable")
{ {
bDown3.pco=27501 bDown3.pco=27501
tsw bDown3,0 tsw bDown3,0
}else
{
bDown3.pco=65535
tsw bDown3,1
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -3104,25 +3149,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp4.pco=27501
tsw bUp4,0
}else
{ {
bUp4.pco=65535 bUp4.pco=65535
tsw bUp4,1 tsw bUp4,1
}else if(tTmp.txt!="disable")
{
bUp4.pco=27501
tsw bUp4,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
tsw bDown4,1
}else if(tTmp.txt!="disable")
{ {
bDown4.pco=27501 bDown4.pco=27501
tsw bDown4,0 tsw bDown4,0
}else
{
bDown4.pco=65535
tsw bDown4,1
} }
} }
if(type4.txt=="light") if(type4.txt=="light")
@@ -3248,25 +3308,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp5.pco=27501
tsw bUp5,0
}else
{ {
bUp5.pco=65535 bUp5.pco=65535
tsw bUp5,1 tsw bUp5,1
}else if(tTmp.txt!="disable")
{
bUp5.pco=27501
tsw bUp5,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bStop5.pco=65535
bStop5.txt=tTmp.txt
tsw bStop5,1
}else if(tTmp.txt!="disable")
{
bStop5.pco=27501
tsw bStop5,0
}
// down button
spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="")
{
bDown5.pco=65535
bDown5.txt=tTmp.txt
tsw bDown5,1
}else if(tTmp.txt!="disable")
{ {
bDown5.pco=27501 bDown5.pco=27501
tsw bDown5,0 tsw bDown5,0
}else
{
bDown5.pco=65535
tsw bDown5,1
} }
} }
if(type5.txt=="light") if(type5.txt=="light")

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

@@ -18,10 +18,6 @@ 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)
197 Line(s) of event code
111 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
@@ -52,11 +48,15 @@ screensaver
237 Unique line(s) of event code 237 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1283 Line(s) of event code 1343 Line(s) of event code
540 Unique line(s) of event code 571 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)
4561 Line(s) of event code 4665 Line(s) of event code
1182 Unique line(s) of event code 1234 Unique line(s) of event code

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

@@ -624,12 +624,63 @@ Timer tmSerial
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 if(tTmp.txt=="disable")
hPosition.val=sys0 {
vis tPosHeading,0
vis hPosition,0
}else
{
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
vis tPosHeading,1
vis hPosition,1
}
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
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!="")
{
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!="")
{
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") if(tInstruction.txt=="dimmode")
{ {
@@ -722,15 +773,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
TouchCap tc0 TouchCap tc0

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

@@ -1507,25 +1507,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp1.pco=27501
tsw bUp1,0
}else
{ {
bUp1.pco=65535 bUp1.pco=65535
tsw bUp1,1 tsw bUp1,1
}else if(tTmp.txt!="disable")
{
bUp1.pco=27501
tsw bUp1,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
tsw bDown1,1
}else if(tTmp.txt!="disable")
{ {
bDown1.pco=27501 bDown1.pco=27501
tsw bDown1,0 tsw bDown1,0
}else
{
bDown1.pco=65535
tsw bDown1,1
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -1651,25 +1666,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp2.pco=27501
tsw bUp2,0
}else
{ {
bUp2.pco=65535 bUp2.pco=65535
tsw bUp2,1 tsw bUp2,1
}else if(tTmp.txt!="disable")
{
bUp2.pco=27501
tsw bUp2,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
tsw bDown2,1
}else if(tTmp.txt!="disable")
{ {
bDown2.pco=27501 bDown2.pco=27501
tsw bDown2,0 tsw bDown2,0
}else
{
bDown2.pco=65535
tsw bDown2,1
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -1795,25 +1825,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp3.pco=27501
tsw bUp3,0
}else
{ {
bUp3.pco=65535 bUp3.pco=65535
tsw bUp3,1 tsw bUp3,1
}else if(tTmp.txt!="disable")
{
bUp3.pco=27501
tsw bUp3,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
tsw bDown3,1
}else if(tTmp.txt!="disable")
{ {
bDown3.pco=27501 bDown3.pco=27501
tsw bDown3,0 tsw bDown3,0
}else
{
bDown3.pco=65535
tsw bDown3,1
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -1939,25 +1984,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp4.pco=27501
tsw bUp4,0
}else
{ {
bUp4.pco=65535 bUp4.pco=65535
tsw bUp4,1 tsw bUp4,1
}else if(tTmp.txt!="disable")
{
bUp4.pco=27501
tsw bUp4,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
tsw bDown4,1
}else if(tTmp.txt!="disable")
{ {
bDown4.pco=27501 bDown4.pco=27501
tsw bDown4,0 tsw bDown4,0
}else
{
bDown4.pco=65535
tsw bDown4,1
} }
} }
if(type4.txt=="light") if(type4.txt=="light")
@@ -2083,25 +2143,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp5.pco=27501
tsw bUp5,0
}else
{ {
bUp5.pco=65535 bUp5.pco=65535
tsw bUp5,1 tsw bUp5,1
}else if(tTmp.txt!="disable")
{
bUp5.pco=27501
tsw bUp5,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bStop5.pco=65535
bStop5.txt=tTmp.txt
tsw bStop5,1
}else if(tTmp.txt!="disable")
{
bStop5.pco=27501
tsw bStop5,0
}
// down button
spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="")
{
bDown5.pco=65535
bDown5.txt=tTmp.txt
tsw bDown5,1
}else if(tTmp.txt!="disable")
{ {
bDown5.pco=27501 bDown5.pco=27501
tsw bDown5,0 tsw bDown5,0
}else
{
bDown5.pco=65535
tsw bDown5,1
} }
} }
if(type5.txt=="light") if(type5.txt=="light")

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

@@ -339,12 +339,63 @@ Timer tmSerial
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 if(tTmp.txt=="disable")
hPosition.val=sys0 {
vis tPosHeading,0
vis hPosition,0
}else
{
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
vis tPosHeading,1
vis hPosition,1
}
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
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!="")
{
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!="")
{
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") if(tInstruction.txt=="dimmode")
{ {
@@ -437,15 +488,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
TouchCap tc0 TouchCap tc0

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.

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

@@ -7,7 +7,7 @@ head = sharedhead + """
""" + navigation """ + navigation
print(head) print(head)
start = 3 start = 3
for i in range(1,5): for i in range(1,6):
idxstart = start + (i-1)*6 idxstart = start + (i-1)*6
item = f""" item = f"""
// get Type // get Type
@@ -50,28 +50,44 @@ for i in range(1,5):
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{{
bUp{i}.pco=27501
tsw bUp{i},0
}}
else
{{ {{
bUp{i}.pco=65535 bUp{i}.pco=65535
tsw bUp{i},1 tsw bUp{i},1
}} }}
else if(tTmp.txt!="disable")
{{
bUp{i}.pco=27501
tsw bUp{i},0
}}
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt!="")
{{
bStop{i}.pco=65535
bStop{i}.txt=tTmp.txt
tsw bStop{i},1
}}
else if(tTmp.txt!="disable")
{{
bStop{i}.pco=27501
tsw bStop{i},0
}}
// down button
spstr tId.txt,tTmp.txt,"|",2
if(tTmp.txt!="")
{{
bDown{i}.pco=65535
bDown{i}.txt=tTmp.txt
tsw bDown{i},1
}}
else if(tTmp.txt!="disable")
{{ {{
bDown{i}.pco=27501 bDown{i}.pco=27501
tsw bDown{i},0 tsw bDown{i},0
}} }}
else
{{
bDown{i}.pco=65535
tsw bDown{i},1
}}
}} }}
if(type{i}.txt=="light") if(type{i}.txt=="light")
{{ {{

1014
HMI/code_gen/pages/out.txt Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -2251,25 +2251,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp1.pco=27501
tsw bUp1,0
}else
{ {
bUp1.pco=65535 bUp1.pco=65535
tsw bUp1,1 tsw bUp1,1
}else if(tTmp.txt!="disable")
{
bUp1.pco=27501
tsw bUp1,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
tsw bDown1,1
}else if(tTmp.txt!="disable")
{ {
bDown1.pco=27501 bDown1.pco=27501
tsw bDown1,0 tsw bDown1,0
}else
{
bDown1.pco=65535
tsw bDown1,1
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -2395,25 +2410,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp2.pco=27501
tsw bUp2,0
}else
{ {
bUp2.pco=65535 bUp2.pco=65535
tsw bUp2,1 tsw bUp2,1
}else if(tTmp.txt!="disable")
{
bUp2.pco=27501
tsw bUp2,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
tsw bDown2,1
}else if(tTmp.txt!="disable")
{ {
bDown2.pco=27501 bDown2.pco=27501
tsw bDown2,0 tsw bDown2,0
}else
{
bDown2.pco=65535
tsw bDown2,1
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -2539,25 +2569,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp3.pco=27501
tsw bUp3,0
}else
{ {
bUp3.pco=65535 bUp3.pco=65535
tsw bUp3,1 tsw bUp3,1
}else if(tTmp.txt!="disable")
{
bUp3.pco=27501
tsw bUp3,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
tsw bDown3,1
}else if(tTmp.txt!="disable")
{ {
bDown3.pco=27501 bDown3.pco=27501
tsw bDown3,0 tsw bDown3,0
}else
{
bDown3.pco=65535
tsw bDown3,1
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -2683,25 +2728,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp4.pco=27501
tsw bUp4,0
}else
{ {
bUp4.pco=65535 bUp4.pco=65535
tsw bUp4,1 tsw bUp4,1
}else if(tTmp.txt!="disable")
{
bUp4.pco=27501
tsw bUp4,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
tsw bDown4,1
}else if(tTmp.txt!="disable")
{ {
bDown4.pco=27501 bDown4.pco=27501
tsw bDown4,0 tsw bDown4,0
}else
{
bDown4.pco=65535
tsw bDown4,1
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

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

@@ -10,10 +10,6 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
popupShutter
20 Component(s)
197 Line(s) of event code
111 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
@@ -38,6 +34,10 @@ 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)
1069 Line(s) of event code 1117 Line(s) of event code
462 Unique line(s) of event code 487 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
402 Component(s) 402 Component(s)
4348 Line(s) of event code 4440 Line(s) of event code
1118 Unique line(s) of event code 1164 Unique line(s) of event code

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

@@ -624,12 +624,63 @@ Timer tmSerial
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 if(tTmp.txt=="disable")
hPosition.val=sys0 {
vis tPosHeading,0
vis hPosition,0
}else
{
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
vis tPosHeading,1
vis hPosition,1
}
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
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!="")
{
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!="")
{
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") if(tInstruction.txt=="dimmode")
{ {
@@ -722,15 +773,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
TouchCap tc0 TouchCap tc0

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

@@ -1279,25 +1279,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp1.pco=27501
tsw bUp1,0
}else
{ {
bUp1.pco=65535 bUp1.pco=65535
tsw bUp1,1 tsw bUp1,1
}else if(tTmp.txt!="disable")
{
bUp1.pco=27501
tsw bUp1,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown1.pco=65535
bDown1.txt=tTmp.txt
tsw bDown1,1
}else if(tTmp.txt!="disable")
{ {
bDown1.pco=27501 bDown1.pco=27501
tsw bDown1,0 tsw bDown1,0
}else
{
bDown1.pco=65535
tsw bDown1,1
} }
} }
if(type1.txt=="light") if(type1.txt=="light")
@@ -1423,25 +1438,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp2.pco=27501
tsw bUp2,0
}else
{ {
bUp2.pco=65535 bUp2.pco=65535
tsw bUp2,1 tsw bUp2,1
}else if(tTmp.txt!="disable")
{
bUp2.pco=27501
tsw bUp2,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown2.pco=65535
bDown2.txt=tTmp.txt
tsw bDown2,1
}else if(tTmp.txt!="disable")
{ {
bDown2.pco=27501 bDown2.pco=27501
tsw bDown2,0 tsw bDown2,0
}else
{
bDown2.pco=65535
tsw bDown2,1
} }
} }
if(type2.txt=="light") if(type2.txt=="light")
@@ -1567,25 +1597,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp3.pco=27501
tsw bUp3,0
}else
{ {
bUp3.pco=65535 bUp3.pco=65535
tsw bUp3,1 tsw bUp3,1
}else if(tTmp.txt!="disable")
{
bUp3.pco=27501
tsw bUp3,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown3.pco=65535
bDown3.txt=tTmp.txt
tsw bDown3,1
}else if(tTmp.txt!="disable")
{ {
bDown3.pco=27501 bDown3.pco=27501
tsw bDown3,0 tsw bDown3,0
}else
{
bDown3.pco=65535
tsw bDown3,1
} }
} }
if(type3.txt=="light") if(type3.txt=="light")
@@ -1711,25 +1756,40 @@ Timer tmSerial
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
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt!="")
{
bUp4.pco=27501
tsw bUp4,0
}else
{ {
bUp4.pco=65535 bUp4.pco=65535
tsw bUp4,1 tsw bUp4,1
}else if(tTmp.txt!="disable")
{
bUp4.pco=27501
tsw bUp4,0
} }
// stop button
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") 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!="")
{
bDown4.pco=65535
bDown4.txt=tTmp.txt
tsw bDown4,1
}else if(tTmp.txt!="disable")
{ {
bDown4.pco=27501 bDown4.pco=27501
tsw bDown4,0 tsw bDown4,0
}else
{
bDown4.pco=65535
tsw bDown4,1
} }
} }
if(type4.txt=="light") if(type4.txt=="light")

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

@@ -339,12 +339,63 @@ Timer tmSerial
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 if(tTmp.txt=="disable")
hPosition.val=sys0 {
vis tPosHeading,0
vis hPosition,0
}else
{
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
vis tPosHeading,1
vis hPosition,1
}
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",5
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!="")
{
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!="")
{
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") if(tInstruction.txt=="dimmode")
{ {
@@ -437,15 +488,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
TouchCap tc0 TouchCap tc0

BIN
HMI/nspanel.HMI
View File

Binary file not shown.

BIN
HMI/nspanel.tft
View File

Binary file not shown.

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

@@ -143,15 +143,20 @@ class LuiPagesGen(object):
entity = self._ha_api.get_entity(entityId) entity = self._ha_api.get_entity(entityId)
name = name if name is not None else entity.attributes.friendly_name name = name if name is not None else entity.attributes.friendly_name
if entityType == "cover": if entityType == "cover":
device_class = entity.attributes.get("device_class", "") device_class = entity.attributes.get("device_class", "")
icon_id = get_icon_id_ha("cover", state=entity.state, device_class=device_class, overwrite=icon) icon_id = get_icon_id_ha("cover", state=entity.state, device_class=device_class, overwrite=icon)
icon_up = get_icon_id("arrow-up")
icon_stop = get_icon_id("stop")
icon_down = get_icon_id("arrow-down")
pos = int(entity.attributes.get("current_position", 50)) pos = int(entity.attributes.get("current_position", 50))
if pos == 100: if pos == 100:
status = "0|1" status = f"disable|{icon_stop}|{icon_down}"
elif pos == 0: elif pos == 0:
status = "1|0" status = f"{icon_up}|{icon_stop}|disable"
else: else:
status = "1|1" status = f"{icon_up}|{icon_stop}|{icon_down}"
return f"~shutter~{entityId}~{icon_id}~17299~{name}~{status}" return f"~shutter~{entityId}~{icon_id}~17299~{name}~{status}"
if entityType in "light": if entityType in "light":
switch_val = 1 if entity.state == "on" else 0 switch_val = 1 if entity.state == "on" else 0
@@ -421,11 +426,25 @@ 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, overwrite=icon)
pos = entity.attributes.get("current_position") pos = entity.attributes.get("current_position")
if pos is None: if pos is None:
pos = entity.state pos_status = entity.state
pos = "disable"
icon_up = get_icon_id("arrow-up")
icon_stop = get_icon_id("stop")
icon_down = get_icon_id("arrow-down")
if pos == 100:
icon_up = "disable"
elif pos == 0:
icon_down = "disable"
pos_translation = get_translation(self._locale, "position") pos_translation = get_translation(self._locale, "position")
self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos}~{pos_translation}") self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}")
def send_message_page(self, id, heading, msg, b1, b2): def send_message_page(self, id, heading, msg, b1, b2):
self._send_mqtt_msg(f"pageType~popupNotify") self._send_mqtt_msg(f"pageType~popupNotify")