diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3f797469..10a81c79 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-27 19:42:38.550124672 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:42:39.418054880 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 20:18:09.913490467 +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-27 19:42:38.550124672 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:42:39.418054880 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 20:18:09.913490467 +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-27 19:42:38.550124672 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:42:39.418054880 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 20:18:09.913490467 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -33,8 +33,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:42:39.418054880 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 20:18:09.913490467 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:42:39.418054880 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 20:18:09.913490467 +0000 @@ -62,12 +62,6 @@ Text : Max. Text Size: 50 @@ -89,7 +89,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  +- Text : - Max. Text Size : 5 - -Text tIcon2 @@ -99,7 +99,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  +- Text : - Max. Text Size : 5 - Picture p0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index dfac20ab..1f49fa13 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-27 19:42:38.550124672 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 20:18:09.393466017 +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-27 19:42:38.550124672 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 20:18:09.397466205 +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-27 19:42:38.550124672 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 20:18:09.397466205 +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-27 19:42:38.550124672 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 20:18:09.397466205 +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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 20:18:09.397466205 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -513,97 +513,3 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send calc crc 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-27 19:42:38.550124672 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000 -@@ -62,12 +62,6 @@ - Text : - Max. Text Size: 50 - --Variable (string) tSend -- Attributes -- Scope : local -- Text : -- Max. Text Size: 50 -- - Text tTime - Attributes - Scope : local -@@ -88,6 +82,16 @@ - Text : Tuesday, 08. March 2022 - Max. Text Size : 35 - -+Text tSend -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 50 -+ - Text tMainIcon - Attributes - Scope : local -@@ -308,26 +312,6 @@ - Text : - Max. Text Size : 35 - --Text tIcon1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text :  -- Max. Text Size : 5 -- --Text tIcon2 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text :  -- Max. Text Size : 5 -- - Picture p0 - Attributes - Scope : local -@@ -471,33 +455,9 @@ - vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 -- vis tForecast1,0 -- vis tF1Icon,0 -- vis tForecast1Val,0 -- //move forecast values to the right -- tForecast4.txt=tForecast3.txt -- tForecast3.txt=tForecast2.txt -- tForecast2.txt=tForecast1.txt -- tForecast4Val.txt=tForecast3Val.txt -- tForecast3Val.txt=tForecast2Val.txt -- tForecast2Val.txt=tForecast1Val.txt -- tF4Icon.txt=tF3Icon.txt -- tF3Icon.txt=tF2Icon.txt -- tF2Icon.txt=tF1Icon.txt -- tF4Icon.pco=tF3Icon.pco -- tF3Icon.pco=tF2Icon.pco -- tF2Icon.pco=tF1Icon.pco - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 -- //statusIcon1 -- spstr strCommand.txt,tIcon1.txt,"~",17 -- spstr strCommand.txt,tTmp.txt,"~",18 -- covx tTmp.txt,tIcon1.pco,0,0 -- //statusIcon2 -- spstr strCommand.txt,tIcon2.txt,"~",19 -- spstr strCommand.txt,tTmp.txt,"~",20 -- covx tTmp.txt,tIcon2.pco,0,0 - } - if(tInstruction.txt=="color") - { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index ebaa7693..e60771ec 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,15 +1,15 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:42:38.990089293 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:42:38.550124672 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 20:18:09.413466958 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-27 20:18:08.893442508 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 20:18:09.393466017 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-27 20:18:08.893442508 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 20:18:09.397466205 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 20:18:09.397466205 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-27 20:18:08.893442508 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 20:18:09.397466205 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 20:18:09.397466205 +0000 +@@ -209,9 +209,6 @@ + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 @@ -20,74 +20,3 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000 -+@@ -62,12 +62,6 @@ -+ Text : -+ Max. Text Size: 50 -+ -+-Variable (string) tSend -+- Attributes -+- Scope : local -+- Text : -+- Max. Text Size: 50 -+- -+ Text tTime -+ Attributes -+ Scope : local -+@@ -88,6 +82,16 @@ -+ Text : Tuesday, 08. March 2022 -+ Max. Text Size : 35 -+ -++Text tSend -++ Attributes -++ Scope : local -++ Dragging : 0 -++ Disable release event after dragging: 0 -++ Send Component ID : disabled -++ Associated Keyboard : none -++ Text : -++ Max. Text Size : 50 -++ -+ Text tMainIcon -+ Attributes -+ Scope : local -+@@ -308,26 +312,6 @@ -+ Text : -+ Max. Text Size : 35 -+ -+-Text tIcon1 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text :  -+- Max. Text Size : 5 -+- -+-Text tIcon2 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text :  -+- Max. Text Size : 5 -+- -+ Picture p0 -+ Attributes -+ Scope : local -+@@ -471,33 +455,9 @@ -+- //statusIcon1 -+- spstr strCommand.txt,tIcon1.txt,"~",17 -+- spstr strCommand.txt,tTmp.txt,"~",18 -+- covx tTmp.txt,tIcon1.pco,0,0 -+- //statusIcon2 -+- spstr strCommand.txt,tIcon2.txt,"~",19 -+- spstr strCommand.txt,tTmp.txt,"~",20 -+- covx tTmp.txt,tIcon2.pco,0,0 -+ } -+ if(tInstruction.txt=="color") -+ { 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 7bcb6ddd..c136fce0 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 @@ -39,9 +39,9 @@ cardMedia 350 Line(s) of event code 179 Unique line(s) of event code screensaver - 35 Component(s) - 282 Line(s) of event code - 223 Unique line(s) of event code + 37 Component(s) + 303 Line(s) of event code + 242 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 414 Component(s) - 4674 Line(s) of event code - 1225 Unique line(s) of event code + 416 Component(s) + 4695 Line(s) of event code + 1244 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index c3de6fda..6ef3abed 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -50,27 +50,34 @@ Variable (string) strCommand Variable (string) tId Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 25 + ID : 24 Scope: local Value: 0 Variable (string) tInstruction Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 32 + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 34 Scope : local Text : Max. Text Size: 50 @@ -135,7 +142,7 @@ Text tDate Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tMainIcon Attributes ID : 7 Scope : local @@ -143,38 +150,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 19 - y coordinate : 450 - Width : 27 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainIcon - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 x coordinate : 125 - y coordinate : 241 + y coordinate : 254 Width : 70 Height : 65 Effect : load @@ -197,14 +174,14 @@ Text tMainIcon Text tMainText Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 111 - y coordinate : 305 + y coordinate : 318 Width : 110 Height : 42 Effect : load @@ -227,14 +204,14 @@ Text tMainText Text tForecast1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 5 - y coordinate : 368 + y coordinate : 377 Width : 71 Height : 25 Effect : load @@ -257,14 +234,14 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 2 - y coordinate : 434 + y coordinate : 443 Width : 70 Height : 24 Effect : load @@ -287,14 +264,14 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 23 - y coordinate : 397 + y coordinate : 406 Width : 40 Height : 34 Effect : load @@ -317,14 +294,14 @@ Text tF1Icon Text tForecast2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 86 - y coordinate : 369 + y coordinate : 378 Width : 71 Height : 24 Effect : load @@ -347,14 +324,14 @@ Text tForecast2 Text tF2Icon Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 103 - y coordinate : 397 + y coordinate : 406 Width : 40 Height : 34 Effect : load @@ -377,14 +354,14 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 83 - y coordinate : 434 + y coordinate : 443 Width : 71 Height : 24 Effect : load @@ -407,14 +384,14 @@ Text tForecast2Val Text t10 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 225 + y coordinate : 233 Width : 225 Height : 2 Effect : load @@ -437,7 +414,7 @@ Text t10 Text tAMPM Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -467,14 +444,14 @@ Text tAMPM Text tForecast3Val Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 435 + y coordinate : 444 Width : 70 Height : 23 Effect : load @@ -497,14 +474,14 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 183 - y coordinate : 398 + y coordinate : 407 Width : 40 Height : 33 Effect : load @@ -527,14 +504,14 @@ Text tF3Icon Text tForecast3 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 167 - y coordinate : 370 + y coordinate : 379 Width : 70 Height : 23 Effect : load @@ -557,14 +534,14 @@ Text tForecast3 Text tForecast4 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 247 - y coordinate : 370 + y coordinate : 379 Width : 70 Height : 23 Effect : load @@ -587,14 +564,14 @@ Text tForecast4 Text tF4Icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 263 - y coordinate : 398 + y coordinate : 407 Width : 40 Height : 33 Effect : load @@ -617,14 +594,14 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 246 - y coordinate : 435 + y coordinate : 444 Width : 70 Height : 23 Effect : load @@ -647,14 +624,14 @@ Text tForecast4Val Text tMainTextAlt Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 184 - y coordinate : 249 + y coordinate : 262 Width : 105 Height : 41 Effect : load @@ -677,14 +654,14 @@ Text tMainTextAlt Text tMainIconAlt Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 44 - y coordinate : 260 + y coordinate : 273 Width : 100 Height : 65 Effect : load @@ -707,14 +684,14 @@ Text tMainIconAlt Text tMRIcon Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 182 - y coordinate : 304 + y coordinate : 317 Width : 40 Height : 34 Effect : load @@ -737,14 +714,14 @@ Text tMRIcon Text tMR Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 224 - y coordinate : 309 + y coordinate : 322 Width : 61 Height : 20 Effect : load @@ -767,14 +744,14 @@ Text tMR Text tNotifyHead Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 236 + y coordinate : 253 Width : 320 Height : 58 Effect : load @@ -797,14 +774,14 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 294 + y coordinate : 311 Width : 320 Height : 58 Effect : load @@ -825,6 +802,66 @@ Text tNotifyText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tIcon1 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 8 + y coordinate : 220 + Width : 33 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 282 + y coordinate : 220 + Width : 33 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -979,9 +1016,33 @@ Timer tmSerial vis tMainIconAlt,1 vis tMRIcon,1 vis tMR,1 + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -1135,7 +1196,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 1000 Enabled : yes diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 2f86fad2..42a6eb9a 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -62,6 +62,12 @@ Variable (string) tTmp Text : Max. Text Size: 50 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -82,16 +88,6 @@ Text tDate Text : Tuesday, 08. March 2022 Max. Text Size : 35 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Text tMainIcon Attributes Scope : local @@ -312,6 +308,26 @@ Text tNotifyText Text : Max. Text Size : 35 +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + Picture p0 Attributes Scope : local @@ -455,9 +471,33 @@ Timer tmSerial vis tMainIconAlt,1 vis tMRIcon,1 vis tMR,1 + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index c0d547bb..5e731448 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -826,7 +826,7 @@ Text tIcon1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 @@ -856,7 +856,7 @@ Text tIcon2 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 36a6c547..42a6eb9a 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -315,7 +315,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 5 Text tIcon2 @@ -325,7 +325,7 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 5 Picture p0