diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 57323526..2d787d2e 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 18:57:30.523092501 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:57:31.323112832 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 20:31:53.307593985 +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 18:57:30.523092501 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:57:31.323112832 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 20:31:53.311594033 +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 18:57:30.523092501 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:57:31.327112934 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 20:31:53.311594033 +0000 @@ -12,28 +12,307 @@ Events @@ -407,3 +407,214 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt // get Type spstr strCommand.txt,type1.txt,",",3 // get internal name +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 20:31:53.307593985 +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 +@@ -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,7 +165,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : ++ Text :  + Max. Text Size : 10 + + Text tForecast2 +@@ -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/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 30b9839f..40277be9 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 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 20:31:52.907589186 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 20:31:52.907589186 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -148,8 +148,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt { tmFlash.en=1 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 20:31:52.907589186 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -966,8 +966,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 20:31:52.907589186 +0000 @@ -242,12 +242,7 @@ Events @@ -1017,8 +1017,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-31 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 20:31:52.907589186 +0000 @@ -435,12 +435,7 @@ Events @@ -1116,8 +1116,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt { vis t5,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 20:31:52.907589186 +0000 @@ -329,12 +329,7 @@ Events @@ -1460,8 +1460,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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 18:57:30.523092501 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:57:30.927102768 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 20:31:52.907589186 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1480,3 +1480,214 @@ 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 20:31:52.507584386 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 20:31:52.907589186 +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 +@@ -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,7 +165,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : ++ Text :  + Max. Text Size : 10 + + Text tForecast2 +@@ -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/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 975a96e9..f7b959f5 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,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 pageStartup 19 Component(s) 150 Line(s) of event code @@ -38,10 +42,6 @@ cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code -screensaver - 29 Component(s) - 182 Line(s) of event code - 137 Unique line(s) of event code cardEntities 62 Component(s) 970 Line(s) of event code @@ -56,7 +56,7 @@ cardThermo 283 Unique line(s) of event code Total - 13 Page(s) - 351 Component(s) - 3612 Line(s) of event code - 1035 Unique line(s) of event code + 14 Page(s) + 355 Component(s) + 3637 Line(s) of event code + 1056 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index e732c10c..166cd04f 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/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 @@ -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 @@ -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 @@ -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 : 126 - y coordinate : 277 - Width : 72 - Height : 26 + x coordinate : 125 + y coordinate : 276 + Width : 71 + Height : 25 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 @@ -373,7 +353,7 @@ Text tF1Icon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -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 @@ -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 @@ -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 @@ -674,7 +654,7 @@ Text tF4Icon Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -709,6 +689,126 @@ Text tForecast4Val 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 : 104 + y coordinate : 210 + Width : 106 + Height : 42 + 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 : 0 + y coordinate : 221 + Width : 100 + Height : 66 + 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 : 101 + y coordinate : 266 + Width : 40 + Height : 35 + 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 : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMR + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 144 + y coordinate : 270 + Width : 62 + Height : 21 + 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 : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -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/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index e255db2c..b29d0047 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/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 @@ -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,7 +145,7 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text tForecast2 @@ -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") {