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, 9 deletions

diff --git a/test/daemon/bu353-glonass.log.chk b/test/daemon/bu353-glonass.log.chk
index d429e792..808b7d34 100644
--- a/test/daemon/bu353-glonass.log.chk
+++ b/test/daemon/bu353-glonass.log.chk
@@ -58,7 +58,6 @@ $GPZDA,081410.000,26,05,2014,,*5C
 $GPGSV,3,1,12,08,88,068,,07,59,081,23,28,41,187,,05,40,260,*79

 $GPGSV,3,2,12,26,36,297,,03,27,059,15,19,24,074,18,27,19,040,23*74

 $GPGSV,3,3,12,10,19,202,,13,15,129,20,21,06,346,,15,04,306,*7C

-{"class":"SKY","vdop":1.00,"hdop":2.56,"pdop":2.75,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":23,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":36,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":15,"used":false},{"PRN":19,"el":24,"az":74,"ss":18,"used":false},{"PRN":27,"el":19,"az":40,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":20,"used":false},{"PRN":21,"el":6,"az":346,"ss":0,"used":false},{"PRN":15,"el":4,"az":306,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,23,87,19,015,12,68,07,177,*69

 $GLGSV,3,3,10,71,06,339,,81,03,117,26*64

@@ -96,7 +95,6 @@ $GPZDA,081415.000,26,05,2014,,*59
 $GPGSV,3,1,12,08,88,068,,07,59,081,24,28,41,187,,05,40,260,*7E

 $GPGSV,3,2,12,26,36,297,,03,27,059,14,19,24,073,16,27,19,040,23*7C

 $GPGSV,3,3,12,10,19,202,,13,15,129,23,21,06,346,,15,04,307,*7E

-{"class":"SKY","vdop":1.00,"hdop":2.56,"pdop":2.75,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":24,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":36,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":14,"used":false},{"PRN":19,"el":24,"az":73,"ss":16,"used":false},{"PRN":27,"el":19,"az":40,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":23,"used":false},{"PRN":21,"el":6,"az":346,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,23,87,19,015,17,68,07,177,*6C

 $GLGSV,3,3,10,71,06,339,,81,03,117,27*65

@@ -133,7 +131,6 @@ $GPZDA,081420.000,26,05,2014,,*5F
 $GPGSV,3,1,12,08,88,068,,07,59,081,23,28,41,187,,05,40,260,*79

 $GPGSV,3,2,12,26,36,297,,03,27,059,14,19,24,073,14,27,19,040,23*7E

 $GPGSV,3,3,12,10,19,202,,13,15,129,23,21,06,345,,15,04,307,*7D

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":23,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":36,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":14,"used":false},{"PRN":19,"el":24,"az":73,"ss":14,"used":false},{"PRN":27,"el":19,"az":40,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":23,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,24,87,19,015,17,68,07,177,*6B

 $GLGSV,3,3,10,71,06,339,,81,03,117,26*64

@@ -166,7 +163,6 @@ $GPZDA,081425.000,26,05,2014,,*5A
 $GPGSV,3,1,12,08,88,068,,07,59,081,23,28,41,187,,05,40,260,*79

 $GPGSV,3,2,12,26,37,297,,03,27,059,14,19,24,073,15,27,19,039,22*71

 $GPGSV,3,3,12,10,19,202,,13,15,129,23,21,06,345,,15,04,307,*7D

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":23,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":37,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":14,"used":false},{"PRN":19,"el":24,"az":73,"ss":15,"used":false},{"PRN":27,"el":19,"az":39,"ss":22,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":23,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,25,87,19,015,16,68,07,177,*6B

 $GLGSV,3,3,10,71,06,339,,81,03,117,27*65

@@ -199,7 +195,6 @@ $GPZDA,081430.000,26,05,2014,,*5E
 $GPGSV,3,1,12,08,88,068,,07,59,081,21,28,41,187,,05,40,260,*7B

 $GPGSV,3,2,12,26,37,297,,03,27,059,13,19,24,073,19,27,19,039,23*7B

 $GPGSV,3,3,12,10,19,202,,13,15,129,22,21,06,345,,15,04,307,*7C

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":21,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":37,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":13,"used":false},{"PRN":19,"el":24,"az":73,"ss":19,"used":false},{"PRN":27,"el":19,"az":39,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":22,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,24,87,19,015,16,68,07,177,*6A

 $GLGSV,3,3,10,71,06,339,,81,03,117,27*65

@@ -232,7 +227,6 @@ $GPZDA,081435.000,26,05,2014,,*5B
 $GPGSV,3,1,12,08,88,068,,07,59,081,20,28,41,187,,05,40,260,*7A

 $GPGSV,3,2,12,26,37,297,,03,27,059,15,19,24,073,18,27,19,039,23*7C

 $GPGSV,3,3,12,10,19,202,,13,15,129,22,21,06,345,,15,04,307,*7C

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":20,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":37,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":15,"used":false},{"PRN":19,"el":24,"az":73,"ss":18,"used":false},{"PRN":27,"el":19,"az":39,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":22,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,23,87,19,015,16,68,07,177,*6D

 $GLGSV,3,3,10,71,06,339,,81,03,117,27*65

@@ -265,7 +259,6 @@ $GPZDA,081440.000,26,05,2014,,*59
 $GPGSV,3,1,12,08,88,068,,07,59,081,20,28,41,187,,05,40,260,*7A

 $GPGSV,3,2,12,26,37,297,,03,27,059,15,19,24,073,18,27,19,039,23*7C

 $GPGSV,3,3,12,10,19,202,,13,15,129,22,21,06,345,,15,04,307,*7C

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":20,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":37,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":15,"used":false},{"PRN":19,"el":24,"az":73,"ss":18,"used":false},{"PRN":27,"el":19,"az":39,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":22,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,21,87,19,015,16,68,07,177,*6F

 $GLGSV,3,3,10,71,06,339,,81,03,117,28*6A

@@ -298,7 +291,6 @@ $GPZDA,081445.000,26,05,2014,,*5C
 $GPGSV,3,1,12,08,88,068,,07,59,081,21,28,41,187,,05,40,260,*7B

 $GPGSV,3,2,12,26,37,297,,03,27,059,14,19,24,073,17,27,19,039,23*72

 $GPGSV,3,3,12,10,19,202,,13,15,129,23,21,06,345,,15,04,307,*7D

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":21,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":37,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":14,"used":false},{"PRN":19,"el":24,"az":73,"ss":17,"used":false},{"PRN":27,"el":19,"az":39,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":23,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,19,87,19,015,14,68,07,177,*66

 $GLGSV,3,3,10,71,06,339,,81,03,117,28*6A

@@ -331,7 +323,6 @@ $GPZDA,081450.000,26,05,2014,,*58
 $GPGSV,3,1,12,08,88,068,,07,59,081,20,28,41,187,,05,40,260,*7A

 $GPGSV,3,2,12,26,37,297,,03,27,059,16,19,24,073,15,27,19,039,23*72

 $GPGSV,3,3,12,10,19,202,,13,15,129,21,21,06,345,,15,04,307,*7F

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":8,"el":88,"az":68,"ss":0,"used":false},{"PRN":7,"el":59,"az":81,"ss":20,"used":false},{"PRN":28,"el":41,"az":187,"ss":0,"used":false},{"PRN":5,"el":40,"az":260,"ss":0,"used":false},{"PRN":26,"el":37,"az":297,"ss":0,"used":false},{"PRN":3,"el":27,"az":59,"ss":16,"used":false},{"PRN":19,"el":24,"az":73,"ss":15,"used":false},{"PRN":27,"el":19,"az":39,"ss":23,"used":false},{"PRN":10,"el":19,"az":202,"ss":0,"used":false},{"PRN":13,"el":15,"az":129,"ss":21,"used":false},{"PRN":21,"el":6,"az":345,"ss":0,"used":false},{"PRN":15,"el":4,"az":307,"ss":0,"used":false}]}

 $GLGSV,3,1,10,79,81,336,,69,50,211,,70,47,307,,78,33,058,*6D

 $GLGSV,3,2,10,80,30,251,,88,24,068,18,87,19,015,11,68,07,177,*62

 $GLGSV,3,3,10,71,06,339,,81,03,117,27*65