From 4da151c20fa38ac1f39bf6f184c62b2a6617b8dc Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 17 Jun 2022 15:47:23 +0000 Subject: [PATCH] fixed #220 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 222 +++++++++++++++++++++++++- HMI/US/portrait/diff-eu-version.txt | 226 +++++++++++++++++++++++++- HMI/US/portrait/diff-filtered.txt | 227 ++++++++++++++++++++++++++- HMI/n2t-out-visual/nspanel_Stats.txt | 16 +- HMI/n2t-out-visual/popupLight.txt | 23 +-- HMI/n2t-out-visual/popupShutter.txt | 111 ++++++------- HMI/n2t-out/popupLight.txt | 23 +-- HMI/n2t-out/popupShutter.txt | 111 ++++++------- 8 files changed, 802 insertions(+), 157 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index b251d7fc..22719ab4 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -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-06-16 16:54:47.818443964 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-16 16:54:48.686499319 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-17 15:47:21.865539949 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 15:47:22.677576274 +0000 @@ -11,6 +11,4 @@ // dim value 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 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-16 16:54:48.690499574 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 15:47:21.869540128 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 15:47:22.681576453 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -20,3 +20,217 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 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 + } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2cde0cd8..e36b7af4 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -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-06-16 16:54:47.818443964 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-17 15:47:21.865539949 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 15:47:22.253557306 +0000 @@ -11,6 +11,6 @@ // dim value 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 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-17 15:47:21.869540128 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 15:47:22.253557306 +0000 @@ -63,6 +63,16 @@ vis bText4,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") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 15:47:21.869540128 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 15:47:22.253557306 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -488,3 +488,217 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +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/US/portrait/n2t-out/popupLight.txt 2022-06-17 15:47:22.253557306 +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/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-06-17 15:47:21.869540128 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 15:47:22.253557306 +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 + } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 814c4c3b..7d3d8983 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-16 16:54:48.258472024 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 15:47:22.265557843 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-17 15:47:21.865539949 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 15:47:22.253557306 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-17 15:47:21.869540128 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 15:47:22.253557306 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -14,5 +14,218 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-17 15:47:21.869540128 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 15:47:22.253557306 +0000 ++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/US/portrait/n2t-out/popupLight.txt 2022-06-17 15:47:22.253557306 +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/portrait/n2t-out/popupShutter.txt ++--- HMI/n2t-out/popupShutter.txt 2022-06-17 15:47:21.869540128 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 15:47:22.253557306 +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 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5ce7d797..6b35b85f 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -20,20 +20,20 @@ popupNotify 128 Unique line(s) of event code popupLight 27 Component(s) - 352 Line(s) of event code - 191 Unique line(s) of event code + 353 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 + 25 Component(s) + 331 Line(s) of event code + 163 Unique line(s) of event code cardMedia 34 Component(s) 363 Line(s) of event code 195 Unique line(s) of event code -popupShutter - 25 Component(s) - 330 Line(s) of event code - 162 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 412 Component(s) - 4643 Line(s) of event code - 1233 Unique line(s) of event code + 4645 Line(s) of event code + 1236 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index d1f1681a..ff01ff27 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -320,7 +320,7 @@ Text tTmp Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 80 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -789,21 +789,22 @@ Timer tmSerial 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 - if(tInstruction.txt=="entityUpdateDetail") + spstr strCommand.txt,tTmp.txt,"~",1 + if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",1 + spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // get Button State - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 // get Brightness value - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt=="disable") { vis t1,0 @@ -821,7 +822,7 @@ Timer tmSerial } } // get ColorTemp value - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",6 if(tTmp.txt=="disable") { vis hTempSlider,0 @@ -865,7 +866,7 @@ Timer tmSerial } } // get Color value - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",7 // disable -> isn't supported if(tTmp.txt=="disable") { @@ -886,11 +887,11 @@ Timer tmSerial } } // set t0 Color (Localization) - spstr strCommand.txt,t0.txt,"~",7 + spstr strCommand.txt,t0.txt,"~",8 // set t4 Temperature (Localization) - spstr strCommand.txt,t4.txt,"~",8 + spstr strCommand.txt,t4.txt,"~",9 // set t1 Brightness (Localization) - spstr strCommand.txt,t1.txt,"~",9 + spstr strCommand.txt,t1.txt,"~",10 } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 73038c25..4ff4127d 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -82,7 +82,7 @@ Variable (string) tTmp ID : 19 Scope : local Text : - Max. Text Size: 10 + Max. Text Size: 80 Text tEntity Attributes @@ -770,10 +770,11 @@ Timer tmSerial 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 - if(tInstruction.txt=="entityUpdateDetail") + spstr strCommand.txt,tTmp.txt,"~",1 + if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt) { // get Position value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",2 if(tTmp.txt=="disable") { vis tPosHeading,0 @@ -786,92 +787,92 @@ Timer tmSerial vis hPosition,1 } // set tinfo1 text - spstr strCommand.txt,tInfo1.txt,"~",2 + spstr strCommand.txt,tInfo1.txt,"~",3 // set tPosHeading (localization) - spstr strCommand.txt,tPosHeading.txt,"~",3 + spstr strCommand.txt,tPosHeading.txt,"~",4 // set tIcon1 - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt!="") { tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bUp1,0 - spstr strCommand.txt,bUp1.txt,"~",5 + spstr strCommand.txt,bUp1.txt,"~",6 bUp1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bUp1.txt,"~",5 + spstr strCommand.txt,bUp1.txt,"~",6 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { tsw bStop1,0 - spstr strCommand.txt,bStop1.txt,"~",6 + spstr strCommand.txt,bStop1.txt,"~",7 bStop1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bStop1.txt,"~",6 + spstr strCommand.txt,bStop1.txt,"~",7 tsw bStop1,1 bStop1.pco=65535 } // 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 if(tTmp.txt=="disable") { - spstr strCommand.txt,bDown1.txt,"~",7 - 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 + spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bTRight.txt,"~",14 + spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 } diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 7c91169b..731337e4 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -151,7 +151,7 @@ Text tTmp Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 80 Text tInstruction Attributes @@ -443,21 +443,22 @@ Timer tmSerial 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 - if(tInstruction.txt=="entityUpdateDetail") + spstr strCommand.txt,tTmp.txt,"~",1 + if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",1 + spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // get Button State - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 // get Brightness value - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt=="disable") { vis t1,0 @@ -475,7 +476,7 @@ Timer tmSerial } } // get ColorTemp value - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",6 if(tTmp.txt=="disable") { vis hTempSlider,0 @@ -519,7 +520,7 @@ Timer tmSerial } } // get Color value - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",7 // disable -> isn't supported if(tTmp.txt=="disable") { @@ -540,11 +541,11 @@ Timer tmSerial } } // set t0 Color (Localization) - spstr strCommand.txt,t0.txt,"~",7 + spstr strCommand.txt,t0.txt,"~",8 // set t4 Temperature (Localization) - spstr strCommand.txt,t4.txt,"~",8 + spstr strCommand.txt,t4.txt,"~",9 // set t1 Brightness (Localization) - spstr strCommand.txt,t1.txt,"~",9 + spstr strCommand.txt,t1.txt,"~",10 } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 04c1e31e..12aac98e 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -69,7 +69,7 @@ Variable (string) tTmp Attributes Scope : local Text : - Max. Text Size: 10 + Max. Text Size: 80 Text tEntity Attributes @@ -441,10 +441,11 @@ Timer tmSerial 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 - if(tInstruction.txt=="entityUpdateDetail") + spstr strCommand.txt,tTmp.txt,"~",1 + if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt) { // get Position value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",2 if(tTmp.txt=="disable") { vis tPosHeading,0 @@ -457,92 +458,92 @@ Timer tmSerial vis hPosition,1 } // set tinfo1 text - spstr strCommand.txt,tInfo1.txt,"~",2 + spstr strCommand.txt,tInfo1.txt,"~",3 // set tPosHeading (localization) - spstr strCommand.txt,tPosHeading.txt,"~",3 + spstr strCommand.txt,tPosHeading.txt,"~",4 // set tIcon1 - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt!="") { tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bUp1,0 - spstr strCommand.txt,bUp1.txt,"~",5 + spstr strCommand.txt,bUp1.txt,"~",6 bUp1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bUp1.txt,"~",5 + spstr strCommand.txt,bUp1.txt,"~",6 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { tsw bStop1,0 - spstr strCommand.txt,bStop1.txt,"~",6 + spstr strCommand.txt,bStop1.txt,"~",7 bStop1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bStop1.txt,"~",6 + spstr strCommand.txt,bStop1.txt,"~",7 tsw bStop1,1 bStop1.pco=65535 } // 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 if(tTmp.txt=="disable") { - spstr strCommand.txt,bDown1.txt,"~",7 - 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 + spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bTRight.txt,"~",14 + spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 }