diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 02b9e136..e2627d77 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-28 20:18:16.481462743 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 20:18:17.549463034 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 21:37:53.907823982 +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-05-28 20:18:16.481462743 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 20:18:17.549463034 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 21:37:53.907823982 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index d5617d47..2812073d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -458,9 +458,9 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 26 + x coordinate : 22 y coordinate : 186 - Width : 97 + Width : 115 Height : 60 Effect : load Effect Priority : 0 @@ -518,9 +518,9 @@ Text tCurTempLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 28 + x coordinate : 24 y coordinate : 84 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -548,9 +548,9 @@ Text tStateLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 23 y coordinate : 152 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -668,9 +668,9 @@ Text tCurTemp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 28 + x coordinate : 24 y coordinate : 118 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 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 4e3f0a98..40de37a7 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 @@ -42,6 +42,10 @@ cardMedia 33 Component(s) 350 Line(s) of event code 179 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code screensaver 37 Component(s) 305 Line(s) of event code @@ -50,10 +54,6 @@ cardEntities 65 Component(s) 1133 Line(s) of event code 491 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code Total 13 Page(s) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b31ed881..c653da05 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-28 20:18:16.481462743 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 21:37:53.495818005 +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-28 20:18:16.485462744 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 21:37:53.111812433 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 21:37:53.495818005 +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-28 20:18:16.485462744 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 21:37:53.107812375 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 21:37:53.495818005 +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-28 20:18:16.481462743 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 21:37:53.495818005 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,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-28 20:18:16.485462744 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 21:37:53.107812375 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 21:37:53.495818005 +0000 @@ -471,22 +471,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4974450f..0ac50cd9 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 20:18:17.037462894 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 20:18:16.485462744 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-28 20:18:16.485462744 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 21:37:53.507818179 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 21:37:53.495818005 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-28 21:37:53.111812433 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 21:37:53.495818005 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-28 21:37:53.107812375 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 21:37:53.495818005 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 21:37:53.495818005 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-28 21:37:53.107812375 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 21:37:53.495818005 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 652a889e..69f8f369 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -458,9 +458,9 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 190 + x coordinate : 174 y coordinate : 110 - Width : 95 + Width : 115 Height : 56 Effect : load Effect Priority : 0 @@ -518,9 +518,9 @@ Text tCurTempLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 35 + x coordinate : 30 y coordinate : 76 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -548,9 +548,9 @@ Text tStateLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 192 + x coordinate : 174 y coordinate : 75 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -668,9 +668,9 @@ Text tCurTemp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 35 + x coordinate : 30 y coordinate : 112 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 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 651a370e..9f4efce2 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 @@ -26,10 +26,6 @@ cardQR 30 Component(s) 363 Line(s) of event code 207 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code cardAlarm 38 Component(s) 364 Line(s) of event code @@ -54,6 +50,10 @@ cardEntities 77 Component(s) 1363 Line(s) of event code 576 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code Total 13 Page(s) diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 0970c88f..f9aea850 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -460,7 +460,7 @@ Text tStatus Opacity : 127 x coordinate : 11 y coordinate : 190 - Width : 97 + Width : 115 Height : 54 Effect : load Effect Priority : 0 @@ -520,7 +520,7 @@ Text tCurTempLbl Opacity : 127 x coordinate : 13 y coordinate : 85 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -550,7 +550,7 @@ Text tStateLbl Opacity : 127 x coordinate : 12 y coordinate : 156 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -670,7 +670,7 @@ Text tCurTemp Opacity : 127 x coordinate : 13 y coordinate : 119 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index a14cc636..197f58df 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code cardQR 30 Component(s) 363 Line(s) of event code @@ -50,6 +46,10 @@ cardAlarm 38 Component(s) 364 Line(s) of event code 224 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code