GNSS and GLOSS SKY reoport are now merged

Fixes Savannah bug #42407: wrong interpretation of NMEA messages for mixed
GPS/GLONASS recievers.

1 files changed, 0 insertions, 5 deletions

diff --git a/test/daemon/ch-4711.log.chk b/test/daemon/ch-4711.log.chk
index 4cfb65b7..b389a068 100644
--- a/test/daemon/ch-4711.log.chk
+++ b/test/daemon/ch-4711.log.chk
@@ -64,7 +64,6 @@ $GPGSV,4,1,14,03,50,217,,06,49,201,,09,10,068,,14,30,153,*74
 $GPGSV,4,2,14,18,43,068,,19,58,270,34,21,16,107,,22,76,110,*7E

 $GPGSV,4,3,14,26,42,127,,27,13,055,27,28,08,344,,33,11,238,*77

 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

-{"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":43,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":34,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":110,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":27,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false}]}

 $GLGSV,2,1,06,66,18,048,,67,72,050,31,75,16,358,37,82,47,171,*67

 $GLGSV,2,2,06,83,66,292,37,84,16,325,33*6A

 {"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":43,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":34,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":110,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":27,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false},{"PRN":66,"el":18,"az":48,"ss":0,"used":false},{"PRN":67,"el":72,"az":50,"ss":31,"used":true},{"PRN":75,"el":16,"az":358,"ss":37,"used":true},{"PRN":82,"el":47,"az":171,"ss":0,"used":false},{"PRN":83,"el":66,"az":292,"ss":37,"used":true},{"PRN":84,"el":16,"az":325,"ss":33,"used":true}]}

@@ -110,7 +109,6 @@ $GPGSV,4,1,14,03,50,217,,06,49,201,,09,10,068,,14,30,153,*74
 $GPGSV,4,2,14,18,43,068,,19,58,270,34,21,16,107,,22,76,110,*7E

 $GPGSV,4,3,14,26,42,127,,27,13,055,27,28,08,344,,33,11,238,*77

 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

-{"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":43,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":34,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":110,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":27,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false}]}

 $GLGSV,2,1,06,66,18,048,,67,72,050,31,75,16,358,37,82,47,171,*67

 $GLGSV,2,2,06,83,66,292,37,84,16,325,32*6B

 {"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":43,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":34,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":110,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":27,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false},{"PRN":66,"el":18,"az":48,"ss":0,"used":false},{"PRN":67,"el":72,"az":50,"ss":31,"used":true},{"PRN":75,"el":16,"az":358,"ss":37,"used":true},{"PRN":82,"el":47,"az":171,"ss":0,"used":false},{"PRN":83,"el":66,"az":292,"ss":37,"used":true},{"PRN":84,"el":16,"az":325,"ss":32,"used":true}]}

@@ -154,7 +152,6 @@ $GPGSV,4,1,14,03,50,217,,06,49,201,,09,10,068,,14,30,153,*74
 $GPGSV,4,2,14,18,42,068,,19,58,270,34,21,16,107,,22,76,109,*77

 $GPGSV,4,3,14,26,42,127,,27,13,055,26,28,08,344,,33,11,238,*76

 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

-{"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":42,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":34,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":109,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":26,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false}]}

 $GLGSV,2,1,06,66,18,048,,67,72,050,31,75,16,358,38,82,47,171,*68

 $GLGSV,2,2,06,83,66,291,37,84,17,325,34*6F

 {"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":42,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":34,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":109,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":26,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false},{"PRN":66,"el":18,"az":48,"ss":0,"used":false},{"PRN":67,"el":72,"az":50,"ss":31,"used":true},{"PRN":75,"el":16,"az":358,"ss":38,"used":true},{"PRN":82,"el":47,"az":171,"ss":0,"used":false},{"PRN":83,"el":66,"az":291,"ss":37,"used":true},{"PRN":84,"el":17,"az":325,"ss":34,"used":true}]}

@@ -200,7 +197,6 @@ $GPGSV,4,1,14,03,50,217,,06,49,201,,09,10,068,,14,30,153,*74
 $GPGSV,4,2,14,18,42,068,,19,58,270,36,21,16,107,,22,76,109,*75

 $GPGSV,4,3,14,26,42,127,,27,13,055,25,28,08,344,22,33,11,238,*75

 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

-{"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":42,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":36,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":109,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":25,"used":false},{"PRN":28,"el":8,"az":344,"ss":22,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false}]}

 $GLGSV,2,1,06,66,18,048,,67,72,050,32,75,16,358,39,82,47,171,*6A

 $GLGSV,2,2,06,83,66,291,37,84,17,325,34*6F

 {"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.90,"tdop":21.29,"hdop":1.80,"gdop":45.46,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":42,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":36,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":109,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":25,"used":false},{"PRN":28,"el":8,"az":344,"ss":22,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false},{"PRN":66,"el":18,"az":48,"ss":0,"used":false},{"PRN":67,"el":72,"az":50,"ss":32,"used":true},{"PRN":75,"el":16,"az":358,"ss":39,"used":true},{"PRN":82,"el":47,"az":171,"ss":0,"used":false},{"PRN":83,"el":66,"az":291,"ss":37,"used":true},{"PRN":84,"el":17,"az":325,"ss":34,"used":true}]}

@@ -240,7 +236,6 @@ $GPGSV,4,1,14,03,50,217,,06,49,201,,09,10,068,,14,30,153,*74
 $GPGSV,4,2,14,18,42,068,,19,58,270,,21,16,107,,22,76,109,*70

 $GPGSV,4,3,14,26,42,127,,27,13,055,,28,08,344,,33,11,238,*72

 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

-{"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.00,"tdop":21.29,"hdop":0.00,"gdop":45.46,"pdop":0.00,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":42,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":0,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":109,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":0,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false}]}

 $GLGSV,2,1,06,66,18,048,,67,72,050,,75,16,358,26,82,47,171,*65

 $GLGSV,2,2,06,83,66,291,,84,17,325,22*6C

 {"class":"SKY","xdop":14.63,"ydop":4.47,"vdop":0.00,"tdop":21.29,"hdop":0.00,"gdop":45.46,"pdop":0.00,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false},{"PRN":6,"el":49,"az":201,"ss":0,"used":false},{"PRN":9,"el":10,"az":68,"ss":0,"used":false},{"PRN":14,"el":30,"az":153,"ss":0,"used":false},{"PRN":18,"el":42,"az":68,"ss":0,"used":false},{"PRN":19,"el":58,"az":270,"ss":0,"used":false},{"PRN":21,"el":16,"az":107,"ss":0,"used":false},{"PRN":22,"el":76,"az":109,"ss":0,"used":false},{"PRN":26,"el":42,"az":127,"ss":0,"used":false},{"PRN":27,"el":13,"az":55,"ss":0,"used":false},{"PRN":28,"el":8,"az":344,"ss":0,"used":false},{"PRN":120,"el":11,"az":238,"ss":0,"used":false},{"PRN":124,"el":25,"az":199,"ss":0,"used":false},{"PRN":126,"el":25,"az":194,"ss":0,"used":false},{"PRN":66,"el":18,"az":48,"ss":0,"used":false},{"PRN":67,"el":72,"az":50,"ss":0,"used":false},{"PRN":75,"el":16,"az":358,"ss":26,"used":false},{"PRN":82,"el":47,"az":171,"ss":0,"used":false},{"PRN":83,"el":66,"az":291,"ss":0,"used":false},{"PRN":84,"el":17,"az":325,"ss":22,"used":false}]}