From 70607c9632f53e1abbe735803fbb0c88cd1ce246 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 17 Jun 2022 16:00:10 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 222 +----------------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 20 +- .../landscape/n2t-out-visual/pageStartup.txt | 2 +- .../landscape/n2t-out-visual/popupLight.txt | 23 +- .../landscape/n2t-out-visual/popupShutter.txt | 111 ++++----- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/popupLight.txt | 23 +- HMI/US/landscape/n2t-out/popupShutter.txt | 111 ++++----- HMI/US/portrait/diff-eu-version.txt | 210 +---------------- HMI/US/portrait/diff-filtered.txt | 211 +---------------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 28 +-- .../portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out-visual/popupLight.txt | 21 +- .../portrait/n2t-out-visual/popupShutter.txt | 109 ++++----- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/popupLight.txt | 21 +- HMI/US/portrait/n2t-out/popupShutter.txt | 109 ++++----- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out/pageStartup.txt | 2 +- 20 files changed, 327 insertions(+), 912 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 22719ab4..b548f13c 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-17 15:47:21.865539949 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 15:47:22.677576274 +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 16:00:09.120777566 +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-17 15:47:21.869540128 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 15:47:22.681576453 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 16:00:09.120777566 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -20,217 +20,3 @@ 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/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index b8d4ed65..16ea5a4e 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -14,6 +14,10 @@ cardMedia 34 Component(s) 363 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 42 Component(s) 439 Line(s) of event code @@ -22,18 +26,14 @@ cardQR 32 Component(s) 374 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 17 Component(s) 204 Line(s) of event code 128 Unique line(s) of event code popupShutter 25 Component(s) - 330 Line(s) of event code - 162 Unique line(s) of event code + 331 Line(s) of event code + 163 Unique line(s) of event code screensaver 38 Component(s) 319 Line(s) of event code @@ -44,8 +44,8 @@ cardEntities 496 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 cardThermo 53 Component(s) 555 Line(s) of event code @@ -58,5 +58,5 @@ cardAlarm Total 13 Page(s) 412 Component(s) - 4642 Line(s) of event code - 1232 Unique line(s) of event code + 4644 Line(s) of event code + 1235 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 6de25d7e..60c2ea21 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 37 + Text : 38 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index df5676d1..02ca272e 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/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/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 5667c7f5..9e004ad8 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/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/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index fdf5af14..3f1d1fb3 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 37 + Text : 38 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 7c91169b..731337e4 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/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/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 04c1e31e..12aac98e 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/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 } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e36b7af4..14ab9c6b 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-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/Program.s.txt 2022-06-17 16:00:08.432785049 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +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-17 15:47:21.869540128 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 15:47:22.253557306 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-17 16:00:08.432785049 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +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-17 15:47:21.869540128 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 15:47:22.253557306 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 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 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 +--- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000 @@ -151,7 +151,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -500,70 +500,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt 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 +--- HMI/n2t-out/popupShutter.txt 2022-06-17 16:00:08.432785049 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000 @@ -69,7 +69,7 @@ Attributes Scope : local @@ -573,132 +512,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt 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 7d3d8983..2c4e947e 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-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 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 16:00:08.780781264 +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 16:00:08.736781742 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-17 16:00:08.432785049 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -14,11 +14,11 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- 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 ++--- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +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 -+--- 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 ++--- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000 +@@ -151,7 +151,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -28,70 +28,9 @@ + + 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 ++--- HMI/n2t-out/popupShutter.txt 2022-06-17 16:00:08.432785049 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000 +@@ -69,7 +69,7 @@ + Attributes + Scope : local @@ -101,131 +40,3 @@ + + 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/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index af51356a..b416ad95 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -2,10 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -popupShutter - 25 Component(s) - 330 Line(s) of event code - 162 Unique line(s) of event code +popupLight + 27 Component(s) + 353 Line(s) of event code + 193 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -14,18 +14,14 @@ pageTest 14 Component(s) 14 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 32 Component(s) 374 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 +popupShutter + 25 Component(s) + 331 Line(s) of event code + 163 Unique line(s) of event code popupNotify 17 Component(s) 204 Line(s) of event code @@ -34,6 +30,10 @@ cardThermo 53 Component(s) 555 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 34 Component(s) 363 Line(s) of event code @@ -58,5 +58,5 @@ cardAlarm Total 13 Page(s) 424 Component(s) - 4872 Line(s) of event code - 1304 Unique line(s) of event code + 4874 Line(s) of event code + 1307 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index c1d829a8..99d68ec7 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 37 + Text : 38 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 87dd03b5..43b8dee6 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -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/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index b897e25b..5e2ecb4c 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -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/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 34d7a509..fa7d1f1c 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 37 + Text : 38 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 7c91169b..a694c93f 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -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/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 04c1e31e..57139591 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -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 } diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6b35b85f..ddf949da 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,6 @@ popupLight 27 Component(s) 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 @@ -34,6 +30,10 @@ cardMedia 34 Component(s) 363 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 42 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 1f9ade57..b66ac721 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 37 + Text : 38 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4652fa52..7481f4d0 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 37 + Text : 38 Max. Text Size : 10 Picture p0