diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 4fb78bfd..6d612123 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -172,9 +172,9 @@ Text tEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 + x coordinate : 6 y coordinate : 155 - Width : 120 + Width : 140 Height : 30 Effect : load Effect Priority : 0 @@ -322,9 +322,9 @@ Text tEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 167 + x coordinate : 157 y coordinate : 155 - Width : 120 + Width : 140 Height : 30 Effect : load Effect Priority : 0 @@ -352,9 +352,9 @@ Text tEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 296 + x coordinate : 307 y coordinate : 155 - Width : 120 + Width : 140 Height : 30 Effect : load Effect Priority : 0 @@ -382,9 +382,9 @@ Text tEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 + x coordinate : 6 y coordinate : 274 - Width : 120 + Width : 140 Height : 30 Effect : load Effect Priority : 0 @@ -412,9 +412,9 @@ Text tEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 167 + x coordinate : 157 y coordinate : 274 - Width : 120 + Width : 140 Height : 30 Effect : load Effect Priority : 0 @@ -442,9 +442,9 @@ Text tEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 296 + x coordinate : 307 y coordinate : 274 - Width : 120 + Width : 140 Height : 30 Effect : load Effect Priority : 0 @@ -595,7 +595,7 @@ Button bEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 53 + x coordinate : 36 y coordinate : 75 Width : 80 Height : 80 @@ -725,7 +725,7 @@ Button bEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 316 + x coordinate : 337 y coordinate : 75 Width : 80 Height : 80 @@ -790,7 +790,7 @@ Button bEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 53 + x coordinate : 36 y coordinate : 194 Width : 80 Height : 80 @@ -920,7 +920,7 @@ Button bEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 316 + x coordinate : 337 y coordinate : 194 Width : 80 Height : 80 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 83e39927..e03c53d4 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -314,14 +314,11 @@ Text t2 Events Touch Press Event - // event,1,tHeading,tEntityName,1,up + // event,buttonPress2,entn,media-next //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," + tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="1,media-next" + tSend.txt+="media-next" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -366,14 +363,11 @@ Text tPlayPause Events Touch Press Event - // event,1,tHeading,tEntityName,1,up + // event,buttonPress2,entn,media-pause //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," + tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="1,media-pause" + tSend.txt+="media-pause" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -418,14 +412,11 @@ Text t0 Events Touch Press Event - // event,1,tHeading,tEntityName,1,up + // event,buttonPress2,entn,media-back //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," + tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="1,media-back" + tSend.txt+="media-back" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -512,14 +503,9 @@ Slider hVolume Events Touch Release Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,positionSlider,50 + // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,volumeSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," covx hVolume.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 9329d885..ee9da513 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -10,14 +10,14 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code -cardMedia - 22 Component(s) - 210 Line(s) of event code - 116 Unique line(s) of event code popupNotify 17 Component(s) 179 Line(s) of event code 118 Unique line(s) of event code +cardMedia + 22 Component(s) + 200 Line(s) of event code + 115 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code @@ -42,6 +42,10 @@ screensaver 25 Component(s) 173 Line(s) of event code 124 Unique line(s) of event code +cardGrid + 39 Component(s) + 406 Line(s) of event code + 224 Unique line(s) of event code cardThermo 42 Component(s) 438 Line(s) of event code @@ -50,10 +54,6 @@ cardEntities 54 Component(s) 808 Line(s) of event code 320 Unique line(s) of event code -cardGrid - 39 Component(s) - 406 Line(s) of event code - 224 Unique line(s) of event code cardAlarm 35 Component(s) 259 Line(s) of event code @@ -62,5 +62,5 @@ cardAlarm Total 14 Page(s) 350 Component(s) - 3292 Line(s) of event code + 3282 Line(s) of event code 842 Unique line(s) of event code