diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index cbe2bcfd..0dacc0e4 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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:02:49.343806991 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:02:49.331805698 +0000 +--- 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 @@ -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:02:48.227713141 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:02:49.343806991 +0000 +--- 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 @@ -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 04d93367..3ceff5d3 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:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +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 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,24 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +0000 -@@ -683,10 +683,7 @@ - // 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 -+ dim=dimValue - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +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 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -483,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/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +0000 +--- 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 @@ -496,24 +481,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt } if(tInstruction.txt=="timeout") { -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +0000 -@@ -635,10 +635,7 @@ - // 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 -+ dim=dimValue - } - 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:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +0000 +--- 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 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -523,21 +493,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes -@@ -581,10 +581,7 @@ - // 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 -+ dim=dimValue - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +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 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -556,23 +514,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-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +0000 -@@ -560,10 +560,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +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 @@ -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 45cff164..9dc4bd39 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,27 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 17:02:48.759744086 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +0000 -+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +0000 -+@@ -683,10 +683,7 @@ -+ // 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 -++ dim=dimValue -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +0000 ++++ 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 +@@ -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:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +0000 ++--- 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 @@ -33,51 +18,10 @@ + } + if(tInstruction.txt=="timeout") + { -+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +0000 -+@@ -635,10 +635,7 @@ -+ // 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 -++ dim=dimValue -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +0000 -+@@ -581,10 +581,7 @@ -+ // 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 -++ dim=dimValue -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +0000 -+@@ -560,10 +560,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/screensaver.txt 2022-05-30 17:02:48.227713141 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +0000 ++--- 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 +@@ -474,22 +474,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 242b4086..d21d81ae 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1240,7 +1240,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // 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/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 33d54b08..456d36ee 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1084,7 +1084,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // 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/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 3145a9e8..0273a956 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -871,7 +871,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // 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 49bf5fe0..07eb91e7 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 @@ -2,10 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -cardAlarm - 38 Component(s) - 360 Line(s) of event code - 226 Unique line(s) of event code +cardMedia + 33 Component(s) + 348 Line(s) of event code + 182 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -18,18 +18,18 @@ cardGrid 42 Component(s) 435 Line(s) of event code 256 Unique line(s) of event code -popupLight - 27 Component(s) - 348 Line(s) of event code - 188 Unique line(s) of event code cardQR 30 Component(s) - 359 Line(s) of event code - 209 Unique line(s) of event code -cardMedia - 33 Component(s) - 346 Line(s) of event code - 181 Unique line(s) of event code + 361 Line(s) of event code + 210 Unique line(s) of event code +popupLight + 27 Component(s) + 351 Line(s) of event code + 190 Unique line(s) of event code +cardAlarm + 38 Component(s) + 362 Line(s) of event code + 227 Unique line(s) of event code popupNotify 17 Component(s) 203 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 416 Component(s) - 4678 Line(s) of event code + 4687 Line(s) of event code 1236 Unique 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 6a5b36c6..f489bf9c 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -906,6 +906,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/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 3b44119a..81e53cc7 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -683,7 +683,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // 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/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 35913768..4ea1c305 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -635,7 +635,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // 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/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 348cea14..3f88df57 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -581,7 +581,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // 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/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 4c4b5703..437085c1 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -560,6 +560,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") {