diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 06cf2a2f..ac260387 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-05-21 14:55:46.021052258 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:55:46.849063256 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:55:05.103784355 +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-05-21 14:55:46.025052311 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:55:46.849063256 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:55:05.107784400 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 6212c5bc..56a0ecb7 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2251,25 +2251,40 @@ Timer tmSerial vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp1.pco=27501 - tsw bUp1,0 - }else + if(tTmp.txt!="") { bUp1.pco=65535 tsw bUp1,1 + }else if(tTmp.txt!="disable") + { + bUp1.pco=27501 + tsw bUp1,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + }else if(tTmp.txt!="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + }else if(tTmp.txt!="disable") { bDown1.pco=27501 tsw bDown1,0 - }else - { - bDown1.pco=65535 - tsw bDown1,1 } } if(type1.txt=="light") @@ -2395,25 +2410,40 @@ Timer tmSerial vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp2.pco=27501 - tsw bUp2,0 - }else + if(tTmp.txt!="") { bUp2.pco=65535 tsw bUp2,1 + }else if(tTmp.txt!="disable") + { + bUp2.pco=27501 + tsw bUp2,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + }else if(tTmp.txt!="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + }else if(tTmp.txt!="disable") { bDown2.pco=27501 tsw bDown2,0 - }else - { - bDown2.pco=65535 - tsw bDown2,1 } } if(type2.txt=="light") @@ -2539,25 +2569,40 @@ Timer tmSerial vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp3.pco=27501 - tsw bUp3,0 - }else + if(tTmp.txt!="") { bUp3.pco=65535 tsw bUp3,1 + }else if(tTmp.txt!="disable") + { + bUp3.pco=27501 + tsw bUp3,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + }else if(tTmp.txt!="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + }else if(tTmp.txt!="disable") { bDown3.pco=27501 tsw bDown3,0 - }else - { - bDown3.pco=65535 - tsw bDown3,1 } } if(type3.txt=="light") @@ -2683,25 +2728,40 @@ Timer tmSerial vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp4.pco=27501 - tsw bUp4,0 - }else + if(tTmp.txt!="") { bUp4.pco=65535 tsw bUp4,1 + }else if(tTmp.txt!="disable") + { + bUp4.pco=27501 + tsw bUp4,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + }else if(tTmp.txt!="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + }else if(tTmp.txt!="disable") { bDown4.pco=27501 tsw bDown4,0 - }else - { - bDown4.pco=65535 - tsw bDown4,1 } } if(type4.txt=="light") 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 81209d8e..3589336f 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 @@ -28,8 +28,8 @@ cardAlarm 224 Unique line(s) of event code popupShutter 20 Component(s) - 197 Line(s) of event code - 111 Unique line(s) of event code + 241 Line(s) of event code + 138 Unique line(s) of event code popupLight 27 Component(s) 345 Line(s) of event code @@ -52,11 +52,11 @@ cardQR 205 Unique line(s) of event code cardEntities 65 Component(s) - 1069 Line(s) of event code - 462 Unique line(s) of event code + 1117 Line(s) of event code + 487 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4347 Line(s) of event code - 1117 Unique line(s) of event code + 4439 Line(s) of event code + 1163 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 8a5b45ef..90b30a61 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -624,12 +624,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + } } if(tInstruction.txt=="dimmode") { @@ -722,15 +773,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 124dd2de..0e5aa036 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1279,25 +1279,40 @@ Timer tmSerial vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp1.pco=27501 - tsw bUp1,0 - }else + if(tTmp.txt!="") { bUp1.pco=65535 tsw bUp1,1 + }else if(tTmp.txt!="disable") + { + bUp1.pco=27501 + tsw bUp1,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + }else if(tTmp.txt!="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + }else if(tTmp.txt!="disable") { bDown1.pco=27501 tsw bDown1,0 - }else - { - bDown1.pco=65535 - tsw bDown1,1 } } if(type1.txt=="light") @@ -1423,25 +1438,40 @@ Timer tmSerial vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp2.pco=27501 - tsw bUp2,0 - }else + if(tTmp.txt!="") { bUp2.pco=65535 tsw bUp2,1 + }else if(tTmp.txt!="disable") + { + bUp2.pco=27501 + tsw bUp2,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + }else if(tTmp.txt!="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + }else if(tTmp.txt!="disable") { bDown2.pco=27501 tsw bDown2,0 - }else - { - bDown2.pco=65535 - tsw bDown2,1 } } if(type2.txt=="light") @@ -1567,25 +1597,40 @@ Timer tmSerial vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp3.pco=27501 - tsw bUp3,0 - }else + if(tTmp.txt!="") { bUp3.pco=65535 tsw bUp3,1 + }else if(tTmp.txt!="disable") + { + bUp3.pco=27501 + tsw bUp3,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + }else if(tTmp.txt!="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + }else if(tTmp.txt!="disable") { bDown3.pco=27501 tsw bDown3,0 - }else - { - bDown3.pco=65535 - tsw bDown3,1 } } if(type3.txt=="light") @@ -1711,25 +1756,40 @@ Timer tmSerial vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp4.pco=27501 - tsw bUp4,0 - }else + if(tTmp.txt!="") { bUp4.pco=65535 tsw bUp4,1 + }else if(tTmp.txt!="disable") + { + bUp4.pco=27501 + tsw bUp4,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + }else if(tTmp.txt!="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + }else if(tTmp.txt!="disable") { bDown4.pco=27501 tsw bDown4,0 - }else - { - bDown4.pco=65535 - tsw bDown4,1 } } if(type4.txt=="light") diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index f932736c..111d0037 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -339,12 +339,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + } } if(tInstruction.txt=="dimmode") { @@ -437,15 +488,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1c53797a..f9b1d2f1 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-05-21 14:55:46.021052258 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +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-05-21 14:55:46.025052311 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -297,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1816,6 +2044,150 @@ +@@ -1876,6 +2104,165 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -340,25 +340,40 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 ++ // up button + spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="0") -+ { -+ bUp5.pco=27501 -+ tsw bUp5,0 -+ }else ++ if(tTmp.txt!="") + { + bUp5.pco=65535 + tsw bUp5,1 ++ }else if(tTmp.txt!="disable") ++ { ++ bUp5.pco=27501 ++ tsw bUp5,0 + } ++ // stop button + spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") ++ if(tTmp.txt!="") ++ { ++ bStop5.pco=65535 ++ bStop5.txt=tTmp.txt ++ tsw bStop5,1 ++ }else if(tTmp.txt!="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",2 ++ if(tTmp.txt!="") ++ { ++ bDown5.pco=65535 ++ bDown5.txt=tTmp.txt ++ tsw bDown5,1 ++ }else if(tTmp.txt!="disable") + { + bDown5.pco=27501 + tsw bDown5,0 -+ }else -+ { -+ bDown5.pco=65535 -+ tsw bDown5,1 + } + } + if(type5.txt=="light") @@ -449,8 +464,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-05-21 14:55:46.025052311 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index b2b664bc..98ee16f7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,10 +1,34 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 14:55:46.457058049 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:55:46.025052311 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:55:04.663779439 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000 + Hotspot mSwipeNext + Scope : local -+@@ -1816,6 +2044,150 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000 ++@@ -1876,6 +2104,165 @@ +++ // up button +++ if(tTmp.txt!="") +++ }else if(tTmp.txt!="disable") +++ { +++ bUp5.pco=27501 +++ tsw bUp5,0 +++ // stop button +++ if(tTmp.txt!="") +++ bStop5.pco=65535 +++ bStop5.txt=tTmp.txt +++ tsw bStop5,1 +++ }else if(tTmp.txt!="disable") +++ { +++ bStop5.pco=27501 +++ tsw bStop5,0 +++ } +++ // down button +++ spstr tId.txt,tTmp.txt,"|",2 +++ if(tTmp.txt!="") +++ bDown5.txt=tTmp.txt +++ }else if(tTmp.txt!="disable") +++ { +++ bDown5.pco=27501 +++ tsw bDown5,0 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 0a423321..6b6d2214 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2672,25 +2672,40 @@ Timer tmSerial vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp1.pco=27501 - tsw bUp1,0 - }else + if(tTmp.txt!="") { bUp1.pco=65535 tsw bUp1,1 + }else if(tTmp.txt!="disable") + { + bUp1.pco=27501 + tsw bUp1,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + }else if(tTmp.txt!="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + }else if(tTmp.txt!="disable") { bDown1.pco=27501 tsw bDown1,0 - }else - { - bDown1.pco=65535 - tsw bDown1,1 } } if(type1.txt=="light") @@ -2816,25 +2831,40 @@ Timer tmSerial vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp2.pco=27501 - tsw bUp2,0 - }else + if(tTmp.txt!="") { bUp2.pco=65535 tsw bUp2,1 + }else if(tTmp.txt!="disable") + { + bUp2.pco=27501 + tsw bUp2,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + }else if(tTmp.txt!="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + }else if(tTmp.txt!="disable") { bDown2.pco=27501 tsw bDown2,0 - }else - { - bDown2.pco=65535 - tsw bDown2,1 } } if(type2.txt=="light") @@ -2960,25 +2990,40 @@ Timer tmSerial vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp3.pco=27501 - tsw bUp3,0 - }else + if(tTmp.txt!="") { bUp3.pco=65535 tsw bUp3,1 + }else if(tTmp.txt!="disable") + { + bUp3.pco=27501 + tsw bUp3,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + }else if(tTmp.txt!="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + }else if(tTmp.txt!="disable") { bDown3.pco=27501 tsw bDown3,0 - }else - { - bDown3.pco=65535 - tsw bDown3,1 } } if(type3.txt=="light") @@ -3104,25 +3149,40 @@ Timer tmSerial vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp4.pco=27501 - tsw bUp4,0 - }else + if(tTmp.txt!="") { bUp4.pco=65535 tsw bUp4,1 + }else if(tTmp.txt!="disable") + { + bUp4.pco=27501 + tsw bUp4,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + }else if(tTmp.txt!="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + }else if(tTmp.txt!="disable") { bDown4.pco=27501 tsw bDown4,0 - }else - { - bDown4.pco=65535 - tsw bDown4,1 } } if(type4.txt=="light") @@ -3248,25 +3308,40 @@ Timer tmSerial vis nNum5,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",32 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp5.pco=27501 - tsw bUp5,0 - }else + if(tTmp.txt!="") { bUp5.pco=65535 tsw bUp5,1 + }else if(tTmp.txt!="disable") + { + bUp5.pco=27501 + tsw bUp5,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 + }else if(tTmp.txt!="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 + }else if(tTmp.txt!="disable") { bDown5.pco=27501 tsw bDown5,0 - }else - { - bDown5.pco=65535 - tsw bDown5,1 } } if(type5.txt=="light") 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 6a0ad124..6cbeb6d1 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 @@ -18,10 +18,6 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code -popupShutter - 20 Component(s) - 197 Line(s) of event code - 111 Unique line(s) of event code popupLight 27 Component(s) 345 Line(s) of event code @@ -52,11 +48,15 @@ screensaver 237 Unique line(s) of event code cardEntities 77 Component(s) - 1283 Line(s) of event code - 540 Unique line(s) of event code + 1343 Line(s) of event code + 571 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code Total 13 Page(s) 414 Component(s) - 4561 Line(s) of event code - 1182 Unique line(s) of event code + 4665 Line(s) of event code + 1234 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index d01c7c9c..f2086576 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -624,12 +624,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + } } if(tInstruction.txt=="dimmode") { @@ -722,15 +773,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index b12050d1..0ebaec42 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1507,25 +1507,40 @@ Timer tmSerial vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp1.pco=27501 - tsw bUp1,0 - }else + if(tTmp.txt!="") { bUp1.pco=65535 tsw bUp1,1 + }else if(tTmp.txt!="disable") + { + bUp1.pco=27501 + tsw bUp1,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + }else if(tTmp.txt!="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + }else if(tTmp.txt!="disable") { bDown1.pco=27501 tsw bDown1,0 - }else - { - bDown1.pco=65535 - tsw bDown1,1 } } if(type1.txt=="light") @@ -1651,25 +1666,40 @@ Timer tmSerial vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp2.pco=27501 - tsw bUp2,0 - }else + if(tTmp.txt!="") { bUp2.pco=65535 tsw bUp2,1 + }else if(tTmp.txt!="disable") + { + bUp2.pco=27501 + tsw bUp2,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + }else if(tTmp.txt!="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + }else if(tTmp.txt!="disable") { bDown2.pco=27501 tsw bDown2,0 - }else - { - bDown2.pco=65535 - tsw bDown2,1 } } if(type2.txt=="light") @@ -1795,25 +1825,40 @@ Timer tmSerial vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp3.pco=27501 - tsw bUp3,0 - }else + if(tTmp.txt!="") { bUp3.pco=65535 tsw bUp3,1 + }else if(tTmp.txt!="disable") + { + bUp3.pco=27501 + tsw bUp3,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + }else if(tTmp.txt!="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + }else if(tTmp.txt!="disable") { bDown3.pco=27501 tsw bDown3,0 - }else - { - bDown3.pco=65535 - tsw bDown3,1 } } if(type3.txt=="light") @@ -1939,25 +1984,40 @@ Timer tmSerial vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp4.pco=27501 - tsw bUp4,0 - }else + if(tTmp.txt!="") { bUp4.pco=65535 tsw bUp4,1 + }else if(tTmp.txt!="disable") + { + bUp4.pco=27501 + tsw bUp4,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + }else if(tTmp.txt!="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + }else if(tTmp.txt!="disable") { bDown4.pco=27501 tsw bDown4,0 - }else - { - bDown4.pco=65535 - tsw bDown4,1 } } if(type4.txt=="light") @@ -2083,25 +2143,40 @@ Timer tmSerial vis nNum5,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",32 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp5.pco=27501 - tsw bUp5,0 - }else + if(tTmp.txt!="") { bUp5.pco=65535 tsw bUp5,1 + }else if(tTmp.txt!="disable") + { + bUp5.pco=27501 + tsw bUp5,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 + }else if(tTmp.txt!="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 + }else if(tTmp.txt!="disable") { bDown5.pco=27501 tsw bDown5,0 - }else - { - bDown5.pco=65535 - tsw bDown5,1 } } if(type5.txt=="light") diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index f932736c..111d0037 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -339,12 +339,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + } } if(tInstruction.txt=="dimmode") { @@ -437,15 +488,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index c9270dc2..636a3e22 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2251,25 +2251,40 @@ Timer tmSerial vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp1.pco=27501 - tsw bUp1,0 - }else + if(tTmp.txt!="") { bUp1.pco=65535 tsw bUp1,1 + }else if(tTmp.txt!="disable") + { + bUp1.pco=27501 + tsw bUp1,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + }else if(tTmp.txt!="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + }else if(tTmp.txt!="disable") { bDown1.pco=27501 tsw bDown1,0 - }else - { - bDown1.pco=65535 - tsw bDown1,1 } } if(type1.txt=="light") @@ -2395,25 +2410,40 @@ Timer tmSerial vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp2.pco=27501 - tsw bUp2,0 - }else + if(tTmp.txt!="") { bUp2.pco=65535 tsw bUp2,1 + }else if(tTmp.txt!="disable") + { + bUp2.pco=27501 + tsw bUp2,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + }else if(tTmp.txt!="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + }else if(tTmp.txt!="disable") { bDown2.pco=27501 tsw bDown2,0 - }else - { - bDown2.pco=65535 - tsw bDown2,1 } } if(type2.txt=="light") @@ -2539,25 +2569,40 @@ Timer tmSerial vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp3.pco=27501 - tsw bUp3,0 - }else + if(tTmp.txt!="") { bUp3.pco=65535 tsw bUp3,1 + }else if(tTmp.txt!="disable") + { + bUp3.pco=27501 + tsw bUp3,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + }else if(tTmp.txt!="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + }else if(tTmp.txt!="disable") { bDown3.pco=27501 tsw bDown3,0 - }else - { - bDown3.pco=65535 - tsw bDown3,1 } } if(type3.txt=="light") @@ -2683,25 +2728,40 @@ Timer tmSerial vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp4.pco=27501 - tsw bUp4,0 - }else + if(tTmp.txt!="") { bUp4.pco=65535 tsw bUp4,1 + }else if(tTmp.txt!="disable") + { + bUp4.pco=27501 + tsw bUp4,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + }else if(tTmp.txt!="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + }else if(tTmp.txt!="disable") { bDown4.pco=27501 tsw bDown4,0 - }else - { - bDown4.pco=65535 - tsw bDown4,1 } } if(type4.txt=="light") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 66ff3403..b7a67eef 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,10 +10,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -popupShutter - 20 Component(s) - 197 Line(s) of event code - 111 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code @@ -38,6 +34,10 @@ cardQR 30 Component(s) 363 Line(s) of event code 205 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -52,11 +52,11 @@ cardThermo 290 Unique line(s) of event code cardEntities 65 Component(s) - 1069 Line(s) of event code - 462 Unique line(s) of event code + 1117 Line(s) of event code + 487 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4348 Line(s) of event code - 1118 Unique line(s) of event code + 4440 Line(s) of event code + 1164 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index caec64f2..81bc0fd6 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -624,12 +624,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + } } if(tInstruction.txt=="dimmode") { @@ -722,15 +773,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 124dd2de..0e5aa036 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1279,25 +1279,40 @@ Timer tmSerial vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp1.pco=27501 - tsw bUp1,0 - }else + if(tTmp.txt!="") { bUp1.pco=65535 tsw bUp1,1 + }else if(tTmp.txt!="disable") + { + bUp1.pco=27501 + tsw bUp1,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + }else if(tTmp.txt!="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + }else if(tTmp.txt!="disable") { bDown1.pco=27501 tsw bDown1,0 - }else - { - bDown1.pco=65535 - tsw bDown1,1 } } if(type1.txt=="light") @@ -1423,25 +1438,40 @@ Timer tmSerial vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp2.pco=27501 - tsw bUp2,0 - }else + if(tTmp.txt!="") { bUp2.pco=65535 tsw bUp2,1 + }else if(tTmp.txt!="disable") + { + bUp2.pco=27501 + tsw bUp2,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + }else if(tTmp.txt!="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + }else if(tTmp.txt!="disable") { bDown2.pco=27501 tsw bDown2,0 - }else - { - bDown2.pco=65535 - tsw bDown2,1 } } if(type2.txt=="light") @@ -1567,25 +1597,40 @@ Timer tmSerial vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp3.pco=27501 - tsw bUp3,0 - }else + if(tTmp.txt!="") { bUp3.pco=65535 tsw bUp3,1 + }else if(tTmp.txt!="disable") + { + bUp3.pco=27501 + tsw bUp3,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + }else if(tTmp.txt!="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + }else if(tTmp.txt!="disable") { bDown3.pco=27501 tsw bDown3,0 - }else - { - bDown3.pco=65535 - tsw bDown3,1 } } if(type3.txt=="light") @@ -1711,25 +1756,40 @@ Timer tmSerial vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - bUp4.pco=27501 - tsw bUp4,0 - }else + if(tTmp.txt!="") { bUp4.pco=65535 tsw bUp4,1 + }else if(tTmp.txt!="disable") + { + bUp4.pco=27501 + tsw bUp4,0 } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + }else if(tTmp.txt!="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + }else if(tTmp.txt!="disable") { bDown4.pco=27501 tsw bDown4,0 - }else - { - bDown4.pco=65535 - tsw bDown4,1 } } if(type4.txt=="light") diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index f932736c..111d0037 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -339,12 +339,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + }else if(tTmp.txt!="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + } } if(tInstruction.txt=="dimmode") { @@ -437,15 +488,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0