mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-24 08:24:25 +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
3349ce5996
commit
5dcd5be9ce
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:50:29.301937207 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-23 11:57:25.607877939 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 11:57:26.699905836 +0000
|
||||
@@ -14,6 +14,3 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
@@ -8,18 +8,104 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
- 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
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:50:29.301937207 +0000
|
||||
@@ -152,7 +152,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
- Text : 38
|
||||
+ Text : 39
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-23 11:57:25.607877939 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 11:57:26.703905939 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -12,8 +12,8 @@ popupNotify
|
||||
143 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
234 Line(s) of event code
|
||||
148 Unique line(s) of event code
|
||||
236 Line(s) of event code
|
||||
150 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
386 Line(s) of event code
|
||||
@@ -62,5 +62,5 @@ cardEntities
|
||||
Total
|
||||
14 Page(s)
|
||||
432 Component(s)
|
||||
5191 Line(s) of event code
|
||||
1350 Unique line(s) of event code
|
||||
5193 Line(s) of event code
|
||||
1351 Unique line(s) of event code
|
||||
|
||||
@@ -544,7 +544,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -560,8 +560,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -325,7 +325,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -341,8 +341,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
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 09:50:28.361934134 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:50:28.817935625 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-23 11:57:25.607877939 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +0000
|
||||
@@ -14,6 +14,6 @@
|
||||
//color vars
|
||||
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
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:50:28.817935625 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
|
||||
@@ -65,6 +65,16 @@
|
||||
vis nNum4,0
|
||||
vis bPrev,0
|
||||
@@ -268,11 +268,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Hotspot mSpecial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1110,6 +1316,32 @@
|
||||
{
|
||||
@@ -1111,6 +1317,32 @@
|
||||
page popupFan
|
||||
}
|
||||
+
|
||||
|
||||
+Hotspot m4
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -298,12 +297,105 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
+ {
|
||||
+ page popupFan
|
||||
+ }
|
||||
|
||||
+
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1313,7 +1545,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 +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
|
||||
+ // 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 +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
|
||||
+ // 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 +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)
|
||||
+ 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/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:50:28.817935625 +0000
|
||||
--- 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
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:50:28.829935664 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:50:28.817935625 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 11:57:26.139891530 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-07-23 11:57:25.607877939 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +0000
|
||||
+@@ -14,6 +14,6 @@
|
||||
+ //color vars
|
||||
+ int defaultFontColor=65535
|
||||
+ int defaultBcoColor=6371
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:50:28.817935625 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
|
||||
+@@ -65,6 +65,16 @@
|
||||
+ vis bPrev,0
|
||||
+ vis bNext,0
|
||||
@@ -19,10 +19,84 @@
|
||||
+@@ -425,6 +476,34 @@
|
||||
+@@ -882,6 +961,106 @@
|
||||
+@@ -990,6 +1169,33 @@
|
||||
+@@ -1110,6 +1316,32 @@
|
||||
+ {
|
||||
+@@ -1111,6 +1317,32 @@
|
||||
+ page popupFan
|
||||
++
|
||||
+
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:50:28.361934134 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:50:28.817935625 +0000
|
||||
+@@ -1313,7 +1545,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
|
||||
++ 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)
|
||||
++ spstr strCommand.txt,tTmp.txt,"~",26
|
||||
++ btOnOff4.val=sys0
|
||||
++ if(type4.txt=="switch")
|
||||
+ {
|
||||
+ vis bUp4,0
|
||||
+ 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
|
||||
|
||||
@@ -18,14 +18,14 @@ popupLight
|
||||
27 Component(s)
|
||||
386 Line(s) of event code
|
||||
211 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
236 Line(s) of event code
|
||||
150 Unique line(s) of event code
|
||||
cardMedia
|
||||
34 Component(s)
|
||||
388 Line(s) of event code
|
||||
209 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
234 Line(s) of event code
|
||||
148 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
@@ -62,5 +62,5 @@ cardThermo
|
||||
Total
|
||||
14 Page(s)
|
||||
444 Component(s)
|
||||
5280 Line(s) of event code
|
||||
1369 Unique line(s) of event code
|
||||
5282 Line(s) of event code
|
||||
1370 Unique line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 38
|
||||
Text : 39
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -544,7 +544,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -560,8 +560,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 38
|
||||
Text : 39
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -325,7 +325,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -341,8 +341,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -2285,21 +2285,7 @@ Timer tmSerial
|
||||
tsw bDown1,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||
{
|
||||
vis bUp1,0
|
||||
vis bStop1,0
|
||||
@@ -2448,21 +2434,7 @@ Timer tmSerial
|
||||
tsw bDown2,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||
{
|
||||
vis bUp2,0
|
||||
vis bStop2,0
|
||||
@@ -2611,21 +2583,7 @@ Timer tmSerial
|
||||
tsw bDown3,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||
{
|
||||
vis bUp3,0
|
||||
vis bStop3,0
|
||||
@@ -2774,21 +2732,7 @@ Timer tmSerial
|
||||
tsw bDown4,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||
{
|
||||
vis bUp4,0
|
||||
vis bStop4,0
|
||||
|
||||
@@ -6,18 +6,14 @@ pageIcons
|
||||
6 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
388 Line(s) of event code
|
||||
211 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
234 Line(s) of event code
|
||||
148 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
screensaver
|
||||
38 Component(s)
|
||||
332 Line(s) of event code
|
||||
@@ -42,6 +38,10 @@ pageTest
|
||||
14 Component(s)
|
||||
14 Line(s) of event code
|
||||
14 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
236 Line(s) of event code
|
||||
150 Unique line(s) of event code
|
||||
cardQR
|
||||
32 Component(s)
|
||||
403 Line(s) of event code
|
||||
@@ -56,11 +56,11 @@ cardThermo
|
||||
303 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1179 Line(s) of event code
|
||||
518 Unique line(s) of event code
|
||||
1127 Line(s) of event code
|
||||
514 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
14 Page(s)
|
||||
432 Component(s)
|
||||
5193 Line(s) of event code
|
||||
1352 Unique line(s) of event code
|
||||
5143 Line(s) of event code
|
||||
1353 Unique line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 38
|
||||
Text : 39
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -544,7 +544,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -560,8 +560,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -1313,21 +1313,7 @@ Timer tmSerial
|
||||
tsw bDown1,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||
{
|
||||
vis bUp1,0
|
||||
vis bStop1,0
|
||||
@@ -1476,21 +1462,7 @@ Timer tmSerial
|
||||
tsw bDown2,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||
{
|
||||
vis bUp2,0
|
||||
vis bStop2,0
|
||||
@@ -1639,21 +1611,7 @@ Timer tmSerial
|
||||
tsw bDown3,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||
{
|
||||
vis bUp3,0
|
||||
vis bStop3,0
|
||||
@@ -1802,21 +1760,7 @@ Timer tmSerial
|
||||
tsw bDown4,1
|
||||
}
|
||||
}
|
||||
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")
|
||||
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||
{
|
||||
vis bUp4,0
|
||||
vis bStop4,0
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 38
|
||||
Text : 39
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -325,7 +325,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -341,8 +341,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user