diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 282738d7..a5f5877b 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-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:32:17.830992218 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:37:24.258297598 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,23 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 20:32:17.834992421 +0000 -@@ -1925,10 +1925,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/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:32:17.834992421 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:37:24.258297598 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +23,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-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:32:17.830992218 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:37:24.258297598 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -99,8 +85,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.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-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:32:17.834992421 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:37:24.258297598 +0000 @@ -1152,10 +1152,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -113,8 +99,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-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:32:17.830992218 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:37:24.258297598 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -124,42 +110,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -273,10 +273,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/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 20:32:17.830992218 +0000 -@@ -561,10 +561,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/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-06 20:32:16.934946602 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 20:32:17.830992218 +0000 -@@ -311,10 +311,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 --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 7017b242..95bcb778 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2897,6 +2897,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/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 360e76c8..fc4297da 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 @@ -10,18 +10,10 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -popupNotify - 17 Component(s) - 201 Line(s) of event code - 126 Unique line(s) of event code pageStartup 19 Component(s) - 154 Line(s) of event code - 115 Unique line(s) of event code -popupLight - 27 Component(s) - 349 Line(s) of event code - 189 Unique line(s) of event code + 157 Line(s) of event code + 117 Unique line(s) of event code cardMedia 33 Component(s) 347 Line(s) of event code @@ -34,6 +26,10 @@ cardGrid 42 Component(s) 436 Line(s) of event code 257 Unique line(s) of event code +popupNotify + 17 Component(s) + 204 Line(s) of event code + 128 Unique line(s) of event code popupShutter 25 Component(s) 330 Line(s) of event code @@ -48,8 +44,12 @@ screensaver 253 Unique line(s) of event code cardEntities 65 Component(s) - 1130 Line(s) of event code - 494 Unique line(s) of event code + 1133 Line(s) of event code + 496 Unique line(s) of event code +popupLight + 27 Component(s) + 352 Line(s) of event code + 191 Unique line(s) of event code cardAlarm 40 Component(s) 392 Line(s) of event code @@ -58,5 +58,5 @@ cardAlarm Total 13 Page(s) 411 Component(s) - 4608 Line(s) of event code + 4620 Line(s) of event code 1220 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index b8d04f7e..3d4fb838 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -568,6 +568,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/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 21a412ee..df5676d1 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -907,6 +907,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/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index 17afe255..051beeba 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -520,6 +520,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/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 33dc6abe..c8023456 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1925,6 +1925,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/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index c69ffa5c..dd50a033 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -273,6 +273,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/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 9db8b418..7c91169b 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -561,6 +561,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/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index c1db9a2c..68fc143d 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -311,6 +311,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/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 6f767f5b..574a53e8 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-06 20:32:16.934946602 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:32:17.370968799 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +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-06 20:32:16.934946602 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:32:17.374969002 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:32:17.374969002 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:32:17.374969002 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +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 d5a57d89..eed56204 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-06 20:32:17.386969613 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:32:16.934946602 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:32:17.370968799 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:32:17.374969002 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:37:23.814292644 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:37:23.366287644 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:32:17.374969002 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,5 +59,5 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:32:17.374969002 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +0000