diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5534ffcc..4fa322ec 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-03-31 22:04:16.215514158 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:04:17.295513600 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:17:44.138561902 +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-03-31 22:04:16.215514158 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:04:17.295513600 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:17:44.138561902 +0000 @@ -1125,33 +1125,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -47,8 +47,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-03-31 22:04:16.215514158 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:04:17.299513598 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:17:44.138561902 +0000 @@ -12,28 +12,307 @@ Events @@ -408,8 +408,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-03-31 22:04:16.211514160 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:04:17.295513600 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:17:44.138561902 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -420,8 +420,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-03-31 22:04:16.215514158 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:04:17.295513600 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:17:44.138561902 +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 38fc7f3a..b80681f9 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-03-31 22:04:16.211514160 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:04:16.731513892 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:17:43.670556711 +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-03-31 22:04:16.215514158 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:04:16.731513892 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:17:43.670556711 +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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 22:04:16.215514158 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 22:04:16.735513890 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 22:17:43.218551697 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 22:17:43.670556711 +0000 @@ -643,53 +643,26 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -1111,8 +1111,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-31 22:04:16.211514160 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:04:16.731513892 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:17:43.670556711 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -1123,8 +1123,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Text tIcons Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 22:04:16.215514158 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:04:16.731513892 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:17:43.214551653 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:17:43.670556711 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1143,225 +1143,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.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-03-31 22:04:16.215514158 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 22:04:16.731513892 +0000 -@@ -30,6 +30,26 @@ - vis tSend,0 - //page open event - // clear weather elements, to keep example content in HMI -+ tMainIcon.txt="" -+ tMainText.txt="" -+ tForecast1.txt="" -+ tF1Icon.txt="" -+ tForecast1Val.txt="" -+ tForecast2.txt="" -+ tF2Icon.txt="" -+ tForecast2Val.txt="" -+ //tSend.txt="event,screensaverOpen" -+ //send calc crc -+ //btlen tSend.txt,sys0 -+ //crcrest 1,0xffff // reset CRC -+ //crcputh 55 bb -+ //crcputs sys0,1 -+ //crcputs tSend.txt,0 -+ //send cmd -+ //printh 55 bb -+ //prints sys0,2 -+ //prints tSend.txt,0 -+ //prints crcval,2 - - Variable (string) strCommand - Attributes -@@ -86,7 +106,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : Tuesday, 08. March 2022 -- Max. Text Size : 35 -+ Max. Text Size : 30 - - Text tSend - Attributes -@@ -105,7 +125,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text :  - Max. Text Size : 10 - - Text tMainText -@@ -115,7 +135,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : 2,3 °C - Max. Text Size : 10 - - Text tForecast1 -@@ -125,7 +145,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : Mi - Max. Text Size : 10 - - Text tForecast1Val -@@ -135,7 +155,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : 9,3 °C - Max. Text Size : 10 - - Text tF1Icon -@@ -145,8 +165,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -- Max. Text Size : 10 -+ Text :  -+ Max. Text Size : 4 - - Text tForecast2 - Attributes -@@ -155,7 +175,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : Do - Max. Text Size : 10 - - Text tF2Icon -@@ -165,7 +185,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text :  - Max. Text Size : 10 - - Text tForecast2Val -@@ -175,7 +195,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : 11,9 °C - Max. Text Size : 10 - - Text t10 -@@ -246,49 +266,9 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 5 -- --Text tForecast4Val -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : - Max. Text Size : 10 - --Text tMainTextAlt -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 10 -- --Text tMainIconAlt -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 10 -- --Text tMRIcon -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 10 -- --Text tMR -+Text tForecast4Val - Attributes - Scope : local - Dragging : 0 -@@ -393,20 +373,12 @@ - } - if(tInstruction.txt=="weatherUpdate") - { -- vis tMainIcon,1 -- vis tMainIconAlt,0 -- vis tMainText,1 -- vis tMainTextAlt,0 -- vis tMRIcon,0 -- vis tMR,0 - //tMainIcon - spstr strCommand.txt,tTmp.txt,"?",1 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 -- tMainIconAlt.txt=tMainIcon.txt - //tMainText - spstr strCommand.txt,tMainText.txt,"?",2 -- tMainTextAlt.txt=tMainText.txt - //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 - //tF1Icon -@@ -439,36 +411,6 @@ - substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 - //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"?",14 -- //alternative layout -- //tMRIcon -- spstr strCommand.txt,tTmp.txt,"?",15 -- covx tTmp.txt,sys0,0,0 -- substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 -- if(tTmp.txt!="") -- { -- //value for tMRIcon, activate alternative layout -- vis tMainIcon,0 -- vis tMainText,0 -- vis tMainTextAlt,1 -- 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 -- } -- //tMR -- spstr strCommand.txt,tMR.txt,"?",16 - } - if(tInstruction.txt=="pageType") - { 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 921a3f5b..39d9a2fa 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 @@ -14,10 +14,6 @@ popupNotify 17 Component(s) 178 Line(s) of event code 117 Unique line(s) of event code -screensaver - 29 Component(s) - 182 Line(s) of event code - 137 Unique line(s) of event code cardMedia 30 Component(s) 331 Line(s) of event code @@ -34,6 +30,10 @@ popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code +screensaver + 33 Component(s) + 207 Line(s) of event code + 159 Unique line(s) of event code popupLight 27 Component(s) 322 Line(s) of event code @@ -57,6 +57,6 @@ cardThermo Total 13 Page(s) - 375 Component(s) - 3975 Line(s) of event code - 1065 Unique line(s) of event code + 379 Component(s) + 4000 Line(s) of event code + 1086 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 09fd1724..a43607d2 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -38,26 +38,6 @@ Page screensaver vis tSend,0 //page open event // clear weather elements, to keep example content in HMI - tMainIcon.txt="" - tMainText.txt="" - tForecast1.txt="" - tF1Icon.txt="" - tForecast1Val.txt="" - tForecast2.txt="" - tF2Icon.txt="" - tForecast2Val.txt="" - //tSend.txt="event,screensaverOpen" - //send calc crc - //btlen tSend.txt,sys0 - //crcrest 1,0xffff // reset CRC - //crcputh 55 bb - //crcputs sys0,1 - //crcputs tSend.txt,0 - //send cmd - //printh 55 bb - //prints sys0,2 - //prints tSend.txt,0 - //prints crcval,2 Variable (string) strCommand Attributes @@ -87,9 +67,9 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 155 - y coordinate : 445 - Width : 27 + x coordinate : 260 + y coordinate : 446 + Width : 26 Height : 30 Effect : load Effect Priority : 0 @@ -117,8 +97,8 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 196 - y coordinate : 445 + x coordinate : 293 + y coordinate : 447 Width : 25 Height : 30 Effect : load @@ -178,9 +158,9 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 183 + y coordinate : 194 Width : 320 - Height : 38 + Height : 36 Effect : load Effect Priority : 0 Effect Time : 300 @@ -194,7 +174,7 @@ Text tDate Vertical Alignment : center Input Type : character Text : Tuesday, 08. March 2022 - Max. Text Size : 30 + Max. Text Size : 35 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -207,9 +187,9 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 280 - y coordinate : 446 - Width : 29 + x coordinate : 19 + y coordinate : 450 + Width : 27 Height : 30 Effect : load Effect Priority : 0 @@ -237,10 +217,10 @@ Text tMainIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 38 - y coordinate : 234 + x coordinate : 44 + y coordinate : 252 Width : 70 - Height : 66 + Height : 65 Effect : load Effect Priority : 0 Effect Time : 300 @@ -253,7 +233,7 @@ Text tMainIcon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -267,10 +247,10 @@ Text tMainText Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 19 - y coordinate : 299 + x coordinate : 25 + y coordinate : 316 Width : 110 - Height : 43 + Height : 42 Effect : load Effect Priority : 0 Effect Time : 300 @@ -283,7 +263,7 @@ Text tMainText Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 2,3 °C + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -297,10 +277,10 @@ Text tForecast1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 140 - y coordinate : 242 - Width : 72 - Height : 26 + x coordinate : 146 + y coordinate : 260 + Width : 71 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -313,7 +293,7 @@ Text tForecast1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : Mi + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -327,10 +307,10 @@ Text tForecast1Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 138 - y coordinate : 309 - Width : 72 - Height : 26 + x coordinate : 143 + y coordinate : 325 + Width : 70 + Height : 24 Effect : load Effect Priority : 0 Effect Time : 300 @@ -343,7 +323,7 @@ Text tForecast1Val Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 9,3 °C + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -357,10 +337,10 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 158 - y coordinate : 271 + x coordinate : 164 + y coordinate : 288 Width : 40 - Height : 35 + Height : 34 Effect : load Effect Priority : 0 Effect Time : 300 @@ -373,8 +353,8 @@ Text tF1Icon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  - Max. Text Size : 4 + Text : + Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -387,10 +367,10 @@ Text tForecast2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 224 - y coordinate : 242 - Width : 72 - Height : 25 + x coordinate : 230 + y coordinate : 260 + Width : 71 + Height : 24 Effect : load Effect Priority : 0 Effect Time : 300 @@ -403,7 +383,7 @@ Text tForecast2 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : Do + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -417,10 +397,10 @@ Text tF2Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 240 - y coordinate : 271 + x coordinate : 246 + y coordinate : 288 Width : 40 - Height : 35 + Height : 34 Effect : load Effect Priority : 0 Effect Time : 300 @@ -433,7 +413,7 @@ Text tF2Icon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -447,10 +427,10 @@ Text tForecast2Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 224 - y coordinate : 309 - Width : 72 - Height : 25 + x coordinate : 230 + y coordinate : 326 + Width : 71 + Height : 24 Effect : load Effect Priority : 0 Effect Time : 300 @@ -463,7 +443,7 @@ Text tForecast2Val Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 11,9 °C + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -478,8 +458,8 @@ Text t10 Send Component ID : disabled Opacity : 127 x coordinate : 46 - y coordinate : 227 - Width : 230 + y coordinate : 240 + Width : 225 Height : 2 Effect : load Effect Priority : 0 @@ -508,9 +488,9 @@ Text tAMPM Send Component ID : disabled Opacity : 127 x coordinate : 105 - y coordinate : 126 - Width : 104 - Height : 57 + y coordinate : 132 + Width : 103 + Height : 56 Effect : load Effect Priority : 0 Effect Time : 300 @@ -537,10 +517,10 @@ Text tForecast3Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 81 - y coordinate : 417 - Width : 71 - Height : 25 + x coordinate : 82 + y coordinate : 435 + Width : 70 + Height : 23 Effect : load Effect Priority : 0 Effect Time : 300 @@ -567,10 +547,10 @@ Text tF3Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 98 - y coordinate : 379 + x coordinate : 99 + y coordinate : 397 Width : 40 - Height : 35 + Height : 33 Effect : load Effect Priority : 0 Effect Time : 300 @@ -597,10 +577,10 @@ Text tForecast3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 82 - y coordinate : 350 - Width : 72 - Height : 25 + x coordinate : 83 + y coordinate : 370 + Width : 70 + Height : 23 Effect : load Effect Priority : 0 Effect Time : 300 @@ -627,10 +607,10 @@ Text tForecast4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 163 - y coordinate : 350 - Width : 72 - Height : 25 + x coordinate : 164 + y coordinate : 370 + Width : 70 + Height : 23 Effect : load Effect Priority : 0 Effect Time : 300 @@ -657,10 +637,130 @@ Text tF4Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 179 - y coordinate : 379 + x coordinate : 181 + y coordinate : 397 Width : 40 - Height : 35 + Height : 33 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tForecast4Val + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 164 + y coordinate : 435 + Width : 70 + Height : 23 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMainTextAlt + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 122 + y coordinate : 260 + Width : 105 + Height : 41 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMainIconAlt + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 19 + y coordinate : 271 + Width : 100 + Height : 65 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMRIcon + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 120 + y coordinate : 315 + Width : 40 + Height : 34 Effect : load Effect Priority : 0 Effect Time : 300 @@ -679,18 +779,18 @@ Text tF4Icon Horizontal Spacing : 0 Vertical Spacing : 0 -Text tForecast4Val +Text tMR Attributes - ID : 26 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 163 - y coordinate : 417 - Width : 72 - Height : 25 + x coordinate : 162 + y coordinate : 320 + Width : 61 + Height : 20 Effect : load Effect Priority : 0 Effect Time : 300 @@ -700,7 +800,7 @@ Text tForecast4Val Font ID : 0 Back. Color : 0 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : @@ -815,12 +915,20 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate") { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMRIcon,0 + vis tMR,0 //tMainIcon spstr strCommand.txt,tTmp.txt,"?",1 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 + tMainIconAlt.txt=tMainIcon.txt //tMainText spstr strCommand.txt,tMainText.txt,"?",2 + tMainTextAlt.txt=tMainText.txt //tForecast1 spstr strCommand.txt,tForecast1.txt,"?",3 //tF1Icon @@ -853,6 +961,36 @@ Timer tmSerial substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val spstr strCommand.txt,tForecast4Val.txt,"?",14 + //alternative layout + //tMRIcon + spstr strCommand.txt,tTmp.txt,"?",15 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 + if(tTmp.txt!="") + { + //value for tMRIcon, activate alternative layout + vis tMainIcon,0 + vis tMainText,0 + vis tMainTextAlt,1 + 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 + } + //tMR + spstr strCommand.txt,tMR.txt,"?",16 } if(tInstruction.txt=="pageType") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index e85898d3..f7803de6 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -30,26 +30,6 @@ Page screensaver vis tSend,0 //page open event // clear weather elements, to keep example content in HMI - tMainIcon.txt="" - tMainText.txt="" - tForecast1.txt="" - tF1Icon.txt="" - tForecast1Val.txt="" - tForecast2.txt="" - tF2Icon.txt="" - tForecast2Val.txt="" - //tSend.txt="event,screensaverOpen" - //send calc crc - //btlen tSend.txt,sys0 - //crcrest 1,0xffff // reset CRC - //crcputh 55 bb - //crcputs sys0,1 - //crcputs tSend.txt,0 - //send cmd - //printh 55 bb - //prints sys0,2 - //prints tSend.txt,0 - //prints crcval,2 Variable (string) strCommand Attributes @@ -106,7 +86,7 @@ Text tDate Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 30 + Max. Text Size : 35 Text tSend Attributes @@ -125,7 +105,7 @@ Text tMainIcon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text tMainText @@ -135,7 +115,7 @@ Text tMainText Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 2,3 °C + Text : Max. Text Size : 10 Text tForecast1 @@ -145,7 +125,7 @@ Text tForecast1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Mi + Text : Max. Text Size : 10 Text tForecast1Val @@ -155,7 +135,7 @@ Text tForecast1Val Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 9,3 °C + Text : Max. Text Size : 10 Text tF1Icon @@ -165,8 +145,8 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 4 + Text : + Max. Text Size : 10 Text tForecast2 Attributes @@ -175,7 +155,7 @@ Text tForecast2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Do + Text : Max. Text Size : 10 Text tF2Icon @@ -185,7 +165,7 @@ Text tF2Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text tForecast2Val @@ -195,7 +175,7 @@ Text tForecast2Val Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 11,9 °C + Text : Max. Text Size : 10 Text t10 @@ -266,7 +246,7 @@ Text tF4Icon Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 5 Text tForecast4Val Attributes @@ -278,6 +258,46 @@ Text tForecast4Val Text : Max. Text Size : 10 +Text tMainTextAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tMainIconAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tMRIcon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tMR + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + Picture p0 Attributes Scope : local @@ -373,12 +393,20 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate") { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMRIcon,0 + vis tMR,0 //tMainIcon spstr strCommand.txt,tTmp.txt,"?",1 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 + tMainIconAlt.txt=tMainIcon.txt //tMainText spstr strCommand.txt,tMainText.txt,"?",2 + tMainTextAlt.txt=tMainText.txt //tForecast1 spstr strCommand.txt,tForecast1.txt,"?",3 //tF1Icon @@ -411,6 +439,36 @@ Timer tmSerial substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val spstr strCommand.txt,tForecast4Val.txt,"?",14 + //alternative layout + //tMRIcon + spstr strCommand.txt,tTmp.txt,"?",15 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 + if(tTmp.txt!="") + { + //value for tMRIcon, activate alternative layout + vis tMainIcon,0 + vis tMainText,0 + vis tMainTextAlt,1 + 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 + } + //tMR + spstr strCommand.txt,tMR.txt,"?",16 } if(tInstruction.txt=="pageType") {