From a4fbf60eb2dfc203000577acb54e8457fa903e7a Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 22 May 2022 08:17:14 +0000 Subject: [PATCH] fix disable (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++--- .../landscape/n2t-out-visual/cardEntities.txt | 24 +++++++-------- .../landscape/n2t-out-visual/popupShutter.txt | 6 ++-- HMI/US/landscape/n2t-out/cardEntities.txt | 24 +++++++-------- HMI/US/landscape/n2t-out/popupShutter.txt | 6 ++-- HMI/US/portrait/diff-eu-version.txt | 18 +++++------ HMI/US/portrait/diff-filtered.txt | 20 ++++++------- .../portrait/n2t-out-visual/cardEntities.txt | 30 +++++++++---------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 ++--- .../portrait/n2t-out-visual/popupShutter.txt | 6 ++-- HMI/US/portrait/n2t-out/cardEntities.txt | 30 +++++++++---------- HMI/US/portrait/n2t-out/popupShutter.txt | 6 ++-- HMI/n2t-out-visual/cardEntities.txt | 24 +++++++-------- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++--- HMI/n2t-out-visual/popupShutter.txt | 6 ++-- HMI/n2t-out/cardEntities.txt | 24 +++++++-------- HMI/n2t-out/popupShutter.txt | 6 ++-- 17 files changed, 127 insertions(+), 127 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ac260387..9c0283f1 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 07:55:04.215774434 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:55:05.103784355 +0000 +--- 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 @@ -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 07:55:04.215774434 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:55:05.107784400 +0000 +--- 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 @@ -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 56a0ecb7..251c14ef 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2257,7 +2257,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -2269,7 +2269,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -2281,7 +2281,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -2416,7 +2416,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -2428,7 +2428,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -2440,7 +2440,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -2575,7 +2575,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -2587,7 +2587,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -2599,7 +2599,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -2734,7 +2734,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -2746,7 +2746,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -2758,7 +2758,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 90b30a61..228dbbd8 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -652,7 +652,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -664,7 +664,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -676,7 +676,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 0e5aa036..8ae6de6c 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1285,7 +1285,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -1297,7 +1297,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -1309,7 +1309,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -1444,7 +1444,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -1456,7 +1456,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -1468,7 +1468,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -1603,7 +1603,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -1615,7 +1615,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -1627,7 +1627,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -1762,7 +1762,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -1774,7 +1774,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -1786,7 +1786,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 111d0037..e71bc768 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -367,7 +367,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -379,7 +379,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -391,7 +391,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f9b1d2f1..3fcc3291 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 07:55:04.215774434 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +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 @@ -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 07:55:04.219774478 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +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 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -346,7 +346,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + { + bUp5.pco=65535 + tsw bUp5,1 -+ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 @@ -358,7 +358,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 -+ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 @@ -370,7 +370,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 -+ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 @@ -464,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-22 07:55:04.215774434 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 +--- 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 @@ -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 98ee16f7..758d80ad 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,14 +1,14 @@ -+++ 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 ++++ 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 + Hotspot mSwipeNext + Scope : local +@@ -1876,6 +2104,165 @@ ++ // up button ++ if(tTmp.txt!="") -++ }else if(tTmp.txt!="disable") +++ }else if(tTmp.txt=="disable") ++ { ++ bUp5.pco=27501 ++ tsw bUp5,0 @@ -17,7 +17,7 @@ ++ bStop5.pco=65535 ++ bStop5.txt=tTmp.txt ++ tsw bStop5,1 -++ }else if(tTmp.txt!="disable") +++ }else if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 @@ -26,9 +26,9 @@ ++ spstr tId.txt,tTmp.txt,"|",2 ++ if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt -++ }else if(tTmp.txt!="disable") +++ }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 ++--- 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 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 6b6d2214..6d9896a5 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2678,7 +2678,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -2690,7 +2690,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -2702,7 +2702,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -2837,7 +2837,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -2849,7 +2849,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -2861,7 +2861,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -2996,7 +2996,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -3008,7 +3008,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -3020,7 +3020,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -3155,7 +3155,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -3167,7 +3167,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -3179,7 +3179,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 @@ -3314,7 +3314,7 @@ Timer tmSerial { bUp5.pco=65535 tsw bUp5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 @@ -3326,7 +3326,7 @@ Timer tmSerial bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop5.pco=27501 tsw bStop5,0 @@ -3338,7 +3338,7 @@ Timer tmSerial bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown5.pco=27501 tsw bDown5,0 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 6cbeb6d1..a42d9111 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,6 +18,10 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code popupLight 27 Component(s) 345 Line(s) of event code @@ -50,10 +54,6 @@ cardEntities 77 Component(s) 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) diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index f2086576..a0cc18c3 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -652,7 +652,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -664,7 +664,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -676,7 +676,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 0ebaec42..75f099af 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1513,7 +1513,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -1525,7 +1525,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -1537,7 +1537,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -1672,7 +1672,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -1684,7 +1684,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -1696,7 +1696,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -1831,7 +1831,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -1843,7 +1843,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -1855,7 +1855,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -1990,7 +1990,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -2002,7 +2002,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -2014,7 +2014,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 @@ -2149,7 +2149,7 @@ Timer tmSerial { bUp5.pco=65535 tsw bUp5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 @@ -2161,7 +2161,7 @@ Timer tmSerial bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop5.pco=27501 tsw bStop5,0 @@ -2173,7 +2173,7 @@ Timer tmSerial bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown5.pco=27501 tsw bDown5,0 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 111d0037..e71bc768 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -367,7 +367,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -379,7 +379,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -391,7 +391,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 636a3e22..ad556514 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2257,7 +2257,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -2269,7 +2269,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -2281,7 +2281,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -2416,7 +2416,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -2428,7 +2428,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -2440,7 +2440,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -2575,7 +2575,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -2587,7 +2587,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -2599,7 +2599,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -2734,7 +2734,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -2746,7 +2746,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -2758,7 +2758,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index b7a67eef..9d70aa00 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ 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 @@ -34,10 +38,6 @@ 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 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 81bc0fd6..03c3f2c2 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -652,7 +652,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -664,7 +664,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -676,7 +676,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0e5aa036..8ae6de6c 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1285,7 +1285,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -1297,7 +1297,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -1309,7 +1309,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -1444,7 +1444,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -1456,7 +1456,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -1468,7 +1468,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -1603,7 +1603,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -1615,7 +1615,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -1627,7 +1627,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -1762,7 +1762,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -1774,7 +1774,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -1786,7 +1786,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 111d0037..e71bc768 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -367,7 +367,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -379,7 +379,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -391,7 +391,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501