diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 0dacc0e4..770c8993 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-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:12:24.543208929 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:12:24.543208929 +0000 @@ -683,10 +683,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -24,8 +24,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:10:40.318836322 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:12:23.659186609 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:12:24.543208929 +0000 @@ -1924,10 +1924,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -38,8 +38,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:12:24.543208929 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -52,8 +52,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:12:24.543208929 +0000 @@ -635,10 +635,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-30 17:12:23.659186609 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:12:24.543208929 +0000 @@ -581,10 +581,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -82,8 +82,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:12:24.543208929 +0000 @@ -1169,10 +1169,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -96,8 +96,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:12:24.543208929 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -119,8 +119,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:12:24.543208929 +0000 @@ -560,10 +560,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -133,8 +133,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:12:24.543208929 +0000 @@ -310,10 +310,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -147,8 +147,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:10:40.314836175 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:12:24.543208929 +0000 @@ -405,10 +405,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -161,8 +161,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:10:40.318836322 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:12:24.543208929 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3ceff5d3..ec85de73 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-30 17:10:39.474892878 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:10:39.902823788 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:12:24.083197314 +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-30 17:10:39.474892878 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:10:39.902823788 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:12:23.659186609 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:12:24.087197415 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -467,23 +467,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:10:39.902823788 +0000 -@@ -846,10 +846,6 @@ - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 -- // get value normal -- spstr strCommand.txt,tTmp.txt,"~",2 -- covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:10:39.902823788 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-30 17:12:23.659186609 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:12:24.087197415 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -494,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:10:39.902823788 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:12:24.087197415 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -515,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 17:10:39.474892878 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:10:39.902823788 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-30 17:12:23.655186508 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:12:24.087197415 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 9dc4bd39..170bcc99 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,27 +1,13 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 17:10:39.918821674 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-30 17:10:39.474892878 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:10:39.902823788 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:10:39.474892878 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:10:39.902823788 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 17:12:24.099197718 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-30 17:12:23.655186508 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:12:24.083197314 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:12:23.659186609 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:12:24.087197415 +0000 +@@ -1849,6 +2077,169 @@ -+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:10:39.474892878 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:10:39.902823788 +0000 -+@@ -846,10 +846,6 @@ -+ // get value -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,dimValue,0,0 -+- // get value normal -+- spstr strCommand.txt,tTmp.txt,"~",2 -+- covx tTmp.txt,dimValueNormal,0,0 -+- dim=dimValueNormal -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/cardQR.txt 2022-05-30 17:10:39.474892878 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:10:39.902823788 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:10:39.474892878 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:10:39.902823788 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-30 17:10:39.474892878 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:10:39.902823788 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-30 17:12:23.659186609 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:12:24.087197415 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:12:23.655186508 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:12:24.087197415 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-30 17:12:23.655186508 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:12:24.087197415 +0000 +@@ -474,22 +474,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index f96db85a..13344f1d 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1310,6 +1310,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { 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 07eb91e7..d65da501 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 @@ -14,14 +14,14 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -cardGrid - 42 Component(s) - 435 Line(s) of event code - 256 Unique line(s) of event code cardQR 30 Component(s) 361 Line(s) of event code 210 Unique line(s) of event code +cardGrid + 42 Component(s) + 438 Line(s) of event code + 258 Unique line(s) of event code popupLight 27 Component(s) 351 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 416 Component(s) - 4687 Line(s) of event code + 4690 Line(s) of event code 1236 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 90641005..ef68a62e 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -846,6 +846,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") {