diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 40e718f8..fbd67665 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 19:37:52.047161395 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:37:52.963174145 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:48:50.175937273 +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 19:37:52.051161450 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:37:52.963174145 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:48:50.175937273 +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 484c75a6..f3a3b8ed 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -459,9 +459,9 @@ Text tStatus Send Component ID : disabled Opacity : 127 x coordinate : 26 - y coordinate : 200 + y coordinate : 186 Width : 97 - Height : 30 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -476,7 +476,7 @@ Text tStatus Input Type : character Text : Max. Text Size : 10 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -519,7 +519,7 @@ Text tCurTempLbl Send Component ID : disabled Opacity : 127 x coordinate : 28 - y coordinate : 85 + y coordinate : 84 Width : 95 Height : 30 Effect : load @@ -549,7 +549,7 @@ Text tStateLbl Send Component ID : disabled Opacity : 127 x coordinate : 27 - y coordinate : 162 + y coordinate : 152 Width : 95 Height : 30 Effect : load @@ -669,7 +669,7 @@ Text tCurTemp Send Component ID : disabled Opacity : 127 x coordinate : 28 - y coordinate : 121 + y coordinate : 118 Width : 95 Height : 30 Effect : load diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f7eedd57..ea27a7f1 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 19:37:52.047161395 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:48:49.619895008 +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 19:37:52.051161450 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:48:49.623895312 +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 19:37:52.051161450 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:48:49.619895008 +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 19:37:52.051161450 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:48:49.619895008 +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 19:37:52.051161450 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 19:48:49.099855479 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:48:49.619895008 +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 0d4c3710..24da9ac6 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 19:37:52.515167909 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:37:52.051161450 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 19:37:52.051161450 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-28 19:37:52.051161450 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:48:49.639896528 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-28 19:48:49.099855479 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:48:49.619895008 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:48:49.099855479 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:48:49.623895312 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-28 19:48:49.099855479 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:48:49.619895008 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:48:49.099855479 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:48:49.619895008 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-28 19:48:49.099855479 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:48:49.619895008 +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 785f3d1d..6080851d 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -159,7 +159,7 @@ XFloat xTempDest1 Send Component ID : disabled Opacity : 127 x coordinate : 174 - y coordinate : 219 + y coordinate : 227 Width : 120 Height : 60 Effect : load @@ -189,7 +189,7 @@ XFloat xTempMin1 Send Component ID : disabled Opacity : 127 x coordinate : 262 - y coordinate : 172 + y coordinate : 180 Width : 50 Height : 22 Effect : load @@ -219,7 +219,7 @@ XFloat xTempMax1 Send Component ID : disabled Opacity : 127 x coordinate : 262 - y coordinate : 194 + y coordinate : 202 Width : 45 Height : 20 Effect : load @@ -249,7 +249,7 @@ XFloat xTempStep1 Send Component ID : disabled Opacity : 127 x coordinate : 263 - y coordinate : 282 + y coordinate : 290 Width : 45 Height : 20 Effect : load @@ -279,7 +279,7 @@ XFloat xTempDest2 Send Component ID : disabled Opacity : 127 x coordinate : 21 - y coordinate : 219 + y coordinate : 227 Width : 120 Height : 60 Effect : load @@ -309,7 +309,7 @@ XFloat xTempMin2 Send Component ID : disabled Opacity : 127 x coordinate : 110 - y coordinate : 170 + y coordinate : 178 Width : 50 Height : 21 Effect : load @@ -339,7 +339,7 @@ XFloat xTempMax2 Send Component ID : disabled Opacity : 127 x coordinate : 110 - y coordinate : 192 + y coordinate : 200 Width : 45 Height : 20 Effect : load @@ -369,7 +369,7 @@ XFloat xTempStep2 Send Component ID : disabled Opacity : 127 x coordinate : 111 - y coordinate : 280 + y coordinate : 288 Width : 45 Height : 20 Effect : load @@ -399,7 +399,7 @@ XFloat xTempDest Send Component ID : disabled Opacity : 127 x coordinate : 100 - y coordinate : 220 + y coordinate : 228 Width : 120 Height : 60 Effect : load @@ -458,10 +458,10 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 191 - y coordinate : 119 - Width : 97 - Height : 30 + x coordinate : 190 + y coordinate : 110 + Width : 95 + Height : 56 Effect : load Effect Priority : 0 Effect Time : 300 @@ -476,7 +476,7 @@ Text tStatus Input Type : character Text : Max. Text Size : 10 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -489,7 +489,7 @@ Text tCF1 Send Component ID : disabled Opacity : 127 x coordinate : 295 - y coordinate : 217 + y coordinate : 225 Width : 25 Height : 30 Effect : load @@ -519,7 +519,7 @@ Text tCurTempLbl Send Component ID : disabled Opacity : 127 x coordinate : 35 - y coordinate : 82 + y coordinate : 76 Width : 95 Height : 30 Effect : load @@ -549,7 +549,7 @@ Text tStateLbl Send Component ID : disabled Opacity : 127 x coordinate : 192 - y coordinate : 81 + y coordinate : 75 Width : 95 Height : 30 Effect : load @@ -579,7 +579,7 @@ Text tCF2 Send Component ID : disabled Opacity : 127 x coordinate : 142 - y coordinate : 217 + y coordinate : 225 Width : 25 Height : 30 Effect : load @@ -608,9 +608,9 @@ Text tALbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 - y coordinate : 403 - Width : 67 + x coordinate : 15 + y coordinate : 402 + Width : 83 Height : 30 Effect : load Effect Priority : 0 @@ -639,7 +639,7 @@ Text tCF Send Component ID : disabled Opacity : 127 x coordinate : 221 - y coordinate : 217 + y coordinate : 225 Width : 25 Height : 30 Effect : load @@ -669,7 +669,7 @@ Text tCurTemp Send Component ID : disabled Opacity : 127 x coordinate : 35 - y coordinate : 118 + y coordinate : 112 Width : 95 Height : 30 Effect : load @@ -1209,7 +1209,7 @@ Dual-state Button btUp1 Send Component ID : disabled Opacity : 127 x coordinate : 210 - y coordinate : 168 + y coordinate : 176 Width : 50 Height : 50 Effect : load @@ -1267,7 +1267,7 @@ Dual-state Button btDown1 Send Component ID : disabled Opacity : 127 x coordinate : 210 - y coordinate : 280 + y coordinate : 288 Width : 50 Height : 50 Effect : load @@ -1325,7 +1325,7 @@ Dual-state Button bUp2 Send Component ID : disabled Opacity : 127 x coordinate : 57 - y coordinate : 168 + y coordinate : 176 Width : 50 Height : 50 Effect : load @@ -1383,7 +1383,7 @@ Dual-state Button bDown2 Send Component ID : disabled Opacity : 127 x coordinate : 57 - y coordinate : 280 + y coordinate : 288 Width : 50 Height : 50 Effect : load @@ -1441,7 +1441,7 @@ Dual-state Button btUp Send Component ID : disabled Opacity : 127 x coordinate : 136 - y coordinate : 169 + y coordinate : 177 Width : 50 Height : 50 Effect : load @@ -1499,7 +1499,7 @@ Dual-state Button btDown Send Component ID : disabled Opacity : 127 x coordinate : 136 - y coordinate : 281 + y coordinate : 289 Width : 50 Height : 50 Effect : load 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 6be912f6..ba20bb45 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 @@ -22,10 +22,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 @@ -50,6 +46,10 @@ screensaver 37 Component(s) 290 Line(s) of event code 229 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code cardEntities 77 Component(s) 1363 Line(s) of event code