mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-25 04:02:14 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
144eaa2400
commit
93f0f5d431
@@ -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-07-23 11:57:25.607877939 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-07-23 14:02:48.223325770 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 11:57:26.699905836 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 14:02:49.219337687 +0000
|
||||||
@@ -14,6 +14,3 @@
|
@@ -14,6 +14,3 @@
|
||||||
//color vars
|
//color vars
|
||||||
int defaultFontColor=65535
|
int defaultFontColor=65535
|
||||||
@@ -8,104 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
|||||||
- // fix touch offset
|
- // fix touch offset
|
||||||
- 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/landscape/n2t-out/cardEntities.txt
|
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
|
|
||||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 11:57:26.703905939 +0000
|
|
||||||
@@ -1313,7 +1313,21 @@
|
|
||||||
tsw bDown1,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
|
||||||
+ if(type1.txt=="light")
|
|
||||||
+ {
|
|
||||||
+ vis bUp1,0
|
|
||||||
+ vis bStop1,0
|
|
||||||
+ vis bDown1,0
|
|
||||||
+ vis btOnOff1,1
|
|
||||||
+ vis bText1,0
|
|
||||||
+ vis hSlider1,0
|
|
||||||
+ vis nNum1,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",8
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ btOnOff1.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type1.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp1,0
|
|
||||||
vis bStop1,0
|
|
||||||
@@ -1462,7 +1476,21 @@
|
|
||||||
tsw bDown2,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
|
||||||
+ if(type2.txt=="light")
|
|
||||||
+ {
|
|
||||||
+ vis bUp2,0
|
|
||||||
+ vis bStop2,0
|
|
||||||
+ vis bDown2,0
|
|
||||||
+ vis btOnOff2,1
|
|
||||||
+ vis bText2,0
|
|
||||||
+ vis hSlider2,0
|
|
||||||
+ vis nNum2,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ btOnOff2.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type2.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp2,0
|
|
||||||
vis bStop2,0
|
|
||||||
@@ -1611,7 +1639,21 @@
|
|
||||||
tsw bDown3,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
|
||||||
+ if(type3.txt=="light")
|
|
||||||
+ {
|
|
||||||
+ vis bUp3,0
|
|
||||||
+ vis bStop3,0
|
|
||||||
+ vis bDown3,0
|
|
||||||
+ vis btOnOff3,1
|
|
||||||
+ vis bText3,0
|
|
||||||
+ vis hSlider3,0
|
|
||||||
+ vis nNum3,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",20
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ btOnOff3.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type3.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp3,0
|
|
||||||
vis bStop3,0
|
|
||||||
@@ -1760,7 +1802,21 @@
|
|
||||||
tsw bDown4,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
|
||||||
+ if(type4.txt=="light")
|
|
||||||
+ {
|
|
||||||
+ vis bUp4,0
|
|
||||||
+ vis bStop4,0
|
|
||||||
+ vis bDown4,0
|
|
||||||
+ vis btOnOff4,1
|
|
||||||
+ vis bText4,0
|
|
||||||
+ vis hSlider4,0
|
|
||||||
+ vis nNum4,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",26
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ btOnOff4.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type4.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp4,0
|
|
||||||
vis bStop4,0
|
|
||||||
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-07-23 11:57:25.607877939 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-07-23 14:02:48.223325770 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 11:57:26.703905939 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 14:02:49.219337687 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -2285,21 +2285,7 @@ Timer tmSerial
|
|||||||
tsw bDown1,1
|
tsw bDown1,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type1.txt=="light")
|
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp1,0
|
|
||||||
vis bStop1,0
|
|
||||||
vis bDown1,0
|
|
||||||
vis btOnOff1,1
|
|
||||||
vis bText1,0
|
|
||||||
vis hSlider1,0
|
|
||||||
vis nNum1,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff1.val=sys0
|
|
||||||
}
|
|
||||||
if(type1.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp1,0
|
vis bUp1,0
|
||||||
vis bStop1,0
|
vis bStop1,0
|
||||||
@@ -2448,21 +2434,7 @@ Timer tmSerial
|
|||||||
tsw bDown2,1
|
tsw bDown2,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type2.txt=="light")
|
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp2,0
|
|
||||||
vis bStop2,0
|
|
||||||
vis bDown2,0
|
|
||||||
vis btOnOff2,1
|
|
||||||
vis bText2,0
|
|
||||||
vis hSlider2,0
|
|
||||||
vis nNum2,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff2.val=sys0
|
|
||||||
}
|
|
||||||
if(type2.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp2,0
|
vis bUp2,0
|
||||||
vis bStop2,0
|
vis bStop2,0
|
||||||
@@ -2611,21 +2583,7 @@ Timer tmSerial
|
|||||||
tsw bDown3,1
|
tsw bDown3,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type3.txt=="light")
|
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp3,0
|
|
||||||
vis bStop3,0
|
|
||||||
vis bDown3,0
|
|
||||||
vis btOnOff3,1
|
|
||||||
vis bText3,0
|
|
||||||
vis hSlider3,0
|
|
||||||
vis nNum3,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff3.val=sys0
|
|
||||||
}
|
|
||||||
if(type3.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
@@ -2774,21 +2732,7 @@ Timer tmSerial
|
|||||||
tsw bDown4,1
|
tsw bDown4,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type4.txt=="light")
|
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp4,0
|
|
||||||
vis bStop4,0
|
|
||||||
vis bDown4,0
|
|
||||||
vis btOnOff4,1
|
|
||||||
vis bText4,0
|
|
||||||
vis hSlider4,0
|
|
||||||
vis nNum4,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff4.val=sys0
|
|
||||||
}
|
|
||||||
if(type4.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
|
|||||||
@@ -56,11 +56,11 @@ cardAlarm
|
|||||||
254 Unique line(s) of event code
|
254 Unique line(s) of event code
|
||||||
cardEntities
|
cardEntities
|
||||||
65 Component(s)
|
65 Component(s)
|
||||||
1179 Line(s) of event code
|
1127 Line(s) of event code
|
||||||
518 Unique line(s) of event code
|
514 Unique line(s) of event code
|
||||||
|
|
||||||
Total
|
Total
|
||||||
14 Page(s)
|
14 Page(s)
|
||||||
432 Component(s)
|
432 Component(s)
|
||||||
5193 Line(s) of event code
|
5141 Line(s) of event code
|
||||||
1351 Unique line(s) of event code
|
1351 Unique line(s) of event code
|
||||||
|
|||||||
@@ -1313,21 +1313,7 @@ Timer tmSerial
|
|||||||
tsw bDown1,1
|
tsw bDown1,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type1.txt=="light")
|
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp1,0
|
|
||||||
vis bStop1,0
|
|
||||||
vis bDown1,0
|
|
||||||
vis btOnOff1,1
|
|
||||||
vis bText1,0
|
|
||||||
vis hSlider1,0
|
|
||||||
vis nNum1,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff1.val=sys0
|
|
||||||
}
|
|
||||||
if(type1.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp1,0
|
vis bUp1,0
|
||||||
vis bStop1,0
|
vis bStop1,0
|
||||||
@@ -1476,21 +1462,7 @@ Timer tmSerial
|
|||||||
tsw bDown2,1
|
tsw bDown2,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type2.txt=="light")
|
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp2,0
|
|
||||||
vis bStop2,0
|
|
||||||
vis bDown2,0
|
|
||||||
vis btOnOff2,1
|
|
||||||
vis bText2,0
|
|
||||||
vis hSlider2,0
|
|
||||||
vis nNum2,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff2.val=sys0
|
|
||||||
}
|
|
||||||
if(type2.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp2,0
|
vis bUp2,0
|
||||||
vis bStop2,0
|
vis bStop2,0
|
||||||
@@ -1639,21 +1611,7 @@ Timer tmSerial
|
|||||||
tsw bDown3,1
|
tsw bDown3,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type3.txt=="light")
|
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp3,0
|
|
||||||
vis bStop3,0
|
|
||||||
vis bDown3,0
|
|
||||||
vis btOnOff3,1
|
|
||||||
vis bText3,0
|
|
||||||
vis hSlider3,0
|
|
||||||
vis nNum3,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff3.val=sys0
|
|
||||||
}
|
|
||||||
if(type3.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
@@ -1802,21 +1760,7 @@ Timer tmSerial
|
|||||||
tsw bDown4,1
|
tsw bDown4,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type4.txt=="light")
|
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp4,0
|
|
||||||
vis bStop4,0
|
|
||||||
vis bDown4,0
|
|
||||||
vis btOnOff4,1
|
|
||||||
vis bText4,0
|
|
||||||
vis hSlider4,0
|
|
||||||
vis nNum4,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff4.val=sys0
|
|
||||||
}
|
|
||||||
if(type4.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
|
|||||||
@@ -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-07-23 11:57:25.607877939 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-07-23 14:02:48.223325770 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000
|
||||||
@@ -14,6 +14,6 @@
|
@@ -14,6 +14,6 @@
|
||||||
//color vars
|
//color vars
|
||||||
int defaultFontColor=65535
|
int defaultFontColor=65535
|
||||||
@@ -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-07-23 11:57:25.611878041 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-07-23 14:02:48.227325818 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000
|
||||||
@@ -65,6 +65,16 @@
|
@@ -65,6 +65,16 @@
|
||||||
vis nNum4,0
|
vis nNum4,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -301,101 +301,165 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Hotspot mSwipeNext
|
Hotspot mSwipeNext
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -1313,7 +1545,21 @@
|
@@ -1830,6 +2062,155 @@
|
||||||
tsw bDown1,1
|
covx tTmp.txt,sys0,0,0
|
||||||
}
|
hSlider4.maxval=sys0
|
||||||
}
|
}
|
||||||
- if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
+ // get Type
|
||||||
+ if(type1.txt=="light")
|
+ spstr strCommand.txt,type5.txt,"~",27
|
||||||
|
+ // get internal name
|
||||||
|
+ spstr strCommand.txt,entn5.txt,"~",28
|
||||||
|
+ if(type5.txt=="delete"||type5.txt=="")
|
||||||
+ {
|
+ {
|
||||||
+ vis bUp1,0
|
+ vis bUp5,0
|
||||||
+ vis bStop1,0
|
+ vis bStop5,0
|
||||||
+ vis bDown1,0
|
+ vis bDown5,0
|
||||||
+ vis btOnOff1,1
|
+ vis btOnOff5,0
|
||||||
+ vis bText1,0
|
+ vis tEntity5,0
|
||||||
+ vis hSlider1,0
|
+ vis tIcon5,0
|
||||||
+ vis nNum1,0
|
+ vis bText5,0
|
||||||
+ // get Button State (optional Value)
|
+ vis hSlider5,0
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",8
|
+ vis nNum5,0
|
||||||
+ covx tTmp.txt,sys0,0,0
|
+ }else
|
||||||
+ btOnOff1.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type1.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp1,0
|
|
||||||
vis bStop1,0
|
|
||||||
@@ -1462,7 +1708,21 @@
|
|
||||||
tsw bDown2,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
|
||||||
+ if(type2.txt=="light")
|
|
||||||
+ {
|
+ {
|
||||||
+ vis bUp2,0
|
+ // change icon
|
||||||
+ vis bStop2,0
|
+ spstr strCommand.txt,tIcon5.txt,"~",29
|
||||||
+ vis bDown2,0
|
+ vis tIcon5,1
|
||||||
+ vis btOnOff2,1
|
+ // change icon color
|
||||||
+ vis bText2,0
|
+ spstr strCommand.txt,tTmp.txt,"~",30
|
||||||
+ vis hSlider2,0
|
|
||||||
+ vis nNum2,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
+ covx tTmp.txt,sys0,0,0
|
||||||
+ btOnOff2.val=sys0
|
+ tIcon5.pco=sys0
|
||||||
|
+ // set name
|
||||||
|
+ spstr strCommand.txt,tEntity5.txt,"~",31
|
||||||
|
+ vis tEntity5,1
|
||||||
+ }
|
+ }
|
||||||
+ if(type2.txt=="switch")
|
+ if(type5.txt=="shutter")
|
||||||
{
|
|
||||||
vis bUp2,0
|
|
||||||
vis bStop2,0
|
|
||||||
@@ -1611,7 +1871,21 @@
|
|
||||||
tsw bDown3,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
|
||||||
+ if(type3.txt=="light")
|
|
||||||
+ {
|
+ {
|
||||||
+ vis bUp3,0
|
+ vis bUp5,1
|
||||||
+ vis bStop3,0
|
+ vis bStop5,1
|
||||||
+ vis bDown3,0
|
+ vis bDown5,1
|
||||||
+ vis btOnOff3,1
|
+ vis btOnOff5,0
|
||||||
+ vis bText3,0
|
+ vis bText5,0
|
||||||
+ vis hSlider3,0
|
+ vis hSlider5,0
|
||||||
+ vis nNum3,0
|
+ vis nNum5,0
|
||||||
+ // get Button State (optional Value)
|
+ // get Button State (optional Value)
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",20
|
+ spstr strCommand.txt,tId.txt,"~",32
|
||||||
+ covx tTmp.txt,sys0,0,0
|
+ // up button
|
||||||
+ btOnOff3.val=sys0
|
+ spstr tId.txt,tTmp.txt,"|",3
|
||||||
|
+ if(tTmp.txt=="disable")
|
||||||
|
+ {
|
||||||
|
+ bUp5.pco=27501
|
||||||
|
+ spstr tId.txt,bUp5.txt,"|",0
|
||||||
|
+ tsw bUp5,0
|
||||||
|
+ }else if(tTmp.txt=="enable")
|
||||||
|
+ {
|
||||||
|
+ bUp5.pco=65535
|
||||||
|
+ spstr tId.txt,bUp5.txt,"|",0
|
||||||
|
+ tsw bUp5,1
|
||||||
|
+ }
|
||||||
|
+ // stop button
|
||||||
|
+ spstr tId.txt,tTmp.txt,"|",4
|
||||||
|
+ if(tTmp.txt=="disable")
|
||||||
|
+ {
|
||||||
|
+ bStop5.pco=27501
|
||||||
|
+ spstr tId.txt,bStop5.txt,"|",1
|
||||||
|
+ tsw bStop5,0
|
||||||
|
+ }else if(tTmp.txt=="enable")
|
||||||
|
+ {
|
||||||
|
+ bStop5.pco=65535
|
||||||
|
+ spstr tId.txt,bStop5.txt,"|",1
|
||||||
|
+ tsw bStop5,1
|
||||||
|
+ }
|
||||||
|
+ // down button
|
||||||
|
+ spstr tId.txt,tTmp.txt,"|",5
|
||||||
|
+ if(tTmp.txt=="disable")
|
||||||
|
+ {
|
||||||
|
+ bDown5.pco=27501
|
||||||
|
+ spstr tId.txt,bDown5.txt,"|",2
|
||||||
|
+ tsw bDown5,0
|
||||||
|
+ }else if(tTmp.txt=="enable")
|
||||||
|
+ {
|
||||||
|
+ bDown5.pco=65535
|
||||||
|
+ spstr tId.txt,bDown5.txt,"|",2
|
||||||
|
+ tsw bDown5,1
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ if(type3.txt=="switch")
|
+ if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp3,0
|
|
||||||
vis bStop3,0
|
|
||||||
@@ -1760,7 +2034,21 @@
|
|
||||||
tsw bDown4,1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
|
||||||
+ if(type4.txt=="light")
|
|
||||||
+ {
|
+ {
|
||||||
+ vis bUp4,0
|
+ vis bUp5,0
|
||||||
+ vis bStop4,0
|
+ vis bStop5,0
|
||||||
+ vis bDown4,0
|
+ vis bDown5,0
|
||||||
+ vis btOnOff4,1
|
+ vis btOnOff5,1
|
||||||
+ vis bText4,0
|
+ vis bText5,0
|
||||||
+ vis hSlider4,0
|
+ vis hSlider5,0
|
||||||
+ vis nNum4,0
|
+ vis nNum5,0
|
||||||
+ // get Button State (optional Value)
|
+ // get Button State (optional Value)
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",26
|
+ spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
+ covx tTmp.txt,sys0,0,0
|
+ covx tTmp.txt,sys0,0,0
|
||||||
+ btOnOff4.val=sys0
|
+ btOnOff5.val=sys0
|
||||||
+ }
|
+ }
|
||||||
+ if(type4.txt=="switch")
|
+ if(type5.txt=="text")
|
||||||
{
|
+ {
|
||||||
vis bUp4,0
|
+ vis bUp5,0
|
||||||
vis bStop4,0
|
+ vis bStop5,0
|
||||||
|
+ vis bDown5,0
|
||||||
|
+ vis btOnOff5,0
|
||||||
|
+ vis bText5,1
|
||||||
|
+ tsw bText5,0
|
||||||
|
+ vis hSlider5,0
|
||||||
|
+ vis nNum5,0
|
||||||
|
+ bText5.pco=65535
|
||||||
|
+ bText5.pco2=65535
|
||||||
|
+ // get Text (optional Value)
|
||||||
|
+ spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
+ }
|
||||||
|
+ if(type5.txt=="button")
|
||||||
|
+ {
|
||||||
|
+ vis bUp5,0
|
||||||
|
+ vis bStop5,0
|
||||||
|
+ vis bDown5,0
|
||||||
|
+ vis btOnOff5,0
|
||||||
|
+ vis bText5,1
|
||||||
|
+ tsw bText5,1
|
||||||
|
+ vis hSlider5,0
|
||||||
|
+ vis nNum5,0
|
||||||
|
+ bText5.pco=1374
|
||||||
|
+ bText5.pco2=1374
|
||||||
|
+ // get Text (optional Value)
|
||||||
|
+ spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
+ }
|
||||||
|
+ if(type5.txt=="number")
|
||||||
|
+ {
|
||||||
|
+ vis bUp5,0
|
||||||
|
+ vis bStop5,0
|
||||||
|
+ vis bDown5,0
|
||||||
|
+ vis btOnOff5,0
|
||||||
|
+ vis bText5,0
|
||||||
|
+ tsw bText5,0
|
||||||
|
+ vis hSlider5,1
|
||||||
|
+ vis nNum5,1
|
||||||
|
+ // get config (optional Value) (use bText as variable)
|
||||||
|
+ spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
+ //first value is current value
|
||||||
|
+ spstr bText5.txt,tTmp.txt,"|",0
|
||||||
|
+ covx tTmp.txt,sys0,0,0
|
||||||
|
+ hSlider5.val=sys0
|
||||||
|
+ nNum5.val=sys0
|
||||||
|
+ //second value is min value
|
||||||
|
+ spstr bText5.txt,tTmp.txt,"|",1
|
||||||
|
+ covx tTmp.txt,sys0,0,0
|
||||||
|
+ hSlider5.minval=sys0
|
||||||
|
+ //third value is max value
|
||||||
|
+ spstr bText5.txt,tTmp.txt,"|",2
|
||||||
|
+ covx tTmp.txt,sys0,0,0
|
||||||
|
+ hSlider5.maxval=sys0
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
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-07-23 11:57:25.607877939 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-07-23 14:02:48.223325770 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 11:57:26.123891121 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +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
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 11:57:26.139891530 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 14:02:48.743331992 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-07-23 11:57:25.607877939 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-07-23 14:02:48.223325770 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000
|
||||||
+@@ -14,6 +14,6 @@
|
+@@ -14,6 +14,6 @@
|
||||||
+ //color vars
|
+ //color vars
|
||||||
+ int defaultFontColor=65535
|
+ int defaultFontColor=65535
|
||||||
+ int defaultBcoColor=6371
|
+ int defaultBcoColor=6371
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 14:02:48.227325818 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000
|
||||||
+@@ -65,6 +65,16 @@
|
+@@ -65,6 +65,16 @@
|
||||||
+ vis bPrev,0
|
+ vis bPrev,0
|
||||||
+ vis bNext,0
|
+ vis bNext,0
|
||||||
@@ -21,82 +21,17 @@
|
|||||||
+@@ -990,6 +1169,33 @@
|
+@@ -990,6 +1169,33 @@
|
||||||
+@@ -1111,6 +1317,32 @@
|
+@@ -1111,6 +1317,32 @@
|
||||||
+ page popupFan
|
+ page popupFan
|
||||||
+@@ -1313,7 +1545,21 @@
|
+@@ -1830,6 +2062,155 @@
|
||||||
+ tsw bDown1,1
|
++ vis bUp5,0
|
||||||
+ }
|
++ vis bStop5,0
|
||||||
+- if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
++ vis bDown5,0
|
||||||
++ if(type1.txt=="light")
|
++ vis btOnOff5,1
|
||||||
++ vis bUp1,0
|
++ vis bText5,0
|
||||||
++ vis bStop1,0
|
++ vis hSlider5,0
|
||||||
++ vis bDown1,0
|
++ vis nNum5,0
|
||||||
++ vis btOnOff1,1
|
|
||||||
++ vis bText1,0
|
|
||||||
++ vis hSlider1,0
|
|
||||||
++ vis nNum1,0
|
|
||||||
++ spstr strCommand.txt,tTmp.txt,"~",8
|
|
||||||
++ covx tTmp.txt,sys0,0,0
|
|
||||||
++ btOnOff1.val=sys0
|
|
||||||
++ if(type1.txt=="switch")
|
|
||||||
+ {
|
|
||||||
+ vis bUp1,0
|
|
||||||
+ vis bStop1,0
|
|
||||||
+@@ -1462,7 +1708,21 @@
|
|
||||||
+ tsw bDown2,1
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+- if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
|
||||||
++ if(type2.txt=="light")
|
|
||||||
++ vis bUp2,0
|
|
||||||
++ vis bStop2,0
|
|
||||||
++ vis bDown2,0
|
|
||||||
++ vis btOnOff2,1
|
|
||||||
++ vis bText2,0
|
|
||||||
++ vis hSlider2,0
|
|
||||||
++ vis nNum2,0
|
|
||||||
++ spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
++ btOnOff2.val=sys0
|
|
||||||
++ if(type2.txt=="switch")
|
|
||||||
+ {
|
|
||||||
+ vis bUp2,0
|
|
||||||
+ vis bStop2,0
|
|
||||||
+@@ -1611,7 +1871,21 @@
|
|
||||||
+ tsw bDown3,1
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+- if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
|
||||||
++ if(type3.txt=="light")
|
|
||||||
++ vis bUp3,0
|
|
||||||
++ vis bStop3,0
|
|
||||||
++ vis bDown3,0
|
|
||||||
++ vis btOnOff3,1
|
|
||||||
++ vis bText3,0
|
|
||||||
++ vis hSlider3,0
|
|
||||||
++ vis nNum3,0
|
|
||||||
++ spstr strCommand.txt,tTmp.txt,"~",20
|
|
||||||
++ btOnOff3.val=sys0
|
|
||||||
++ if(type3.txt=="switch")
|
|
||||||
+ {
|
|
||||||
+ vis bUp3,0
|
|
||||||
+ vis bStop3,0
|
|
||||||
+@@ -1760,7 +2034,21 @@
|
|
||||||
+ tsw bDown4,1
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+- if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
|
||||||
++ if(type4.txt=="light")
|
|
||||||
++ vis bUp4,0
|
|
||||||
++ vis bStop4,0
|
|
||||||
++ vis bDown4,0
|
|
||||||
++ vis btOnOff4,1
|
|
||||||
++ vis bText4,0
|
|
||||||
++ vis hSlider4,0
|
|
||||||
++ vis nNum4,0
|
|
||||||
++ // get Button State (optional Value)
|
++ // get Button State (optional Value)
|
||||||
++ spstr strCommand.txt,tTmp.txt,"~",26
|
++ spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
++ btOnOff4.val=sys0
|
++ covx tTmp.txt,sys0,0,0
|
||||||
++ if(type4.txt=="switch")
|
++ btOnOff5.val=sys0
|
||||||
+ {
|
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 14:02:48.223325770 +0000
|
||||||
+ vis bUp4,0
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +0000
|
||||||
+ vis bStop4,0
|
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 11:57:25.607877939 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 11:57:26.123891121 +0000
|
|
||||||
|
|||||||
@@ -2710,21 +2710,7 @@ Timer tmSerial
|
|||||||
tsw bDown1,1
|
tsw bDown1,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type1.txt=="light")
|
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp1,0
|
|
||||||
vis bStop1,0
|
|
||||||
vis bDown1,0
|
|
||||||
vis btOnOff1,1
|
|
||||||
vis bText1,0
|
|
||||||
vis hSlider1,0
|
|
||||||
vis nNum1,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff1.val=sys0
|
|
||||||
}
|
|
||||||
if(type1.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp1,0
|
vis bUp1,0
|
||||||
vis bStop1,0
|
vis bStop1,0
|
||||||
@@ -2873,21 +2859,7 @@ Timer tmSerial
|
|||||||
tsw bDown2,1
|
tsw bDown2,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type2.txt=="light")
|
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp2,0
|
|
||||||
vis bStop2,0
|
|
||||||
vis bDown2,0
|
|
||||||
vis btOnOff2,1
|
|
||||||
vis bText2,0
|
|
||||||
vis hSlider2,0
|
|
||||||
vis nNum2,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff2.val=sys0
|
|
||||||
}
|
|
||||||
if(type2.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp2,0
|
vis bUp2,0
|
||||||
vis bStop2,0
|
vis bStop2,0
|
||||||
@@ -3036,21 +3008,7 @@ Timer tmSerial
|
|||||||
tsw bDown3,1
|
tsw bDown3,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type3.txt=="light")
|
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp3,0
|
|
||||||
vis bStop3,0
|
|
||||||
vis bDown3,0
|
|
||||||
vis btOnOff3,1
|
|
||||||
vis bText3,0
|
|
||||||
vis hSlider3,0
|
|
||||||
vis nNum3,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff3.val=sys0
|
|
||||||
}
|
|
||||||
if(type3.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
@@ -3199,21 +3157,7 @@ Timer tmSerial
|
|||||||
tsw bDown4,1
|
tsw bDown4,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type4.txt=="light")
|
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp4,0
|
|
||||||
vis bStop4,0
|
|
||||||
vis bDown4,0
|
|
||||||
vis btOnOff4,1
|
|
||||||
vis bText4,0
|
|
||||||
vis hSlider4,0
|
|
||||||
vis nNum4,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff4.val=sys0
|
|
||||||
}
|
|
||||||
if(type4.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
@@ -3283,6 +3227,155 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hSlider4.maxval=sys0
|
hSlider4.maxval=sys0
|
||||||
}
|
}
|
||||||
|
// get Type
|
||||||
|
spstr strCommand.txt,type5.txt,"~",27
|
||||||
|
// get internal name
|
||||||
|
spstr strCommand.txt,entn5.txt,"~",28
|
||||||
|
if(type5.txt=="delete"||type5.txt=="")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis tEntity5,0
|
||||||
|
vis tIcon5,0
|
||||||
|
vis bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
// change icon
|
||||||
|
spstr strCommand.txt,tIcon5.txt,"~",29
|
||||||
|
vis tIcon5,1
|
||||||
|
// change icon color
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",30
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
tIcon5.pco=sys0
|
||||||
|
// set name
|
||||||
|
spstr strCommand.txt,tEntity5.txt,"~",31
|
||||||
|
vis tEntity5,1
|
||||||
|
}
|
||||||
|
if(type5.txt=="shutter")
|
||||||
|
{
|
||||||
|
vis bUp5,1
|
||||||
|
vis bStop5,1
|
||||||
|
vis bDown5,1
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
// get Button State (optional Value)
|
||||||
|
spstr strCommand.txt,tId.txt,"~",32
|
||||||
|
// up button
|
||||||
|
spstr tId.txt,tTmp.txt,"|",3
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
bUp5.pco=27501
|
||||||
|
spstr tId.txt,bUp5.txt,"|",0
|
||||||
|
tsw bUp5,0
|
||||||
|
}else if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
bUp5.pco=65535
|
||||||
|
spstr tId.txt,bUp5.txt,"|",0
|
||||||
|
tsw bUp5,1
|
||||||
|
}
|
||||||
|
// stop button
|
||||||
|
spstr tId.txt,tTmp.txt,"|",4
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
bStop5.pco=27501
|
||||||
|
spstr tId.txt,bStop5.txt,"|",1
|
||||||
|
tsw bStop5,0
|
||||||
|
}else if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
bStop5.pco=65535
|
||||||
|
spstr tId.txt,bStop5.txt,"|",1
|
||||||
|
tsw bStop5,1
|
||||||
|
}
|
||||||
|
// down button
|
||||||
|
spstr tId.txt,tTmp.txt,"|",5
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
bDown5.pco=27501
|
||||||
|
spstr tId.txt,bDown5.txt,"|",2
|
||||||
|
tsw bDown5,0
|
||||||
|
}else if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
bDown5.pco=65535
|
||||||
|
spstr tId.txt,bDown5.txt,"|",2
|
||||||
|
tsw bDown5,1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,1
|
||||||
|
vis bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
// get Button State (optional Value)
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
btOnOff5.val=sys0
|
||||||
|
}
|
||||||
|
if(type5.txt=="text")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,1
|
||||||
|
tsw bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
bText5.pco=65535
|
||||||
|
bText5.pco2=65535
|
||||||
|
// get Text (optional Value)
|
||||||
|
spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
}
|
||||||
|
if(type5.txt=="button")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,1
|
||||||
|
tsw bText5,1
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
bText5.pco=1374
|
||||||
|
bText5.pco2=1374
|
||||||
|
// get Text (optional Value)
|
||||||
|
spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
}
|
||||||
|
if(type5.txt=="number")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,0
|
||||||
|
tsw bText5,0
|
||||||
|
vis hSlider5,1
|
||||||
|
vis nNum5,1
|
||||||
|
// get config (optional Value) (use bText as variable)
|
||||||
|
spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
//first value is current value
|
||||||
|
spstr bText5.txt,tTmp.txt,"|",0
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider5.val=sys0
|
||||||
|
nNum5.val=sys0
|
||||||
|
//second value is min value
|
||||||
|
spstr bText5.txt,tTmp.txt,"|",1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider5.minval=sys0
|
||||||
|
//third value is max value
|
||||||
|
spstr bText5.txt,tTmp.txt,"|",2
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider5.maxval=sys0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,6 +30,10 @@ pageStartup
|
|||||||
19 Component(s)
|
19 Component(s)
|
||||||
167 Line(s) of event code
|
167 Line(s) of event code
|
||||||
122 Unique line(s) of event code
|
122 Unique line(s) of event code
|
||||||
|
cardEntities
|
||||||
|
77 Component(s)
|
||||||
|
1348 Line(s) of event code
|
||||||
|
599 Unique line(s) of event code
|
||||||
popupShutter
|
popupShutter
|
||||||
25 Component(s)
|
25 Component(s)
|
||||||
388 Line(s) of event code
|
388 Line(s) of event code
|
||||||
@@ -50,10 +54,6 @@ cardAlarm
|
|||||||
40 Component(s)
|
40 Component(s)
|
||||||
421 Line(s) of event code
|
421 Line(s) of event code
|
||||||
254 Unique line(s) of event code
|
254 Unique line(s) of event code
|
||||||
cardEntities
|
|
||||||
77 Component(s)
|
|
||||||
1267 Line(s) of event code
|
|
||||||
541 Unique line(s) of event code
|
|
||||||
cardThermo
|
cardThermo
|
||||||
53 Component(s)
|
53 Component(s)
|
||||||
580 Line(s) of event code
|
580 Line(s) of event code
|
||||||
@@ -62,5 +62,5 @@ cardThermo
|
|||||||
Total
|
Total
|
||||||
14 Page(s)
|
14 Page(s)
|
||||||
444 Component(s)
|
444 Component(s)
|
||||||
5282 Line(s) of event code
|
5363 Line(s) of event code
|
||||||
1370 Unique line(s) of event code
|
1424 Unique line(s) of event code
|
||||||
|
|||||||
@@ -1545,21 +1545,7 @@ Timer tmSerial
|
|||||||
tsw bDown1,1
|
tsw bDown1,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type1.txt=="light")
|
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp1,0
|
|
||||||
vis bStop1,0
|
|
||||||
vis bDown1,0
|
|
||||||
vis btOnOff1,1
|
|
||||||
vis bText1,0
|
|
||||||
vis hSlider1,0
|
|
||||||
vis nNum1,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",8
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff1.val=sys0
|
|
||||||
}
|
|
||||||
if(type1.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp1,0
|
vis bUp1,0
|
||||||
vis bStop1,0
|
vis bStop1,0
|
||||||
@@ -1708,21 +1694,7 @@ Timer tmSerial
|
|||||||
tsw bDown2,1
|
tsw bDown2,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type2.txt=="light")
|
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp2,0
|
|
||||||
vis bStop2,0
|
|
||||||
vis bDown2,0
|
|
||||||
vis btOnOff2,1
|
|
||||||
vis bText2,0
|
|
||||||
vis hSlider2,0
|
|
||||||
vis nNum2,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",14
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff2.val=sys0
|
|
||||||
}
|
|
||||||
if(type2.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp2,0
|
vis bUp2,0
|
||||||
vis bStop2,0
|
vis bStop2,0
|
||||||
@@ -1871,21 +1843,7 @@ Timer tmSerial
|
|||||||
tsw bDown3,1
|
tsw bDown3,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type3.txt=="light")
|
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp3,0
|
|
||||||
vis bStop3,0
|
|
||||||
vis bDown3,0
|
|
||||||
vis btOnOff3,1
|
|
||||||
vis bText3,0
|
|
||||||
vis hSlider3,0
|
|
||||||
vis nNum3,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",20
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff3.val=sys0
|
|
||||||
}
|
|
||||||
if(type3.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
@@ -2034,21 +1992,7 @@ Timer tmSerial
|
|||||||
tsw bDown4,1
|
tsw bDown4,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type4.txt=="light")
|
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||||
{
|
|
||||||
vis bUp4,0
|
|
||||||
vis bStop4,0
|
|
||||||
vis bDown4,0
|
|
||||||
vis btOnOff4,1
|
|
||||||
vis bText4,0
|
|
||||||
vis hSlider4,0
|
|
||||||
vis nNum4,0
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",26
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff4.val=sys0
|
|
||||||
}
|
|
||||||
if(type4.txt=="switch")
|
|
||||||
{
|
{
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
@@ -2118,6 +2062,155 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hSlider4.maxval=sys0
|
hSlider4.maxval=sys0
|
||||||
}
|
}
|
||||||
|
// get Type
|
||||||
|
spstr strCommand.txt,type5.txt,"~",27
|
||||||
|
// get internal name
|
||||||
|
spstr strCommand.txt,entn5.txt,"~",28
|
||||||
|
if(type5.txt=="delete"||type5.txt=="")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis tEntity5,0
|
||||||
|
vis tIcon5,0
|
||||||
|
vis bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
// change icon
|
||||||
|
spstr strCommand.txt,tIcon5.txt,"~",29
|
||||||
|
vis tIcon5,1
|
||||||
|
// change icon color
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",30
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
tIcon5.pco=sys0
|
||||||
|
// set name
|
||||||
|
spstr strCommand.txt,tEntity5.txt,"~",31
|
||||||
|
vis tEntity5,1
|
||||||
|
}
|
||||||
|
if(type5.txt=="shutter")
|
||||||
|
{
|
||||||
|
vis bUp5,1
|
||||||
|
vis bStop5,1
|
||||||
|
vis bDown5,1
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
// get Button State (optional Value)
|
||||||
|
spstr strCommand.txt,tId.txt,"~",32
|
||||||
|
// up button
|
||||||
|
spstr tId.txt,tTmp.txt,"|",3
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
bUp5.pco=27501
|
||||||
|
spstr tId.txt,bUp5.txt,"|",0
|
||||||
|
tsw bUp5,0
|
||||||
|
}else if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
bUp5.pco=65535
|
||||||
|
spstr tId.txt,bUp5.txt,"|",0
|
||||||
|
tsw bUp5,1
|
||||||
|
}
|
||||||
|
// stop button
|
||||||
|
spstr tId.txt,tTmp.txt,"|",4
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
bStop5.pco=27501
|
||||||
|
spstr tId.txt,bStop5.txt,"|",1
|
||||||
|
tsw bStop5,0
|
||||||
|
}else if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
bStop5.pco=65535
|
||||||
|
spstr tId.txt,bStop5.txt,"|",1
|
||||||
|
tsw bStop5,1
|
||||||
|
}
|
||||||
|
// down button
|
||||||
|
spstr tId.txt,tTmp.txt,"|",5
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
bDown5.pco=27501
|
||||||
|
spstr tId.txt,bDown5.txt,"|",2
|
||||||
|
tsw bDown5,0
|
||||||
|
}else if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
bDown5.pco=65535
|
||||||
|
spstr tId.txt,bDown5.txt,"|",2
|
||||||
|
tsw bDown5,1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,1
|
||||||
|
vis bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
// get Button State (optional Value)
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",32
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
btOnOff5.val=sys0
|
||||||
|
}
|
||||||
|
if(type5.txt=="text")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,1
|
||||||
|
tsw bText5,0
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
bText5.pco=65535
|
||||||
|
bText5.pco2=65535
|
||||||
|
// get Text (optional Value)
|
||||||
|
spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
}
|
||||||
|
if(type5.txt=="button")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,1
|
||||||
|
tsw bText5,1
|
||||||
|
vis hSlider5,0
|
||||||
|
vis nNum5,0
|
||||||
|
bText5.pco=1374
|
||||||
|
bText5.pco2=1374
|
||||||
|
// get Text (optional Value)
|
||||||
|
spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
}
|
||||||
|
if(type5.txt=="number")
|
||||||
|
{
|
||||||
|
vis bUp5,0
|
||||||
|
vis bStop5,0
|
||||||
|
vis bDown5,0
|
||||||
|
vis btOnOff5,0
|
||||||
|
vis bText5,0
|
||||||
|
tsw bText5,0
|
||||||
|
vis hSlider5,1
|
||||||
|
vis nNum5,1
|
||||||
|
// get config (optional Value) (use bText as variable)
|
||||||
|
spstr strCommand.txt,bText5.txt,"~",32
|
||||||
|
//first value is current value
|
||||||
|
spstr bText5.txt,tTmp.txt,"|",0
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider5.val=sys0
|
||||||
|
nNum5.val=sys0
|
||||||
|
//second value is min value
|
||||||
|
spstr bText5.txt,tTmp.txt,"|",1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider5.minval=sys0
|
||||||
|
//third value is max value
|
||||||
|
spstr bText5.txt,tTmp.txt,"|",2
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider5.maxval=sys0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user