diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3be5048f..f7b5f9d2 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 19:32:14.502677064 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 19:32:15.366674234 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 05:51:12.437634460 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-22 19:32:15.366674234 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 05:51:12.441634539 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 19:32:15.366674234 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 05:51:12.437634460 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 96b37033..c89e208f 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 19:32:14.502677064 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +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 19:32:14.502677064 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +0000 @@ -62,6 +62,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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,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-22 19:32:14.502677064 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +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 589d9468..e9de03f5 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-05-22 19:32:14.938675636 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 19:32:14.502677064 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 05:51:12.049626846 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-23 05:51:11.625618526 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1892,6 +2120,169 @@ @@ -32,8 +32,8 @@ ++ }else if(tTmp.txt=="enable") ++ spstr tId.txt,bDown5.txt,"|",2 +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +0000 +@@ -34,7 +34,7 @@ + Attributes + Scope : local @@ -43,5 +43,5 @@ + + Variable (string) entn + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +0000 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 04503939..a369c6aa 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 @@ -42,14 +42,14 @@ cardMedia 33 Component(s) 350 Line(s) of event code 179 Unique line(s) of event code -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 +screensaver + 35 Component(s) + 296 Line(s) of event code + 237 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/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 4d8d17e1..894e85b6 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -247,8 +247,8 @@ Text tPosHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 - y coordinate : 168 + x coordinate : 106 + y coordinate : 273 Width : 100 Height : 30 Effect : load @@ -324,8 +324,8 @@ Slider hPosition Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 9 - y coordinate : 198 + x coordinate : 35 + y coordinate : 304 Width : 250 Height : 43 Effect : load @@ -415,8 +415,8 @@ Button bDown1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 112 - y coordinate : 88 + x coordinate : 199 + y coordinate : 156 Width : 50 Height : 50 Effect : load @@ -462,8 +462,8 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 60 - y coordinate : 88 + x coordinate : 136 + y coordinate : 156 Width : 50 Height : 50 Effect : load @@ -509,8 +509,8 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 - y coordinate : 88 + x coordinate : 73 + y coordinate : 156 Width : 50 Height : 50 Effect : load