diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 60c2cf77..ae4ab873 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-06-19 14:20:59.947205019 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-19 14:21:01.123214844 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-19 15:03:28.220436240 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-19 14:20:59.947205019 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-19 14:21:01.123214844 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-19 15:03:28.220436240 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-19 14:20:59.947205019 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-19 14:21:01.123214844 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-19 15:03:28.220436240 +0000 @@ -181,7 +181,7 @@ Touch Release Event // event,buttonPress2,internalNameEntity,positionSlider,50 @@ -59,7 +59,13 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -520,7 +520,6 @@ +@@ -515,13 +515,11 @@ + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",13 + bTLeft.pco=27501 +- vis bTRight,1 + }else if(tTmp.txt=="enable") + { spstr strCommand.txt,bTLeft.txt,"~",13 tsw bTLeft,1 bTLeft.pco=65535 @@ -67,7 +73,13 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",17 -@@ -534,10 +533,9 @@ +@@ -530,36 +528,24 @@ + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",14 + bTStop.pco=27501 +- vis bTRight,1 + }else if(tTmp.txt=="enable") + { spstr strCommand.txt,bTStop.txt,"~",14 tsw bTStop,1 bTStop.pco=65535 @@ -79,7 +91,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tTmp.txt=="disable") { spstr strCommand.txt,bTRight.txt,"~",15 -@@ -548,15 +546,6 @@ + tsw bTRight,0 + bTRight.pco=27501 +- vis bTRight,1 + }else if(tTmp.txt=="enable") + { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 4a897f0a..1ee6df48 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-06-19 14:20:59.947205019 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 14:21:00.515209751 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 15:03:27.756426330 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-19 14:20:59.951205050 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 14:21:00.515209751 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 15:03:27.756426330 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-19 14:20:59.947205019 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 14:21:00.515209751 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 15:03:27.756426330 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -488,30 +488,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-19 14:20:59.951205050 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-19 14:21:00.515209751 +0000 -@@ -151,7 +151,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 80 -+ Max. Text Size : 10 - - Text tInstruction - Attributes diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-19 14:20:59.947205019 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 14:21:00.515209751 +0000 -@@ -69,7 +69,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 10 - - Text tEntity - Attributes +--- HMI/n2t-out/popupShutter.txt 2022-06-19 15:03:27.316416932 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 15:03:27.756426330 +0000 @@ -181,7 +181,7 @@ Touch Release Event // event,buttonPress2,internalNameEntity,positionSlider,50 @@ -548,7 +527,13 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -520,7 +520,6 @@ +@@ -515,13 +515,11 @@ + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",13 + bTLeft.pco=27501 +- vis bTRight,1 + }else if(tTmp.txt=="enable") + { spstr strCommand.txt,bTLeft.txt,"~",13 tsw bTLeft,1 bTLeft.pco=65535 @@ -556,7 +541,13 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",17 -@@ -534,10 +533,9 @@ +@@ -530,36 +528,24 @@ + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",14 + bTStop.pco=27501 +- vis bTRight,1 + }else if(tTmp.txt=="enable") + { spstr strCommand.txt,bTStop.txt,"~",14 tsw bTStop,1 bTStop.pco=65535 @@ -568,7 +559,11 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt if(tTmp.txt=="disable") { spstr strCommand.txt,bTRight.txt,"~",15 -@@ -548,15 +546,6 @@ + tsw bTRight,0 + bTRight.pco=27501 +- vis bTRight,1 + }else if(tTmp.txt=="enable") + { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 31bec3d6..dd05ffd4 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-19 14:21:00.535209919 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-19 14:20:59.947205019 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 14:21:00.515209751 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-19 14:20:59.951205050 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 14:21:00.515209751 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-19 15:03:27.772426671 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-19 15:03:27.316416932 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-19 15:03:27.756426330 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-19 15:03:27.316416932 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-19 15:03:27.756426330 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -14,32 +14,11 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-06-19 14:20:59.947205019 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 14:21:00.515209751 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-06-19 14:20:59.951205050 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-19 14:21:00.515209751 +0000 -+@@ -151,7 +151,7 @@ -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+- Max. Text Size : 80 -++ Max. Text Size : 10 -+ -+ Text tInstruction -+ Attributes ++--- HMI/n2t-out/pageStartup.txt 2022-06-19 15:03:27.316416932 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-19 15:03:27.756426330 +0000 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-06-19 14:20:59.947205019 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 14:21:00.515209751 +0000 -+@@ -69,7 +69,7 @@ -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 10 -+ -+ Text tEntity -+ Attributes ++--- HMI/n2t-out/popupShutter.txt 2022-06-19 15:03:27.316416932 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-19 15:03:27.756426330 +0000 +@@ -181,7 +181,7 @@ + Touch Release Event + // event,buttonPress2,internalNameEntity,positionSlider,50 @@ -76,7 +55,13 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -520,7 +520,6 @@ ++@@ -515,13 +515,11 @@ ++ tsw bTLeft,0 ++ spstr strCommand.txt,bTLeft.txt,"~",13 ++ bTLeft.pco=27501 ++- vis bTRight,1 ++ }else if(tTmp.txt=="enable") ++ { + spstr strCommand.txt,bTLeft.txt,"~",13 + tsw bTLeft,1 + bTLeft.pco=65535 @@ -84,7 +69,13 @@ + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",17 -+@@ -534,10 +533,9 @@ ++@@ -530,36 +528,24 @@ ++ tsw bTStop,0 ++ spstr strCommand.txt,bTStop.txt,"~",14 ++ bTStop.pco=27501 ++- vis bTRight,1 ++ }else if(tTmp.txt=="enable") ++ { + spstr strCommand.txt,bTStop.txt,"~",14 + tsw bTStop,1 + bTStop.pco=65535 @@ -95,7 +86,11 @@ + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",15 -+@@ -548,15 +546,6 @@ ++ tsw bTRight,0 ++ bTRight.pco=27501 ++- vis bTRight,1 ++ }else if(tTmp.txt=="enable") ++ { + spstr strCommand.txt,bTRight.txt,"~",15 + tsw bTRight,1 + bTRight.pco=65535 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index d504f983..e9a68153 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 @@ cardQR 32 Component(s) 374 Line(s) of event code 218 Unique line(s) of event code +popupLight + 27 Component(s) + 353 Line(s) of event code + 193 Unique line(s) of event code popupNotify 17 Component(s) 204 Line(s) of event code @@ -38,10 +42,6 @@ screensaver 38 Component(s) 319 Line(s) of event code 253 Unique line(s) of event code -popupLight - 27 Component(s) - 353 Line(s) of event code - 193 Unique line(s) of event code cardEntities 77 Component(s) 1363 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 05aac277..ee115234 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -320,7 +320,7 @@ Text tTmp Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 80 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index b3fedb66..40c07549 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -82,7 +82,7 @@ Variable (string) tTmp ID : 19 Scope : local Text : - Max. Text Size: 10 + Max. Text Size: 80 Text tEntity Attributes diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index a8018887..e0c25405 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -151,7 +151,7 @@ Text tTmp Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 80 Text tInstruction Attributes diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index e70908fe..f4bf96d5 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -69,7 +69,7 @@ Variable (string) tTmp Attributes Scope : local Text : - Max. Text Size: 10 + Max. Text Size: 80 Text tEntity Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f229eae6..388bfb17 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -20,7 +20,7 @@ popupNotify 128 Unique line(s) of event code popupShutter 25 Component(s) - 341 Line(s) of event code + 344 Line(s) of event code 175 Unique line(s) of event code cardMedia 34 Component(s) @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 412 Component(s) - 4655 Line(s) of event code + 4658 Line(s) of event code 1245 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index ebcccf63..637b6f5a 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -844,6 +844,7 @@ Timer tmSerial tsw bTLeft,0 spstr strCommand.txt,bTLeft.txt,"~",13 bTLeft.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTLeft.txt,"~",13 @@ -858,6 +859,7 @@ Timer tmSerial tsw bTStop,0 spstr strCommand.txt,bTStop.txt,"~",14 bTStop.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTStop.txt,"~",14 @@ -872,6 +874,7 @@ Timer tmSerial spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTRight.txt,"~",15 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 6d610623..d32a3f92 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -515,6 +515,7 @@ Timer tmSerial tsw bTLeft,0 spstr strCommand.txt,bTLeft.txt,"~",13 bTLeft.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTLeft.txt,"~",13 @@ -529,6 +530,7 @@ Timer tmSerial tsw bTStop,0 spstr strCommand.txt,bTStop.txt,"~",14 bTStop.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTStop.txt,"~",14 @@ -543,6 +545,7 @@ Timer tmSerial spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTRight.txt,"~",15