diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index d0e2f3d2..ddd41c38 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -32,7 +32,7 @@ Variable (string) strCommand ID : 7 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes @@ -41,6 +41,19 @@ Variable (string) entn Text : Max. Text Size: 50 +Variable (string) vaSpeakerList + Attributes + ID : 27 + Scope : local + Text : + Max. Text Size: 200 + +Variable (int32) vaSpeakerPos + Attributes + ID : 28 + Scope: local + Value: 0 + Text tSend Attributes ID : 2 @@ -52,7 +65,7 @@ Text tSend x coordinate : 0 y coordinate : 0 Width : 230 - Height : 23 + Height : 15 Effect : load Effect Priority : 0 Effect Time : 300 @@ -65,8 +78,8 @@ Text tSend Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : newtxt - Max. Text Size : 100 + Text : + Max. Text Size : 200 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -79,9 +92,9 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 - y coordinate : 277 - Width : 34 + x coordinate : 450 + y coordinate : 145 + Width : 27 Height : 30 Effect : load Effect Priority : 0 @@ -109,10 +122,10 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 290 + x coordinate : 296 + y coordinate : 0 Width : 100 - Height : 30 + Height : 20 Effect : load Effect Priority : 0 Effect Time : 300 @@ -139,9 +152,9 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 99 - y coordinate : 290 - Width : 39 + x coordinate : 449 + y coordinate : 187 + Width : 30 Height : 30 Effect : load Effect Priority : 0 @@ -260,7 +273,7 @@ Text t2 Send Component ID : disabled Opacity : 127 x coordinate : 314 - y coordinate : 159 + y coordinate : 145 Width : 50 Height : 50 Effect : load @@ -309,7 +322,7 @@ Text tPlayPause Send Component ID : disabled Opacity : 127 x coordinate : 203 - y coordinate : 159 + y coordinate : 145 Width : 50 Height : 50 Effect : load @@ -358,7 +371,7 @@ Text t0 Send Component ID : disabled Opacity : 127 x coordinate : 92 - y coordinate : 159 + y coordinate : 145 Width : 50 Height : 50 Effect : load @@ -437,7 +450,7 @@ Text t1 Send Component ID : disabled Opacity : 127 x coordinate : 5 - y coordinate : 222 + y coordinate : 201 Width : 50 Height : 50 Effect : load @@ -487,7 +500,7 @@ Text t3 Send Component ID : disabled Opacity : 127 x coordinate : 397 - y coordinate : 222 + y coordinate : 201 Width : 50 Height : 50 Effect : load @@ -528,6 +541,127 @@ Text t3 prints tSend.txt,0 prints crcval,2 +Text t4 + Attributes + ID : 24 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 21 + y coordinate : 262 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 6371 + Font Color : 50712 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tSpeaker + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 90 + y coordinate : 260 + Width : 267 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + // event,buttonPress2,entn,media-next + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="speaker-sel,"+tSpeaker.txt + //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 + +Text t6 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 381 + y coordinate : 262 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 6371 + Font Color : 50712 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //speaker + tSpeaker.pco=65535 + spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val + vaSpeakerPos.val+=1 + if(tSpeaker.txt=="") + { + vaSpeakerPos.val=0 + spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val + } + Picture p0 Attributes ID : 1 @@ -554,7 +688,7 @@ Slider hVolume Send Component ID : disabled Opacity : 127 x coordinate : 59 - y coordinate : 227 + y coordinate : 206 Width : 335 Height : 43 Effect : load @@ -759,6 +893,22 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"|",7 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 + //speaker current + spstr strCommand.txt,tSpeaker.txt,"|",8 + if(tSpeaker.txt!="") + { + tSpeaker.pco=1374 + }else + { + tSpeaker.pco=65535 + } + //speaker list + spstr strCommand.txt,vaSpeakerList.txt,"|",9 + if(vaSpeakerList.txt=="") + { + vis t6,0 + } + vaSpeakerPos.val=0 } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index f0957eee..270528ea 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -22,10 +22,6 @@ popupNotify 17 Component(s) 179 Line(s) of event code 118 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code cardAlarm 35 Component(s) 253 Line(s) of event code @@ -34,6 +30,10 @@ popupLight 27 Component(s) 323 Line(s) of event code 173 Unique line(s) of event code +screensaver + 29 Component(s) + 176 Line(s) of event code + 127 Unique line(s) of event code cardGrid 39 Component(s) 378 Line(s) of event code @@ -42,21 +42,21 @@ cardThermo 42 Component(s) 406 Line(s) of event code 218 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code cardEntities 54 Component(s) 752 Line(s) of event code 330 Unique line(s) of event code cardMedia - 24 Component(s) - 222 Line(s) of event code - 116 Unique line(s) of event code -screensaver - 26 Component(s) - 176 Line(s) of event code - 127 Unique line(s) of event code + 29 Component(s) + 256 Line(s) of event code + 132 Unique line(s) of event code Total 13 Page(s) - 334 Component(s) - 3089 Line(s) of event code - 817 Unique line(s) of event code + 342 Component(s) + 3123 Line(s) of event code + 832 Unique line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index c7c96d7d..aee5187b 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 19 + Text : 20 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 137ede1c..a8eb349c 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -278,9 +278,9 @@ Text tMainIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 6 + x coordinate : 5 y coordinate : 223 - Width : 100 + Width : 70 Height : 66 Effect : load Effect Priority : 0 @@ -308,7 +308,7 @@ Text tMainText Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 114 + x coordinate : 81 y coordinate : 214 Width : 110 Height : 43 @@ -338,7 +338,7 @@ Text tMRIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 115 + x coordinate : 83 y coordinate : 268 Width : 40 Height : 35 @@ -368,7 +368,7 @@ Text tMR Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 157 + x coordinate : 124 y coordinate : 275 Width : 67 Height : 22 @@ -398,9 +398,9 @@ Text tForecast1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 228 + x coordinate : 207 y coordinate : 210 - Width : 108 + Width : 72 Height : 26 Effect : load Effect Priority : 0 @@ -428,9 +428,9 @@ Text tForecast1Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 228 + x coordinate : 205 y coordinate : 277 - Width : 108 + Width : 72 Height : 26 Effect : load Effect Priority : 0 @@ -458,7 +458,7 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 262 + x coordinate : 225 y coordinate : 239 Width : 40 Height : 35 @@ -488,9 +488,9 @@ Text tForecast2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 341 + x coordinate : 291 y coordinate : 210 - Width : 107 + Width : 72 Height : 25 Effect : load Effect Priority : 0 @@ -518,7 +518,7 @@ Text tF2Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 375 + x coordinate : 307 y coordinate : 238 Width : 40 Height : 33 @@ -548,9 +548,9 @@ Text tForecast2Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 341 + x coordinate : 291 y coordinate : 277 - Width : 107 + Width : 72 Height : 25 Effect : load Effect Priority : 0 @@ -630,6 +630,96 @@ Text tAMPM Horizontal Spacing : 0 Vertical Spacing : 0 +Text t0 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 375 + y coordinate : 277 + Width : 72 + Height : 25 + 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 : 11,9 °C + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 391 + y coordinate : 238 + Width : 40 + 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 : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 375 + y coordinate : 210 + Width : 72 + Height : 25 + 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 : Do + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1