diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 30aa9bbb..7adc1216 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:56:32.972794177 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:56:34.028800991 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 14:52:29.008661186 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 14:52:29.872661064 +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:56:32.972794177 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:56:34.032801017 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 14:52:29.008661186 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 14:52:29.872661064 +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 764d0cad..a80481ef 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2252,39 +2252,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp1.pco=27501 + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp1.pco=65535 - bUp1.txt=tTmp.txt + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop1.pco=27501 + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop1.pco=65535 - bStop1.txt=tTmp.txt + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown1.pco=27501 + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown1.pco=65535 - bDown1.txt=tTmp.txt + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,1 } } @@ -2412,39 +2415,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp2.pco=27501 + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp2.pco=65535 - bUp2.txt=tTmp.txt + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop2.pco=27501 + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop2.pco=65535 - bStop2.txt=tTmp.txt + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown2.pco=27501 + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown2.pco=65535 - bDown2.txt=tTmp.txt + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,1 } } @@ -2572,39 +2578,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp3.pco=27501 + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp3.pco=65535 - bUp3.txt=tTmp.txt + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop3.pco=27501 + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop3.pco=65535 - bStop3.txt=tTmp.txt + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown3.pco=27501 + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown3.pco=65535 - bDown3.txt=tTmp.txt + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,1 } } @@ -2732,39 +2741,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp4.pco=27501 + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp4.pco=65535 - bUp4.txt=tTmp.txt + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop4.pco=27501 + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop4.pco=65535 - bStop4.txt=tTmp.txt + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown4.pco=27501 + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown4.pco=65535 - bDown4.txt=tTmp.txt + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,1 } } 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 c3223464..24b98eac 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,7 +28,7 @@ cardAlarm 224 Unique line(s) of event code popupShutter 20 Component(s) - 241 Line(s) of event code + 244 Line(s) of event code 138 Unique line(s) of event code popupLight 27 Component(s) @@ -52,11 +52,11 @@ cardQR 205 Unique line(s) of event code cardEntities 65 Component(s) - 1121 Line(s) of event code + 1133 Line(s) of event code 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4443 Line(s) of event code + 4458 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 bc4f5fff..ea376ba8 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -646,38 +646,41 @@ Timer tmSerial tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bUp1.txt=tTmp.txt + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bStop1.txt=tTmp.txt + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bDown1.txt=tTmp.txt + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 } diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 157f7426..0440bb4f 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1280,39 +1280,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp1.pco=27501 + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp1.pco=65535 - bUp1.txt=tTmp.txt + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop1.pco=27501 + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop1.pco=65535 - bStop1.txt=tTmp.txt + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown1.pco=27501 + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown1.pco=65535 - bDown1.txt=tTmp.txt + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,1 } } @@ -1440,39 +1443,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp2.pco=27501 + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp2.pco=65535 - bUp2.txt=tTmp.txt + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop2.pco=27501 + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop2.pco=65535 - bStop2.txt=tTmp.txt + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown2.pco=27501 + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown2.pco=65535 - bDown2.txt=tTmp.txt + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,1 } } @@ -1600,39 +1606,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp3.pco=27501 + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp3.pco=65535 - bUp3.txt=tTmp.txt + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop3.pco=27501 + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop3.pco=65535 - bStop3.txt=tTmp.txt + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown3.pco=27501 + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown3.pco=65535 - bDown3.txt=tTmp.txt + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,1 } } @@ -1760,39 +1769,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp4.pco=27501 + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp4.pco=65535 - bUp4.txt=tTmp.txt + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop4.pco=27501 + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop4.pco=65535 - bStop4.txt=tTmp.txt + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown4.pco=27501 + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown4.pco=65535 - bDown4.txt=tTmp.txt + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,1 } } diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 5fca3dc8..6c7b272d 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -361,38 +361,41 @@ Timer tmSerial tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bUp1.txt=tTmp.txt + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bStop1.txt=tTmp.txt + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bDown1.txt=tTmp.txt + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2c7ea44b..ad808c9f 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:56:32.972794177 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:56:33.488797507 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 14:52:29.008661186 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 14:52:29.428661127 +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:56:32.976794203 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:56:33.492797532 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 14:52:29.008661186 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 14:52:29.432661126 +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 -@@ -1880,6 +2108,166 @@ +@@ -1892,6 +2120,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -341,39 +341,42 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 + // up button -+ spstr tId.txt,tTmp.txt,"|",0 ++ spstr tId.txt,tTmp.txt,"|",3 + if(tTmp.txt=="disable") + { + bUp5.pco=27501 ++ spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,0 -+ }else if(tTmp.txt!="") ++ }else if(tTmp.txt=="enable") + { + bUp5.pco=65535 -+ bUp5.txt=tTmp.txt ++ spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,1 + } + // stop button -+ spstr tId.txt,tTmp.txt,"|",1 ++ spstr tId.txt,tTmp.txt,"|",4 + if(tTmp.txt=="disable") + { + bStop5.pco=27501 ++ spstr tId.txt,bStop5.txt,"|",1 + tsw bStop5,0 -+ }else if(tTmp.txt!="") ++ }else if(tTmp.txt=="enable") + { + bStop5.pco=65535 -+ bStop5.txt=tTmp.txt ++ spstr tId.txt,bStop5.txt,"|",1 + tsw bStop5,1 + } + // down button -+ spstr tId.txt,tTmp.txt,"|",2 ++ spstr tId.txt,tTmp.txt,"|",5 + if(tTmp.txt=="disable") + { + bDown5.pco=27501 ++ spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,0 -+ }else if(tTmp.txt!="") ++ }else if(tTmp.txt=="enable") + { + bDown5.pco=65535 -+ bDown5.txt=tTmp.txt ++ spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,1 + } + } @@ -465,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 08:56:32.972794177 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:56:33.488797507 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 14:52:29.008661186 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 14:52:29.432661126 +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 67fd2d23..53656e20 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,30 +1,35 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:56:33.504797610 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:56:32.972794177 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:56:33.488797507 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:56:32.976794203 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:56:33.492797532 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 14:52:29.444661125 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 14:52:29.008661186 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 14:52:29.428661127 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 14:52:29.008661186 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 14:52:29.432661126 +0000 + Hotspot mSwipeNext + Scope : local -+@@ -1880,6 +2108,166 @@ ++@@ -1892,6 +2120,169 @@ ++ // up button +++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") -++ }else if(tTmp.txt!="") -++ bUp5.txt=tTmp.txt +++ spstr tId.txt,bUp5.txt,"|",0 +++ }else if(tTmp.txt=="enable") +++ spstr tId.txt,bUp5.txt,"|",0 ++ // stop button +++ spstr tId.txt,tTmp.txt,"|",4 ++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 +++ spstr tId.txt,bStop5.txt,"|",1 ++ tsw bStop5,0 -++ }else if(tTmp.txt!="") +++ }else if(tTmp.txt=="enable") ++ { ++ bStop5.pco=65535 -++ bStop5.txt=tTmp.txt +++ spstr tId.txt,bStop5.txt,"|",1 ++ tsw bStop5,1 ++ } ++ // down button -++ spstr tId.txt,tTmp.txt,"|",2 +++ spstr tId.txt,tTmp.txt,"|",5 ++ if(tTmp.txt=="disable") -++ }else if(tTmp.txt!="") -++ bDown5.txt=tTmp.txt -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:56:32.972794177 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:56:33.488797507 +0000 +++ spstr tId.txt,bDown5.txt,"|",2 +++ }else if(tTmp.txt=="enable") +++ spstr tId.txt,bDown5.txt,"|",2 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 14:52:29.008661186 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 14:52:29.432661126 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index b911f7cb..0efd53d3 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2673,39 +2673,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp1.pco=27501 + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp1.pco=65535 - bUp1.txt=tTmp.txt + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop1.pco=27501 + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop1.pco=65535 - bStop1.txt=tTmp.txt + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown1.pco=27501 + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown1.pco=65535 - bDown1.txt=tTmp.txt + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,1 } } @@ -2833,39 +2836,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp2.pco=27501 + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp2.pco=65535 - bUp2.txt=tTmp.txt + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop2.pco=27501 + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop2.pco=65535 - bStop2.txt=tTmp.txt + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown2.pco=27501 + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown2.pco=65535 - bDown2.txt=tTmp.txt + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,1 } } @@ -2993,39 +2999,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp3.pco=27501 + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp3.pco=65535 - bUp3.txt=tTmp.txt + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop3.pco=27501 + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop3.pco=65535 - bStop3.txt=tTmp.txt + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown3.pco=27501 + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown3.pco=65535 - bDown3.txt=tTmp.txt + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,1 } } @@ -3153,39 +3162,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp4.pco=27501 + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp4.pco=65535 - bUp4.txt=tTmp.txt + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop4.pco=27501 + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop4.pco=65535 - bStop4.txt=tTmp.txt + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown4.pco=27501 + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown4.pco=65535 - bDown4.txt=tTmp.txt + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,1 } } @@ -3313,39 +3325,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",32 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp5.pco=27501 + spstr tId.txt,bUp5.txt,"|",0 tsw bUp5,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp5.pco=65535 - bUp5.txt=tTmp.txt + spstr tId.txt,bUp5.txt,"|",0 tsw bUp5,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop5.pco=27501 + spstr tId.txt,bStop5.txt,"|",1 tsw bStop5,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop5.pco=65535 - bStop5.txt=tTmp.txt + spstr tId.txt,bStop5.txt,"|",1 tsw bStop5,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown5.pco=27501 + spstr tId.txt,bDown5.txt,"|",2 tsw bDown5,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown5.pco=65535 - bDown5.txt=tTmp.txt + spstr tId.txt,bDown5.txt,"|",2 tsw bDown5,1 } } 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 16421cb3..e47a1be9 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) - 241 Line(s) of event code - 138 Unique line(s) of event code popupLight 27 Component(s) 345 Line(s) of event code @@ -50,13 +46,17 @@ screensaver 35 Component(s) 296 Line(s) of event code 237 Unique line(s) of event code +popupShutter + 20 Component(s) + 244 Line(s) of event code + 138 Unique line(s) of event code cardEntities 77 Component(s) - 1348 Line(s) of event code + 1363 Line(s) of event code 576 Unique line(s) of event code Total 13 Page(s) 414 Component(s) - 4670 Line(s) of event code + 4688 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 2cfd938c..4d8d17e1 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -646,38 +646,41 @@ Timer tmSerial tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bUp1.txt=tTmp.txt + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bStop1.txt=tTmp.txt + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bDown1.txt=tTmp.txt + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 } diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index c25f8fdc..8805505a 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1508,39 +1508,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp1.pco=27501 + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp1.pco=65535 - bUp1.txt=tTmp.txt + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop1.pco=27501 + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop1.pco=65535 - bStop1.txt=tTmp.txt + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown1.pco=27501 + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown1.pco=65535 - bDown1.txt=tTmp.txt + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,1 } } @@ -1668,39 +1671,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp2.pco=27501 + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp2.pco=65535 - bUp2.txt=tTmp.txt + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop2.pco=27501 + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop2.pco=65535 - bStop2.txt=tTmp.txt + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown2.pco=27501 + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown2.pco=65535 - bDown2.txt=tTmp.txt + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,1 } } @@ -1828,39 +1834,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp3.pco=27501 + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp3.pco=65535 - bUp3.txt=tTmp.txt + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop3.pco=27501 + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop3.pco=65535 - bStop3.txt=tTmp.txt + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown3.pco=27501 + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown3.pco=65535 - bDown3.txt=tTmp.txt + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,1 } } @@ -1988,39 +1997,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp4.pco=27501 + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp4.pco=65535 - bUp4.txt=tTmp.txt + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop4.pco=27501 + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop4.pco=65535 - bStop4.txt=tTmp.txt + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown4.pco=27501 + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown4.pco=65535 - bDown4.txt=tTmp.txt + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,1 } } @@ -2148,39 +2160,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",32 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp5.pco=27501 + spstr tId.txt,bUp5.txt,"|",0 tsw bUp5,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp5.pco=65535 - bUp5.txt=tTmp.txt + spstr tId.txt,bUp5.txt,"|",0 tsw bUp5,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop5.pco=27501 + spstr tId.txt,bStop5.txt,"|",1 tsw bStop5,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop5.pco=65535 - bStop5.txt=tTmp.txt + spstr tId.txt,bStop5.txt,"|",1 tsw bStop5,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown5.pco=27501 + spstr tId.txt,bDown5.txt,"|",2 tsw bDown5,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown5.pco=65535 - bDown5.txt=tTmp.txt + spstr tId.txt,bDown5.txt,"|",2 tsw bDown5,1 } } diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 5fca3dc8..6c7b272d 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -361,38 +361,41 @@ Timer tmSerial tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bUp1.txt=tTmp.txt + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bStop1.txt=tTmp.txt + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bDown1.txt=tTmp.txt + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 } diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 9ca0e570..e663d0b8 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2252,39 +2252,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp1.pco=27501 + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp1.pco=65535 - bUp1.txt=tTmp.txt + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop1.pco=27501 + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop1.pco=65535 - bStop1.txt=tTmp.txt + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown1.pco=27501 + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown1.pco=65535 - bDown1.txt=tTmp.txt + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,1 } } @@ -2412,39 +2415,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp2.pco=27501 + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp2.pco=65535 - bUp2.txt=tTmp.txt + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop2.pco=27501 + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop2.pco=65535 - bStop2.txt=tTmp.txt + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown2.pco=27501 + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown2.pco=65535 - bDown2.txt=tTmp.txt + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,1 } } @@ -2572,39 +2578,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp3.pco=27501 + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp3.pco=65535 - bUp3.txt=tTmp.txt + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop3.pco=27501 + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop3.pco=65535 - bStop3.txt=tTmp.txt + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown3.pco=27501 + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown3.pco=65535 - bDown3.txt=tTmp.txt + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,1 } } @@ -2732,39 +2741,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp4.pco=27501 + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp4.pco=65535 - bUp4.txt=tTmp.txt + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop4.pco=27501 + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop4.pco=65535 - bStop4.txt=tTmp.txt + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown4.pco=27501 + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown4.pco=65535 - bDown4.txt=tTmp.txt + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,1 } } diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 254fe31b..5ee0781c 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) + 244 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) - 1121 Line(s) of event code + 1133 Line(s) of event code 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4444 Line(s) of event code + 4459 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 baddcd3a..9b7dc8a9 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -646,38 +646,41 @@ Timer tmSerial tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bUp1.txt=tTmp.txt + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bStop1.txt=tTmp.txt + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bDown1.txt=tTmp.txt + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 } diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 157f7426..0440bb4f 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1280,39 +1280,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp1.pco=27501 + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp1.pco=65535 - bUp1.txt=tTmp.txt + spstr tId.txt,bUp1.txt,"|",0 tsw bUp1,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop1.pco=27501 + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop1.pco=65535 - bStop1.txt=tTmp.txt + spstr tId.txt,bStop1.txt,"|",1 tsw bStop1,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown1.pco=27501 + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown1.pco=65535 - bDown1.txt=tTmp.txt + spstr tId.txt,bDown1.txt,"|",2 tsw bDown1,1 } } @@ -1440,39 +1443,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp2.pco=27501 + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp2.pco=65535 - bUp2.txt=tTmp.txt + spstr tId.txt,bUp2.txt,"|",0 tsw bUp2,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop2.pco=27501 + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop2.pco=65535 - bStop2.txt=tTmp.txt + spstr tId.txt,bStop2.txt,"|",1 tsw bStop2,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown2.pco=27501 + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown2.pco=65535 - bDown2.txt=tTmp.txt + spstr tId.txt,bDown2.txt,"|",2 tsw bDown2,1 } } @@ -1600,39 +1606,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp3.pco=27501 + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp3.pco=65535 - bUp3.txt=tTmp.txt + spstr tId.txt,bUp3.txt,"|",0 tsw bUp3,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop3.pco=27501 + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop3.pco=65535 - bStop3.txt=tTmp.txt + spstr tId.txt,bStop3.txt,"|",1 tsw bStop3,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown3.pco=27501 + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown3.pco=65535 - bDown3.txt=tTmp.txt + spstr tId.txt,bDown3.txt,"|",2 tsw bDown3,1 } } @@ -1760,39 +1769,42 @@ Timer tmSerial // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 // up button - spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") { bUp4.pco=27501 + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bUp4.pco=65535 - bUp4.txt=tTmp.txt + spstr tId.txt,bUp4.txt,"|",0 tsw bUp4,1 } // stop button - spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",4 if(tTmp.txt=="disable") { bStop4.pco=27501 + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bStop4.pco=65535 - bStop4.txt=tTmp.txt + spstr tId.txt,bStop4.txt,"|",1 tsw bStop4,1 } // down button - spstr tId.txt,tTmp.txt,"|",2 + spstr tId.txt,tTmp.txt,"|",5 if(tTmp.txt=="disable") { bDown4.pco=27501 + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,0 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { bDown4.pco=65535 - bDown4.txt=tTmp.txt + spstr tId.txt,bDown4.txt,"|",2 tsw bDown4,1 } } diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 5fca3dc8..6c7b272d 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -361,38 +361,41 @@ Timer tmSerial tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bUp1.txt=tTmp.txt + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bStop1.txt=tTmp.txt + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 - }else if(tTmp.txt!="") + }else if(tTmp.txt=="enable") { - bDown1.txt=tTmp.txt + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 }