From ecb90d4bfd35dc922fdd05d22a31324b854c81ce Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 22 May 2022 08:36:43 +0000 Subject: [PATCH] fix disable (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +- .../landscape/n2t-out-visual/cardEntities.txt | 124 +++++++------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +- .../landscape/n2t-out-visual/popupShutter.txt | 30 ++-- HMI/US/landscape/n2t-out/cardEntities.txt | 124 +++++++------- HMI/US/landscape/n2t-out/popupShutter.txt | 30 ++-- HMI/US/portrait/diff-eu-version.txt | 45 ++--- HMI/US/portrait/diff-filtered.txt | 42 +++-- .../portrait/n2t-out-visual/cardEntities.txt | 155 +++++++++--------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 +- .../portrait/n2t-out-visual/popupShutter.txt | 30 ++-- HMI/US/portrait/n2t-out/cardEntities.txt | 155 +++++++++--------- HMI/US/portrait/n2t-out/popupShutter.txt | 30 ++-- HMI/n2t-out-visual/cardEntities.txt | 124 +++++++------- HMI/n2t-out-visual/nspanel_Stats.txt | 16 +- HMI/n2t-out-visual/popupShutter.txt | 30 ++-- HMI/n2t-out/cardEntities.txt | 124 +++++++------- HMI/n2t-out/popupShutter.txt | 30 ++-- 18 files changed, 568 insertions(+), 545 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 9c0283f1..397507c8 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-22 08:17:12.774830515 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:17:13.906863322 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:36:43.131639685 +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-22 08:17:12.774830515 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:17:13.906863322 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:36:43.131639685 +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 251c14ef..764d0cad 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2253,38 +2253,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2412,38 +2413,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2571,38 +2573,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -2730,38 +2733,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } 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 3589336f..c3223464 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 @@ -52,11 +52,11 @@ cardQR 205 Unique line(s) of event code cardEntities 65 Component(s) - 1117 Line(s) of event code - 487 Unique line(s) of event code + 1121 Line(s) of event code + 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4439 Line(s) of event code - 1163 Unique line(s) of event code + 4443 Line(s) of event code + 1167 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 228dbbd8..3576b25a 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else 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") diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 8ae6de6c..157f7426 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1281,38 +1281,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1440,38 +1441,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1599,38 +1601,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1758,38 +1761,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index e71bc768..39c20ee3 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else 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") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3fcc3291..8c96df23 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-22 08:17:12.774830515 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:17:13.326846513 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +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-22 08:17:12.774830515 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:17:13.326846513 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +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 -@@ -1876,6 +2104,165 @@ +@@ -1880,6 +2108,166 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -342,38 +342,39 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + spstr strCommand.txt,tId.txt,"~",32 + // up button + spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt!="") -+ { -+ bUp5.pco=65535 -+ tsw bUp5,1 -+ }else if(tTmp.txt=="disable") ++ if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 ++ }else if(tTmp.txt!="") ++ { ++ bUp5.pco=65535 ++ bUp5.txt=tTmp.txt ++ tsw bUp5,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt!="") ++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 ++ }else 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!="") ++ if(tTmp.txt=="disable") ++ { ++ bDown5.pco=27501 ++ tsw bDown5,0 ++ }else if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 -+ }else if(tTmp.txt=="disable") -+ { -+ bDown5.pco=27501 -+ tsw bDown5,0 + } + } + if(type5.txt=="light") @@ -464,8 +465,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-22 08:17:12.774830515 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:17:13.326846513 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +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 758d80ad..fc89c850 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,34 +1,30 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:17:13.346847092 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:17:13.326846513 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:17:12.774830515 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:17:13.326846513 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:36:42.679636410 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +0000 + Hotspot mSwipeNext + Scope : local -+@@ -1876,6 +2104,165 @@ ++@@ -1880,6 +2108,166 @@ ++ // up button -++ if(tTmp.txt!="") -++ }else if(tTmp.txt=="disable") -++ { -++ bUp5.pco=27501 -++ tsw bUp5,0 +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") +++ bUp5.txt=tTmp.txt ++ // stop button -++ if(tTmp.txt!="") -++ bStop5.pco=65535 -++ bStop5.txt=tTmp.txt -++ tsw bStop5,1 -++ }else if(tTmp.txt=="disable") +++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 +++ }else if(tTmp.txt!="") +++ { +++ bStop5.pco=65535 +++ bStop5.txt=tTmp.txt +++ tsw bStop5,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",2 -++ if(tTmp.txt!="") +++ if(tTmp.txt=="disable") +++ }else 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 08:17:12.774830515 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:17:13.326846513 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 6d9896a5..b911f7cb 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2674,38 +2674,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2833,38 +2834,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2992,38 +2994,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -3151,38 +3154,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") @@ -3310,38 +3314,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",32 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt=="disable") - { - bDown5.pco=27501 - tsw bDown5,0 } } 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 a42d9111..16421cb3 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 @@ -52,11 +52,11 @@ screensaver 237 Unique line(s) of event code cardEntities 77 Component(s) - 1343 Line(s) of event code - 571 Unique line(s) of event code + 1348 Line(s) of event code + 576 Unique line(s) of event code Total 13 Page(s) 414 Component(s) - 4665 Line(s) of event code - 1234 Unique line(s) of event code + 4670 Line(s) of event code + 1239 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 a0cc18c3..c88262c5 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else 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") diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 75f099af..c25f8fdc 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1509,38 +1509,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1668,38 +1669,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1827,38 +1829,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1986,38 +1989,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") @@ -2145,38 +2149,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",32 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt=="disable") - { - bDown5.pco=27501 - tsw bDown5,0 } } if(type5.txt=="light") diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index e71bc768..39c20ee3 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else 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") diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index ad556514..9ca0e570 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2253,38 +2253,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2412,38 +2413,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2571,38 +2573,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -2730,38 +2733,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9d70aa00..da26d1be 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,6 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code screensaver 35 Component(s) 296 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) - 1117 Line(s) of event code - 487 Unique line(s) of event code + 1121 Line(s) of event code + 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4440 Line(s) of event code - 1164 Unique line(s) of event code + 4444 Line(s) of event code + 1168 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 03c3f2c2..12852a06 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else 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") diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 8ae6de6c..157f7426 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1281,38 +1281,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1440,38 +1441,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1599,38 +1601,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1758,38 +1761,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else 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!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index e71bc768..39c20ee3 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else 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!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else 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")