diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e43d4342..519c9d1f 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-01 00:12:28.772463810 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 00:12:29.768534180 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-01 01:57:12.799742561 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 01:57:13.779812142 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis arm2,0 vis arm3,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-01 00:12:28.776464093 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 00:12:29.768534180 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 01:57:12.803742845 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 01:57:13.779812142 +0000 @@ -211,7 +211,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -83,8 +83,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-01 00:12:28.772463810 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 00:12:29.768534180 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-01 01:57:12.799742561 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 01:57:13.779812142 +0000 @@ -12,28 +12,307 @@ Events @@ -444,8 +444,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-01 00:12:28.772463810 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 00:12:29.764533897 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-01 01:57:12.799742561 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 01:57:13.779812142 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -456,8 +456,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tIcons Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-01 00:12:28.772463810 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 00:12:29.768534180 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-01 01:57:12.799742561 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 01:57:13.779812142 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0a0c0ee9..557baac7 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-04-01 00:12:28.772463810 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 00:12:29.268498854 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-01 01:57:12.799742561 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 01:57:13.279776641 +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-04-01 00:12:28.776464093 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 00:12:29.268498854 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 01:57:12.803742845 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 01:57:13.283776925 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 00:12:28.772463810 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 00:12:29.268498854 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-01 01:57:12.799742561 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 01:57:13.279776641 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 2300a406..d7f0734c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -400,8 +400,8 @@ Text tEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 77 - y coordinate : 95 + x coordinate : 52 + y coordinate : 93 Width : 180 Height : 30 Effect : load @@ -430,8 +430,8 @@ Text tEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 78 - y coordinate : 164 + x coordinate : 52 + y coordinate : 162 Width : 180 Height : 30 Effect : load @@ -460,8 +460,8 @@ Text tEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 78 - y coordinate : 231 + x coordinate : 52 + y coordinate : 229 Width : 180 Height : 30 Effect : load @@ -490,7 +490,7 @@ Text tEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 78 + x coordinate : 52 y coordinate : 296 Width : 180 Height : 30 @@ -520,7 +520,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 5 y coordinate : 94 Width : 45 Height : 30 @@ -550,7 +550,7 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 5 y coordinate : 163 Width : 45 Height : 30 @@ -580,7 +580,7 @@ Text tIcon3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 5 y coordinate : 230 Width : 45 Height : 30 @@ -610,7 +610,7 @@ Text tIcon4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 5 y coordinate : 296 Width : 45 Height : 30 @@ -760,8 +760,8 @@ Text tEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 78 - y coordinate : 360 + x coordinate : 52 + y coordinate : 359 Width : 180 Height : 30 Effect : load @@ -790,7 +790,7 @@ Text tIcon5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 5 y coordinate : 360 Width : 45 Height : 30 @@ -820,8 +820,8 @@ Text tEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 78 - y coordinate : 425 + x coordinate : 52 + y coordinate : 424 Width : 180 Height : 30 Effect : load @@ -850,7 +850,7 @@ Text tIcon6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 5 y coordinate : 425 Width : 45 Height : 30 @@ -897,7 +897,7 @@ Slider hSlider1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 168 + x coordinate : 170 y coordinate : 88 Width : 100 Height : 43 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 da14ff7c..803fe5b3 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,10 +42,6 @@ cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code -cardEntities - 86 Component(s) - 1360 Line(s) of event code - 552 Unique line(s) of event code cardGrid 39 Component(s) 428 Line(s) of event code @@ -54,6 +50,10 @@ cardThermo 41 Component(s) 458 Line(s) of event code 283 Unique line(s) of event code +cardEntities + 86 Component(s) + 1360 Line(s) of event code + 552 Unique line(s) of event code Total 13 Page(s) diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index a43607d2..b9a2c8e5 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -158,7 +158,7 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 194 + y coordinate : 180 Width : 320 Height : 36 Effect : load @@ -217,8 +217,8 @@ Text tMainIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 44 - y coordinate : 252 + x coordinate : 125 + y coordinate : 241 Width : 70 Height : 65 Effect : load @@ -247,8 +247,8 @@ Text tMainText Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 - y coordinate : 316 + x coordinate : 111 + y coordinate : 305 Width : 110 Height : 42 Effect : load @@ -277,8 +277,8 @@ Text tForecast1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 146 - y coordinate : 260 + x coordinate : 5 + y coordinate : 368 Width : 71 Height : 25 Effect : load @@ -307,8 +307,8 @@ Text tForecast1Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 143 - y coordinate : 325 + x coordinate : 2 + y coordinate : 434 Width : 70 Height : 24 Effect : load @@ -337,8 +337,8 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 164 - y coordinate : 288 + x coordinate : 23 + y coordinate : 397 Width : 40 Height : 34 Effect : load @@ -367,8 +367,8 @@ Text tForecast2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 230 - y coordinate : 260 + x coordinate : 86 + y coordinate : 369 Width : 71 Height : 24 Effect : load @@ -397,8 +397,8 @@ Text tF2Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 246 - y coordinate : 288 + x coordinate : 103 + y coordinate : 397 Width : 40 Height : 34 Effect : load @@ -427,8 +427,8 @@ Text tForecast2Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 230 - y coordinate : 326 + x coordinate : 83 + y coordinate : 434 Width : 71 Height : 24 Effect : load @@ -457,8 +457,8 @@ Text t10 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 46 - y coordinate : 240 + x coordinate : 49 + y coordinate : 225 Width : 225 Height : 2 Effect : load @@ -488,9 +488,9 @@ Text tAMPM Send Component ID : disabled Opacity : 127 x coordinate : 105 - y coordinate : 132 + y coordinate : 122 Width : 103 - Height : 56 + Height : 57 Effect : load Effect Priority : 0 Effect Time : 300 @@ -517,7 +517,7 @@ Text tForecast3Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 82 + x coordinate : 165 y coordinate : 435 Width : 70 Height : 23 @@ -547,8 +547,8 @@ Text tF3Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 99 - y coordinate : 397 + x coordinate : 183 + y coordinate : 398 Width : 40 Height : 33 Effect : load @@ -577,7 +577,7 @@ Text tForecast3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 83 + x coordinate : 167 y coordinate : 370 Width : 70 Height : 23 @@ -607,7 +607,7 @@ Text tForecast4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 164 + x coordinate : 247 y coordinate : 370 Width : 70 Height : 23 @@ -637,8 +637,8 @@ Text tF4Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 181 - y coordinate : 397 + x coordinate : 263 + y coordinate : 398 Width : 40 Height : 33 Effect : load @@ -667,7 +667,7 @@ Text tForecast4Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 164 + x coordinate : 246 y coordinate : 435 Width : 70 Height : 23 @@ -697,8 +697,8 @@ Text tMainTextAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 122 - y coordinate : 260 + x coordinate : 203 + y coordinate : 249 Width : 105 Height : 41 Effect : load @@ -727,8 +727,8 @@ Text tMainIconAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 19 - y coordinate : 271 + x coordinate : 100 + y coordinate : 260 Width : 100 Height : 65 Effect : load @@ -757,8 +757,8 @@ Text tMRIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 120 - y coordinate : 315 + x coordinate : 201 + y coordinate : 304 Width : 40 Height : 34 Effect : load @@ -787,8 +787,8 @@ Text tMR Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 162 - y coordinate : 320 + x coordinate : 243 + y coordinate : 309 Width : 61 Height : 20 Effect : load