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

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-17 16:00:10 +00:00
committed by github-actions[bot]
parent 81db0b5ae0
commit 6d8c2be95b
20 changed files with 327 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
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-06-17 15:47:21.865539949 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 15:47:22.677576274 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 16:00:09.120777566 +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-06-17 15:47:21.869540128 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 15:47:22.681576453 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 16:00:09.120777566 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -20,217 +20,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-17 15:47:21.869540128 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-17 15:47:22.681576453 +0000
@@ -151,7 +151,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 10
Text tInstruction
Attributes
@@ -443,22 +443,21 @@
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
- spstr strCommand.txt,tTmp.txt,"~",1
- if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
+ if(tInstruction.txt=="entityUpdateDetail")
{
// change icon
- spstr strCommand.txt,tIcon1.txt,"~",2
+ spstr strCommand.txt,tIcon1.txt,"~",1
vis tIcon1,1
// change icon color
- spstr strCommand.txt,tTmp.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
// get Button State
- spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
- spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt=="disable")
{
vis t1,0
@@ -476,7 +475,7 @@
}
}
// get ColorTemp value
- spstr strCommand.txt,tTmp.txt,"~",6
+ spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
vis hTempSlider,0
@@ -520,7 +519,7 @@
}
}
// get Color value
- spstr strCommand.txt,tTmp.txt,"~",7
+ spstr strCommand.txt,tTmp.txt,"~",6
// disable -> isn't supported
if(tTmp.txt=="disable")
{
@@ -541,11 +540,11 @@
}
}
// set t0 Color (Localization)
- spstr strCommand.txt,t0.txt,"~",8
+ spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization)
- spstr strCommand.txt,t4.txt,"~",9
+ spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization)
- spstr strCommand.txt,t1.txt,"~",10
+ spstr strCommand.txt,t1.txt,"~",9
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-17 15:47:21.869540128 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-17 15:47:22.681576453 +0000
@@ -69,7 +69,7 @@
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 10
Text tEntity
Attributes
@@ -441,11 +441,10 @@
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
- spstr strCommand.txt,tTmp.txt,"~",1
- if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
+ if(tInstruction.txt=="entityUpdateDetail")
{
// get Position value
- spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,"~",1
if(tTmp.txt=="disable")
{
vis tPosHeading,0
@@ -458,92 +457,92 @@
vis hPosition,1
}
// set tinfo1 text
- spstr strCommand.txt,tInfo1.txt,"~",3
+ spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
- spstr strCommand.txt,tPosHeading.txt,"~",4
+ spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
- spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
- spstr strCommand.txt,tTmp.txt,"~",9
+ spstr strCommand.txt,tTmp.txt,"~",8
if(tTmp.txt=="disable")
{
tsw bUp1,0
- spstr strCommand.txt,bUp1.txt,"~",6
+ spstr strCommand.txt,bUp1.txt,"~",5
bUp1.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bUp1.txt,"~",6
+ spstr strCommand.txt,bUp1.txt,"~",5
tsw bUp1,1
bUp1.pco=65535
}
// set icon bStop
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
tsw bStop1,0
- spstr strCommand.txt,bStop1.txt,"~",7
+ spstr strCommand.txt,bStop1.txt,"~",6
bStop1.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bStop1.txt,"~",7
+ spstr strCommand.txt,bStop1.txt,"~",6
tsw bStop1,1
bStop1.pco=65535
}
// set icon bDown
- spstr strCommand.txt,tTmp.txt,"~",11
+ spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable")
{
- spstr strCommand.txt,bDown1.txt,"~",8
+ spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bDown1.txt,"~",8
+ spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
- spstr strCommand.txt,tTiltHeading.txt,"~",12
+ spstr strCommand.txt,tTiltHeading.txt,"~",11
// set icon bUp
- spstr strCommand.txt,tTmp.txt,"~",16
+ spstr strCommand.txt,tTmp.txt,"~",15
if(tTmp.txt=="disable")
{
tsw bTLeft,0
- spstr strCommand.txt,bTLeft.txt,"~",13
+ spstr strCommand.txt,bTLeft.txt,"~",12
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bTLeft.txt,"~",13
+ spstr strCommand.txt,bTLeft.txt,"~",12
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
- spstr strCommand.txt,tTmp.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTStop,0
- spstr strCommand.txt,bTStop.txt,"~",14
+ spstr strCommand.txt,bTStop.txt,"~",13
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bTStop.txt,"~",14
+ spstr strCommand.txt,bTStop.txt,"~",13
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
- spstr strCommand.txt,bTRight.txt,"~",15
+ spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,0
bTRight.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bTRight.txt,"~",15
+ spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,1
bTRight.pco=65535
}

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

@@ -14,6 +14,10 @@ cardMedia
34 Component(s) 34 Component(s)
363 Line(s) of event code 363 Line(s) of event code
195 Unique line(s) of event code 195 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 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
@@ -22,18 +26,14 @@ cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
128 Unique line(s) of event code 128 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
330 Line(s) of event code 331 Line(s) of event code
162 Unique line(s) of event code 163 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
319 Line(s) of event code 319 Line(s) of event code
@@ -44,8 +44,8 @@ cardEntities
496 Unique line(s) of event code 496 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
352 Line(s) of event code 353 Line(s) of event code
191 Unique line(s) of event code 193 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
555 Line(s) of event code 555 Line(s) of event code
@@ -58,5 +58,5 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
412 Component(s) 412 Component(s)
4642 Line(s) of event code 4644 Line(s) of event code
1232 Unique line(s) of event code 1235 Unique line(s) of event code

2
HMI/US/landscape/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 : 37 Text : 38
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

23
HMI/US/landscape/n2t-out-visual/popupLight.txt
View File

@@ -320,7 +320,7 @@ Text tTmp
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -789,21 +789,22 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{ {
// change icon // change icon
spstr strCommand.txt,tIcon1.txt,"~",1 spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",3 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 Brightness value
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 vis t1,0
@@ -821,7 +822,7 @@ Timer tmSerial
} }
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
@@ -865,7 +866,7 @@ Timer tmSerial
} }
} }
// get Color value // get Color value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -886,11 +887,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",7 spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",8 spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",9 spstr strCommand.txt,t1.txt,"~",10
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -82,7 +82,7 @@ Variable (string) tTmp
ID : 19 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -770,10 +770,11 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis tPosHeading,0 vis tPosHeading,0
@@ -786,92 +787,92 @@ Timer tmSerial
vis hPosition,1 vis hPosition,1
} }
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",3
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",4
// set tIcon1 // set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.txt=tTmp.txt tIcon1.txt=tTmp.txt
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bUp1,0 tsw bUp1,0
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
bUp1.pco=27501 bUp1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bStop1,0 tsw bStop1,0
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
bStop1.pco=27501 bStop1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",12
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",13
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",17
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",14
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
spstr strCommand.txt,bDown1.txt,"~",7 spstr strCommand.txt,bTRight.txt,"~",15
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",11
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",15
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",12
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",12
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",13
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",13
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,0 tsw bTRight,0
bTRight.pco=27501 bTRight.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTRight.txt,"~",14 spstr strCommand.txt,bTRight.txt,"~",15
tsw bTRight,1 tsw bTRight,1
bTRight.pco=65535 bTRight.pco=65535
} }

2
HMI/US/landscape/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 : 37 Text : 38
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

23
HMI/US/landscape/n2t-out/popupLight.txt
View File

@@ -151,7 +151,7 @@ Text tTmp
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 80
Text tInstruction Text tInstruction
Attributes Attributes
@@ -443,21 +443,22 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{ {
// change icon // change icon
spstr strCommand.txt,tIcon1.txt,"~",1 spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",3 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 Brightness value
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 vis t1,0
@@ -475,7 +476,7 @@ Timer tmSerial
} }
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
@@ -519,7 +520,7 @@ Timer tmSerial
} }
} }
// get Color value // get Color value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -540,11 +541,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",7 spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",8 spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",9 spstr strCommand.txt,t1.txt,"~",10
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -69,7 +69,7 @@ Variable (string) tTmp
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -441,10 +441,11 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis tPosHeading,0 vis tPosHeading,0
@@ -457,92 +458,92 @@ Timer tmSerial
vis hPosition,1 vis hPosition,1
} }
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",3
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",4
// set tIcon1 // set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.txt=tTmp.txt tIcon1.txt=tTmp.txt
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bUp1,0 tsw bUp1,0
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
bUp1.pco=27501 bUp1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bStop1,0 tsw bStop1,0
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
bStop1.pco=27501 bStop1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",12
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",13
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",17
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",14
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
spstr strCommand.txt,bDown1.txt,"~",7 spstr strCommand.txt,bTRight.txt,"~",15
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",11
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",15
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",12
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",12
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",13
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",13
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,0 tsw bTRight,0
bTRight.pco=27501 bTRight.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTRight.txt,"~",14 spstr strCommand.txt,bTRight.txt,"~",15
tsw bTRight,1 tsw bTRight,1
bTRight.pco=65535 bTRight.pco=65535
} }

210
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-06-17 15:47:21.865539949 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 15:47:22.253557306 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +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-06-17 15:47:21.869540128 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 15:47:22.253557306 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,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-06-17 15:47:21.869540128 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 15:47:22.253557306 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +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
@@ -489,8 +489,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-17 15:47:21.869540128 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 15:47:22.253557306 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -500,70 +500,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Text tInstruction Text tInstruction
Attributes Attributes
@@ -443,22 +443,21 @@
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
- spstr strCommand.txt,tTmp.txt,"~",1
- if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
+ if(tInstruction.txt=="entityUpdateDetail")
{
// change icon
- spstr strCommand.txt,tIcon1.txt,"~",2
+ spstr strCommand.txt,tIcon1.txt,"~",1
vis tIcon1,1
// change icon color
- spstr strCommand.txt,tTmp.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
// get Button State
- spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
- spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt=="disable")
{
vis t1,0
@@ -476,7 +475,7 @@
}
}
// get ColorTemp value
- spstr strCommand.txt,tTmp.txt,"~",6
+ spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
vis hTempSlider,0
@@ -520,7 +519,7 @@
}
}
// get Color value
- spstr strCommand.txt,tTmp.txt,"~",7
+ spstr strCommand.txt,tTmp.txt,"~",6
// disable -> isn't supported
if(tTmp.txt=="disable")
{
@@ -541,11 +540,11 @@
}
}
// set t0 Color (Localization)
- spstr strCommand.txt,t0.txt,"~",8
+ spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization)
- spstr strCommand.txt,t4.txt,"~",9
+ spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization)
- spstr strCommand.txt,t1.txt,"~",10
+ spstr strCommand.txt,t1.txt,"~",9
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-17 15:47:21.869540128 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-17 16:00:08.432785049 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 15:47:22.253557306 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -573,132 +512,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity Text tEntity
Attributes Attributes
@@ -441,11 +441,10 @@
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
- spstr strCommand.txt,tTmp.txt,"~",1
- if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
+ if(tInstruction.txt=="entityUpdateDetail")
{
// get Position value
- spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,"~",1
if(tTmp.txt=="disable")
{
vis tPosHeading,0
@@ -458,92 +457,92 @@
vis hPosition,1
}
// set tinfo1 text
- spstr strCommand.txt,tInfo1.txt,"~",3
+ spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
- spstr strCommand.txt,tPosHeading.txt,"~",4
+ spstr strCommand.txt,tPosHeading.txt,"~",3
// set tIcon1
- spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
tIcon1.txt=tTmp.txt
}
// set icon bUp
- spstr strCommand.txt,tTmp.txt,"~",9
+ spstr strCommand.txt,tTmp.txt,"~",8
if(tTmp.txt=="disable")
{
tsw bUp1,0
- spstr strCommand.txt,bUp1.txt,"~",6
+ spstr strCommand.txt,bUp1.txt,"~",5
bUp1.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bUp1.txt,"~",6
+ spstr strCommand.txt,bUp1.txt,"~",5
tsw bUp1,1
bUp1.pco=65535
}
// set icon bStop
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
tsw bStop1,0
- spstr strCommand.txt,bStop1.txt,"~",7
+ spstr strCommand.txt,bStop1.txt,"~",6
bStop1.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bStop1.txt,"~",7
+ spstr strCommand.txt,bStop1.txt,"~",6
tsw bStop1,1
bStop1.pco=65535
}
// set icon bDown
- spstr strCommand.txt,tTmp.txt,"~",11
+ spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable")
{
- spstr strCommand.txt,bDown1.txt,"~",8
+ spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bDown1.txt,"~",8
+ spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
- spstr strCommand.txt,tTiltHeading.txt,"~",12
+ spstr strCommand.txt,tTiltHeading.txt,"~",11
// set icon bUp
- spstr strCommand.txt,tTmp.txt,"~",16
+ spstr strCommand.txt,tTmp.txt,"~",15
if(tTmp.txt=="disable")
{
tsw bTLeft,0
- spstr strCommand.txt,bTLeft.txt,"~",13
+ spstr strCommand.txt,bTLeft.txt,"~",12
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bTLeft.txt,"~",13
+ spstr strCommand.txt,bTLeft.txt,"~",12
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
- spstr strCommand.txt,tTmp.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTStop,0
- spstr strCommand.txt,bTStop.txt,"~",14
+ spstr strCommand.txt,bTStop.txt,"~",13
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bTStop.txt,"~",14
+ spstr strCommand.txt,bTStop.txt,"~",13
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
- spstr strCommand.txt,bTRight.txt,"~",15
+ spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,0
bTRight.pco=27501
}else if(tTmp.txt=="enable")
{
- spstr strCommand.txt,bTRight.txt,"~",15
+ spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,1
bTRight.pco=65535
}

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 15:47:22.265557843 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 16:00:08.780781264 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-17 15:47:21.865539949 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-17 16:00:08.432785049 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 15:47:22.253557306 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-17 15:47:21.869540128 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-17 16:00:08.432785049 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 15:47:22.253557306 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -14,11 +14,11 @@
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-17 15:47:21.869540128 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 15:47:22.253557306 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-06-17 15:47:21.869540128 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 15:47:22.253557306 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000
+@@ -151,7 +151,7 @@ +@@ -151,7 +151,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
@@ -28,70 +28,9 @@
+ +
+ Text tInstruction + Text tInstruction
+ Attributes + Attributes
+@@ -443,22 +443,21 @@
+ ucopy strCommand.txt,4,payloadLength-5,0
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+ spstr strCommand.txt,tInstruction.txt,"~",0
+- spstr strCommand.txt,tTmp.txt,"~",1
+- if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
++ if(tInstruction.txt=="entityUpdateDetail")
+ {
+ // change icon
+- spstr strCommand.txt,tIcon1.txt,"~",2
++ spstr strCommand.txt,tIcon1.txt,"~",1
+ vis tIcon1,1
+ // change icon color
+- spstr strCommand.txt,tTmp.txt,"~",3
++ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,sys0,0,0
+ tIcon1.pco=sys0
+ // get Button State
+- spstr strCommand.txt,tTmp.txt,"~",4
++ spstr strCommand.txt,tTmp.txt,"~",3
+ covx tTmp.txt,sys0,0,0
+ btOnOff1.val=sys0
+ // get Brightness value
+- spstr strCommand.txt,tTmp.txt,"~",5
++ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt=="disable")
+ {
+ vis t1,0
+@@ -476,7 +475,7 @@
+ }
+ }
+ // get ColorTemp value
+- spstr strCommand.txt,tTmp.txt,"~",6
++ spstr strCommand.txt,tTmp.txt,"~",5
+ if(tTmp.txt=="disable")
+ {
+ vis hTempSlider,0
+@@ -520,7 +519,7 @@
+ }
+ }
+ // get Color value
+- spstr strCommand.txt,tTmp.txt,"~",7
++ spstr strCommand.txt,tTmp.txt,"~",6
+ // disable -> isn't supported
+ if(tTmp.txt=="disable")
+ {
+@@ -541,11 +540,11 @@
+ }
+ }
+ // set t0 Color (Localization)
+- spstr strCommand.txt,t0.txt,"~",8
++ spstr strCommand.txt,t0.txt,"~",7
+ // set t4 Temperature (Localization)
+- spstr strCommand.txt,t4.txt,"~",9
++ spstr strCommand.txt,t4.txt,"~",8
+ // set t1 Brightness (Localization)
+- spstr strCommand.txt,t1.txt,"~",10
++ spstr strCommand.txt,t1.txt,"~",9
+ }
+ if(tInstruction.txt=="time")
+ {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-06-17 15:47:21.869540128 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-17 16:00:08.432785049 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 15:47:22.253557306 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000
+@@ -69,7 +69,7 @@ +@@ -69,7 +69,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -101,131 +40,3 @@
+ +
+ Text tEntity + Text tEntity
+ Attributes + Attributes
+@@ -441,11 +441,10 @@
+ ucopy strCommand.txt,4,payloadLength-5,0
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+ spstr strCommand.txt,tInstruction.txt,"~",0
+- spstr strCommand.txt,tTmp.txt,"~",1
+- if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
++ if(tInstruction.txt=="entityUpdateDetail")
+ {
+ // get Position value
+- spstr strCommand.txt,tTmp.txt,"~",2
++ spstr strCommand.txt,tTmp.txt,"~",1
+ if(tTmp.txt=="disable")
+ {
+ vis tPosHeading,0
+@@ -458,92 +457,92 @@
+ vis hPosition,1
+ }
+ // set tinfo1 text
+- spstr strCommand.txt,tInfo1.txt,"~",3
++ spstr strCommand.txt,tInfo1.txt,"~",2
+ // set tPosHeading (localization)
+- spstr strCommand.txt,tPosHeading.txt,"~",4
++ spstr strCommand.txt,tPosHeading.txt,"~",3
+ // set tIcon1
+- spstr strCommand.txt,tTmp.txt,"~",5
++ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ tIcon1.txt=tTmp.txt
+ }
+ // set icon bUp
+- spstr strCommand.txt,tTmp.txt,"~",9
++ spstr strCommand.txt,tTmp.txt,"~",8
+ if(tTmp.txt=="disable")
+ {
+ tsw bUp1,0
+- spstr strCommand.txt,bUp1.txt,"~",6
++ spstr strCommand.txt,bUp1.txt,"~",5
+ bUp1.pco=27501
+ }else if(tTmp.txt=="enable")
+ {
+- spstr strCommand.txt,bUp1.txt,"~",6
++ spstr strCommand.txt,bUp1.txt,"~",5
+ tsw bUp1,1
+ bUp1.pco=65535
+ }
+ // set icon bStop
+- spstr strCommand.txt,tTmp.txt,"~",10
++ spstr strCommand.txt,tTmp.txt,"~",9
+ if(tTmp.txt=="disable")
+ {
+ tsw bStop1,0
+- spstr strCommand.txt,bStop1.txt,"~",7
++ spstr strCommand.txt,bStop1.txt,"~",6
+ bStop1.pco=27501
+ }else if(tTmp.txt=="enable")
+ {
+- spstr strCommand.txt,bStop1.txt,"~",7
++ spstr strCommand.txt,bStop1.txt,"~",6
+ tsw bStop1,1
+ bStop1.pco=65535
+ }
+ // set icon bDown
+- spstr strCommand.txt,tTmp.txt,"~",11
++ spstr strCommand.txt,tTmp.txt,"~",10
+ if(tTmp.txt=="disable")
+ {
+- spstr strCommand.txt,bDown1.txt,"~",8
++ spstr strCommand.txt,bDown1.txt,"~",7
+ tsw bDown1,0
+ bDown1.pco=27501
+ }else if(tTmp.txt=="enable")
+ {
+- spstr strCommand.txt,bDown1.txt,"~",8
++ spstr strCommand.txt,bDown1.txt,"~",7
+ tsw bDown1,1
+ bDown1.pco=65535
+ }
+ // set tTiltHeading (localization)
+- spstr strCommand.txt,tTiltHeading.txt,"~",12
++ spstr strCommand.txt,tTiltHeading.txt,"~",11
+ // set icon bUp
+- spstr strCommand.txt,tTmp.txt,"~",16
++ spstr strCommand.txt,tTmp.txt,"~",15
+ if(tTmp.txt=="disable")
+ {
+ tsw bTLeft,0
+- spstr strCommand.txt,bTLeft.txt,"~",13
++ spstr strCommand.txt,bTLeft.txt,"~",12
+ bTLeft.pco=27501
+ }else if(tTmp.txt=="enable")
+ {
+- spstr strCommand.txt,bTLeft.txt,"~",13
++ spstr strCommand.txt,bTLeft.txt,"~",12
+ tsw bTLeft,1
+ bTLeft.pco=65535
+ }
+ // set icon bStop
+- spstr strCommand.txt,tTmp.txt,"~",17
++ spstr strCommand.txt,tTmp.txt,"~",16
+ if(tTmp.txt=="disable")
+ {
+ tsw bTStop,0
+- spstr strCommand.txt,bTStop.txt,"~",14
++ spstr strCommand.txt,bTStop.txt,"~",13
+ bTStop.pco=27501
+ }else if(tTmp.txt=="enable")
+ {
+- spstr strCommand.txt,bTStop.txt,"~",14
++ spstr strCommand.txt,bTStop.txt,"~",13
+ tsw bTStop,1
+ bTStop.pco=65535
+ }
+ // set icon bDown
+- spstr strCommand.txt,tTmp.txt,"~",10
++ spstr strCommand.txt,tTmp.txt,"~",9
+ if(tTmp.txt=="disable")
+ {
+- spstr strCommand.txt,bTRight.txt,"~",15
++ spstr strCommand.txt,bTRight.txt,"~",14
+ tsw bTRight,0
+ bTRight.pco=27501
+ }else if(tTmp.txt=="enable")
+ {
+- spstr strCommand.txt,bTRight.txt,"~",15
++ spstr strCommand.txt,bTRight.txt,"~",14
+ tsw bTRight,1
+ bTRight.pco=65535

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

@@ -2,10 +2,10 @@ Program.s
0 Component(s) 0 Component(s)
10 Line(s) of event code 10 Line(s) of event code
10 Unique line(s) of event code 10 Unique line(s) of event code
popupShutter popupLight
25 Component(s) 27 Component(s)
330 Line(s) of event code 353 Line(s) of event code
162 Unique line(s) of event code 193 Unique line(s) of event code
pageIcons pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
@@ -14,18 +14,14 @@ 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
popupLight
27 Component(s)
352 Line(s) of event code
191 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
pageStartup popupShutter
19 Component(s) 25 Component(s)
157 Line(s) of event code 331 Line(s) of event code
117 Unique line(s) of event code 163 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
@@ -34,6 +30,10 @@ cardThermo
53 Component(s) 53 Component(s)
555 Line(s) of event code 555 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -58,5 +58,5 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
424 Component(s) 424 Component(s)
4872 Line(s) of event code 4874 Line(s) of event code
1304 Unique line(s) of event code 1307 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 : 37 Text : 38
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

21
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -789,21 +789,22 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{ {
// change icon // change icon
spstr strCommand.txt,tIcon1.txt,"~",1 spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",3 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 Brightness value
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 vis t1,0
@@ -821,7 +822,7 @@ Timer tmSerial
} }
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
@@ -865,7 +866,7 @@ Timer tmSerial
} }
} }
// get Color value // get Color value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -886,11 +887,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",7 spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",8 spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",9 spstr strCommand.txt,t1.txt,"~",10
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -770,10 +770,11 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis tPosHeading,0 vis tPosHeading,0
@@ -786,92 +787,92 @@ Timer tmSerial
vis hPosition,1 vis hPosition,1
} }
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",3
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",4
// set tIcon1 // set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.txt=tTmp.txt tIcon1.txt=tTmp.txt
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bUp1,0 tsw bUp1,0
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
bUp1.pco=27501 bUp1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bStop1,0 tsw bStop1,0
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
bStop1.pco=27501 bStop1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",12
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",13
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",17
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",14
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
spstr strCommand.txt,bDown1.txt,"~",7 spstr strCommand.txt,bTRight.txt,"~",15
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",11
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",15
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",12
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",12
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",13
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",13
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,0 tsw bTRight,0
bTRight.pco=27501 bTRight.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTRight.txt,"~",14 spstr strCommand.txt,bTRight.txt,"~",15
tsw bTRight,1 tsw bTRight,1
bTRight.pco=65535 bTRight.pco=65535
} }

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 : 37 Text : 38
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

21
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -443,21 +443,22 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{ {
// change icon // change icon
spstr strCommand.txt,tIcon1.txt,"~",1 spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",3 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 Brightness value
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 vis t1,0
@@ -475,7 +476,7 @@ Timer tmSerial
} }
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
@@ -519,7 +520,7 @@ Timer tmSerial
} }
} }
// get Color value // get Color value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -540,11 +541,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",7 spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",8 spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",9 spstr strCommand.txt,t1.txt,"~",10
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -441,10 +441,11 @@ Timer tmSerial
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt)
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis tPosHeading,0 vis tPosHeading,0
@@ -457,92 +458,92 @@ Timer tmSerial
vis hPosition,1 vis hPosition,1
} }
// set tinfo1 text // set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2 spstr strCommand.txt,tInfo1.txt,"~",3
// set tPosHeading (localization) // set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3 spstr strCommand.txt,tPosHeading.txt,"~",4
// set tIcon1 // set tIcon1
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.txt=tTmp.txt tIcon1.txt=tTmp.txt
} }
// set icon bUp // set icon bUp
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bUp1,0 tsw bUp1,0
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
bUp1.pco=27501 bUp1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bUp1.txt,"~",5 spstr strCommand.txt,bUp1.txt,"~",6
tsw bUp1,1 tsw bUp1,1
bUp1.pco=65535 bUp1.pco=65535
} }
// set icon bStop // set icon bStop
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
tsw bStop1,0 tsw bStop1,0
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
bStop1.pco=27501 bStop1.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bStop1.txt,"~",6 spstr strCommand.txt,bStop1.txt,"~",7
tsw bStop1,1 tsw bStop1,1
bStop1.pco=65535 bStop1.pco=65535
} }
// set icon bDown // set icon bDown
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",8
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",12
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",13
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",13
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",17
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",14
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",14
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
spstr strCommand.txt,bDown1.txt,"~",7 spstr strCommand.txt,bTRight.txt,"~",15
tsw bDown1,0
bDown1.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bDown1.txt,"~",7
tsw bDown1,1
bDown1.pco=65535
}
// set tTiltHeading (localization)
spstr strCommand.txt,tTiltHeading.txt,"~",11
// set icon bUp
spstr strCommand.txt,tTmp.txt,"~",15
if(tTmp.txt=="disable")
{
tsw bTLeft,0
spstr strCommand.txt,bTLeft.txt,"~",12
bTLeft.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTLeft.txt,"~",12
tsw bTLeft,1
bTLeft.pco=65535
}
// set icon bStop
spstr strCommand.txt,tTmp.txt,"~",16
if(tTmp.txt=="disable")
{
tsw bTStop,0
spstr strCommand.txt,bTStop.txt,"~",13
bTStop.pco=27501
}else if(tTmp.txt=="enable")
{
spstr strCommand.txt,bTStop.txt,"~",13
tsw bTStop,1
bTStop.pco=65535
}
// set icon bDown
spstr strCommand.txt,tTmp.txt,"~",9
if(tTmp.txt=="disable")
{
spstr strCommand.txt,bTRight.txt,"~",14
tsw bTRight,0 tsw bTRight,0
bTRight.pco=27501 bTRight.pco=27501
}else if(tTmp.txt=="enable") }else if(tTmp.txt=="enable")
{ {
spstr strCommand.txt,bTRight.txt,"~",14 spstr strCommand.txt,bTRight.txt,"~",15
tsw bTRight,1 tsw bTRight,1
bTRight.pco=65535 bTRight.pco=65535
} }

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

@@ -22,10 +22,6 @@ popupLight
27 Component(s) 27 Component(s)
353 Line(s) of event code 353 Line(s) of event code
193 Unique line(s) of event code 193 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
331 Line(s) of event code 331 Line(s) of event code
@@ -34,6 +30,10 @@ cardMedia
34 Component(s) 34 Component(s)
363 Line(s) of event code 363 Line(s) of event code
195 Unique line(s) of event code 195 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 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

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 : 37 Text : 38
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 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 : 37 Text : 38
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0