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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-07-23 11:57:32 +00:00
committed by github-actions[bot]
parent 3349ce5996
commit 5dcd5be9ce
18 changed files with 350 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
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-07-23 09:50:28.361934134 +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 09:50:29.301937207 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 11:57:26.699905836 +0000
@@ -14,6 +14,3 @@ @@ -14,6 +14,3 @@
//color vars //color vars
int defaultFontColor=65535 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 - // 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 09:50:28.361934134 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-23 11:57:25.607877939 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:50:29.301937207 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 11:57:26.703905939 +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
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

@@ -12,8 +12,8 @@ popupNotify
143 Unique line(s) of event code 143 Unique line(s) of event code
popupFan popupFan
20 Component(s) 20 Component(s)
234 Line(s) of event code 236 Line(s) of event code
148 Unique line(s) of event code 150 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
386 Line(s) of event code 386 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total Total
14 Page(s) 14 Page(s)
432 Component(s) 432 Component(s)
5191 Line(s) of event code 5193 Line(s) of event code
1350 Unique line(s) of event code 1351 Unique line(s) of event code

7
HMI/US/landscape/n2t-out-visual/popupFan.txt
View File

@@ -544,7 +544,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Speed value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -560,8 +560,11 @@ Timer tmSerial
hSpeed.val=sys0 hSpeed.val=sys0
} }
} }
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6 spstr strCommand.txt,t1.txt,"~",7
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

7
HMI/US/landscape/n2t-out/popupFan.txt
View File

@@ -325,7 +325,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Speed value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -341,8 +341,11 @@ Timer tmSerial
hSpeed.val=sys0 hSpeed.val=sys0
} }
} }
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6 spstr strCommand.txt,t1.txt,"~",7
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

112
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-07-23 09:50:28.361934134 +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 09:50:28.817935625 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +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 09:50:28.361934134 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:50:28.817935625 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
@@ -65,6 +65,16 @@ @@ -65,6 +65,16 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
@@ -268,11 +268,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1110,6 +1316,32 @@ @@ -1111,6 +1317,32 @@
{
page popupFan page popupFan
} }
+
+Hotspot m4 +Hotspot m4
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -298,12 +297,105 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ { + {
+ page popupFan + page popupFan
+ } + }
+
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes 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 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/n2t-out/pageStartup.txt 2022-07-23 11:57:25.607877939 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:50:28.817935625 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 11:57:26.123891121 +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

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:50:28.829935664 +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 09:50:28.361934134 +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 09:50:28.817935625 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +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 09:50:28.361934134 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:50:28.817935625 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
+@@ -65,6 +65,16 @@ +@@ -65,6 +65,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -19,10 +19,84 @@
+@@ -425,6 +476,34 @@ +@@ -425,6 +476,34 @@
+@@ -882,6 +961,106 @@ +@@ -882,6 +961,106 @@
+@@ -990,6 +1169,33 @@ +@@ -990,6 +1169,33 @@
+@@ -1110,6 +1316,32 @@ +@@ -1111,6 +1317,32 @@
+ {
+ page popupFan + page popupFan
++ +@@ -1313,7 +1545,21 @@
+ + tsw bDown1,1
+--- 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 +- 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

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

@@ -18,14 +18,14 @@ popupLight
27 Component(s) 27 Component(s)
386 Line(s) of event code 386 Line(s) of event code
211 Unique 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 cardMedia
34 Component(s) 34 Component(s)
388 Line(s) of event code 388 Line(s) of event code
209 Unique 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 pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 167 Line(s) of event code
@@ -62,5 +62,5 @@ cardThermo
Total Total
14 Page(s) 14 Page(s)
444 Component(s) 444 Component(s)
5280 Line(s) of event code 5282 Line(s) of event code
1369 Unique line(s) of event code 1370 Unique line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 38 Text : 39
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

7
HMI/US/portrait/n2t-out-visual/popupFan.txt
View File

@@ -544,7 +544,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Speed value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -560,8 +560,11 @@ Timer tmSerial
hSpeed.val=sys0 hSpeed.val=sys0
} }
} }
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6 spstr strCommand.txt,t1.txt,"~",7
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 38 Text : 39
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

7
HMI/US/portrait/n2t-out/popupFan.txt
View File

@@ -325,7 +325,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Speed value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -341,8 +341,11 @@ Timer tmSerial
hSpeed.val=sys0 hSpeed.val=sys0
} }
} }
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6 spstr strCommand.txt,t1.txt,"~",7
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -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

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

@@ -6,18 +6,14 @@ pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique 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 popupShutter
25 Component(s) 25 Component(s)
388 Line(s) of event code 388 Line(s) of event code
211 Unique line(s) of event code 211 Unique line(s) of event code
popupFan pageStartup
20 Component(s) 19 Component(s)
234 Line(s) of event code 167 Line(s) of event code
148 Unique line(s) of event code 122 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
332 Line(s) of event code 332 Line(s) of event code
@@ -42,6 +38,10 @@ 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
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
403 Line(s) of event code 403 Line(s) of event code
@@ -56,11 +56,11 @@ cardThermo
303 Unique line(s) of event code 303 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 5143 Line(s) of event code
1352 Unique line(s) of event code 1353 Unique line(s) of event code

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 38 Text : 39
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

7
HMI/n2t-out-visual/popupFan.txt
View File

@@ -544,7 +544,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Speed value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -560,8 +560,11 @@ Timer tmSerial
hSpeed.val=sys0 hSpeed.val=sys0
} }
} }
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6 spstr strCommand.txt,t1.txt,"~",7
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -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

2
HMI/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 38 Text : 39
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

7
HMI/n2t-out/popupFan.txt
View File

@@ -325,7 +325,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Speed value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -341,8 +341,11 @@ Timer tmSerial
hSpeed.val=sys0 hSpeed.val=sys0
} }
} }
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6 spstr strCommand.txt,t1.txt,"~",7
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {