Accumulate GNSS+GLONASS satelite reports.

This isn't ideal. Wgen a GPS emits both we get two SKY reports per cycle,
with the second one cumulative.

1 files changed, 6 insertions, 6 deletions

diff --git a/test/daemon/ch-4711.log.chk b/test/daemon/ch-4711.log.chk
index 185bc24d..4cfb65b7 100644
--- a/test/daemon/ch-4711.log.chk
+++ b/test/daemon/ch-4711.log.chk
@@ -22,7 +22,7 @@ $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":35,"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,38,82,47,171,*68

 $GLGSV,2,2,06,83,66,292,37,84,16,325,34*6D

-{"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":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":292,"ss":37,"used":true},{"PRN":84,"el":16,"az":325,"ss":34,"used":true}]}

+{"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":35,"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":38,"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":34,"used":true}]}

 $GNGSA,A,2,19,27,,,,,,,,,,,02.1,01.8,00.9*13

 $GNGSA,A,2,67,84,83,75,,,,,,,,,02.1,01.8,00.9*1A

 $GNGBS,135629.997,17.2,16.9,1.0,,,,*69

@@ -67,7 +67,7 @@ $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":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}]}

+{"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}]}

 $GNGSA,A,2,19,27,,,,,,,,,,,02.1,01.8,00.9*13

 $GNGSA,A,2,67,84,83,75,,,,,,,,,02.1,01.8,00.9*1A

 $GNGGA,135636.997,5543.0326,N,03724.7196,E,1,06,01.8,165.6,M,14.6,M,,*72

@@ -113,7 +113,7 @@ $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":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}]}

+{"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}]}

 $GNGSA,A,2,19,27,,,,,,,,,,,02.1,01.8,00.9*13

 $GNGSA,A,2,67,84,83,75,,,,,,,,,02.1,01.8,00.9*1A

 $GNGGA,135642.997,5543.0327,N,03724.7197,E,1,06,01.8,165.6,M,14.6,M,,*71

@@ -157,7 +157,7 @@ $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":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}]}

+{"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}]}

 $GNGSA,A,2,19,27,,,,,,,,,,,02.1,01.8,00.9*13

 $GNGSA,A,2,67,84,83,75,,,,,,,,,02.1,01.8,00.9*1A

 $GNGGA,135648.997,5543.0327,N,03724.7197,E,1,06,01.8,165.6,M,14.6,M,,*7B

@@ -203,7 +203,7 @@ $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":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}]}

+{"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}]}

 $GNGSA,A,2,19,27,,,,,,,,,,,02.1,01.8,00.9*13

 $GNGSA,A,2,67,84,83,75,,,,,,,,,02.1,01.8,00.9*1A

 $GLGGA,135654.997,5543.0328,N,03724.7197,E,1,04,02.3,165.6,M,14.6,M,,*71

@@ -243,7 +243,7 @@ $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":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}]}

+{"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}]}

 $GPGSA,A,1,,,,,,,,,,,,,00.0,00.0,00.0*00

 $GPGBS,135659.997,,,,,,,*55

 $GPGGA,135700.997,5543.0322,N,03724.7208,E,0,,,165.6,M,14.6,M,,*78