Dump contents of of RTCM2.3 type 31 as a JSON object rather than hex words.

Fix required in order to check the RTCM2 driver logic against the ASCII dump
from Andre Naujoks. Remarkably, the check passes - though it appears that in
his dump the constant 40 is added to all GLONASS satellite IDs. doubtless
so they won't collide with GPS satellite IDs.

The naujoks-ntrip.log test had to be rebuilt.  All other regression tests pass.

1 files changed, 5 insertions, 5 deletions

diff --git a/test/daemon/naujoks-ntrip.log.chk b/test/daemon/naujoks-ntrip.log.chk
index 2f5280a6..77cb333b 100644
--- a/test/daemon/naujoks-ntrip.log.chk
+++ b/test/daemon/naujoks-ntrip.log.chk
@@ -1,11 +1,11 @@
 {"class":"RTCM2","type":14,"station_id":688,"zcount":841.8,"seqnum":3,"length":1,"station_health":6,"week":600,"hour":63,"leapsecs":15}

-{"class":"RTCM2","type":31,"station_id":688,"zcount":828.0,"seqnum":4,"length":14,"station_health":6,"data":["0x0386f0f4","0x00000158","0x06c10049","0x4003c69b","0xe9800003","0xc54641bc","0x0000034e","0x8686801a","0x800185d9","0x71010001","0x4586266d","0x4080052b","0xc56ebe02","0x800282b8"]}

+{"class":"RTCM2","type":31,"station_id":688,"zcount":828.0,"seqnum":4,"length":14,"station_health":6,"satellites":[{"ident":14,"udre":0,"change":false,"tod":0,"prc":142.140,"rrc":0.000},{"ident":5,"udre":0,"change":false,"tod":0,"prc":138.320,"rrc":0.002},{"ident":15,"udre":0,"change":false,"tod":0,"prc":136.440,"rrc":0.000},{"ident":21,"udre":0,"change":false,"tod":0,"prc":128.120,"rrc":0.000},{"ident":13,"udre":0,"change":false,"tod":0,"prc":133.640,"rrc":0.000},{"ident":6,"udre":0,"change":false,"tod":0,"prc":121.680,"rrc":0.008},{"ident":22,"udre":0,"change":false,"tod":0,"prc":125.940,"rrc":0.004},{"ident":20,"udre":0,"change":false,"tod":0,"prc":111.240,"rrc":-0.016}]}

 {"class":"RTCM2","type":1,"station_id":688,"zcount":843.0,"seqnum":5,"length":19,"station_health":6,"satellites":[{"ident":10,"udre":0,"iod":46,"prc":-2.400,"rrc":0.000},{"ident":13,"udre":0,"iod":94,"prc":-4.420,"rrc":0.000},{"ident":7,"udre":0,"iod":22,"prc":-5.160,"rrc":0.002},{"ident":2,"udre":0,"iod":34,"prc":-6.480,"rrc":0.000},{"ident":4,"udre":0,"iod":47,"prc":-8.860,"rrc":0.000},{"ident":8,"udre":0,"iod":76,"prc":-7.980,"rrc":0.002},{"ident":5,"udre":0,"iod":99,"prc":-8.260,"rrc":0.002},{"ident":23,"udre":0,"iod":81,"prc":-8.060,"rrc":0.000},{"ident":16,"udre":0,"iod":70,"prc":-11.740,"rrc":0.000},{"ident":30,"udre":0,"iod":4,"prc":-18.960,"rrc":-0.006},{"ident":29,"udre":0,"iod":101,"prc":-24.960,"rrc":-0.002}]}

-{"class":"RTCM2","type":31,"station_id":688,"zcount":829.2,"seqnum":6,"length":14,"station_health":6,"data":["0x8386f0dd","0x4000014e","0x86c10060","0x0003c68d","0x69804024","0x05464183","0xc0000371","0x46864034","0x000185f0","0x31010017","0xc5862644","0x0080053d","0x456e7e3a","0x800282b8"]}

+{"class":"RTCM2","type":31,"station_id":688,"zcount":829.2,"seqnum":6,"length":14,"station_health":6,"satellites":[{"ident":14,"udre":0,"change":false,"tod":0,"prc":142.140,"rrc":0.000},{"ident":5,"udre":0,"change":false,"tod":0,"prc":138.320,"rrc":0.002},{"ident":15,"udre":0,"change":false,"tod":0,"prc":136.440,"rrc":0.002},{"ident":21,"udre":0,"change":false,"tod":0,"prc":128.120,"rrc":0.000},{"ident":13,"udre":0,"change":false,"tod":0,"prc":133.620,"rrc":0.000},{"ident":6,"udre":0,"change":false,"tod":0,"prc":121.680,"rrc":0.008},{"ident":22,"udre":0,"change":false,"tod":0,"prc":125.940,"rrc":0.004},{"ident":20,"udre":0,"change":false,"tod":0,"prc":111.220,"rrc":-0.016}]}

 {"class":"RTCM2","type":1,"station_id":688,"zcount":844.2,"seqnum":7,"length":19,"station_health":6,"satellites":[{"ident":10,"udre":0,"iod":46,"prc":-2.400,"rrc":0.000},{"ident":13,"udre":0,"iod":94,"prc":-4.420,"rrc":0.000},{"ident":7,"udre":0,"iod":22,"prc":-5.160,"rrc":0.002},{"ident":2,"udre":0,"iod":34,"prc":-6.480,"rrc":0.000},{"ident":4,"udre":0,"iod":47,"prc":-8.860,"rrc":0.000},{"ident":8,"udre":0,"iod":76,"prc":-7.980,"rrc":0.002},{"ident":5,"udre":0,"iod":99,"prc":-8.260,"rrc":0.002},{"ident":23,"udre":0,"iod":81,"prc":-8.080,"rrc":0.000},{"ident":16,"udre":0,"iod":70,"prc":-11.740,"rrc":0.000},{"ident":30,"udre":0,"iod":4,"prc":-18.960,"rrc":-0.006},{"ident":29,"udre":0,"iod":101,"prc":-24.960,"rrc":-0.002}]}

-{"class":"RTCM2","type":31,"station_id":688,"zcount":829.8,"seqnum":0,"length":14,"station_health":6,"data":["0xc386f0cb","0xc0000167","0xc6c10076","0x8003c6a4","0x29804032","0x854641aa","0x80000367","0xc686401d","0x400185e6","0xb101003e","0x85862652","0x80800514","0x056e3e22","0x800282b8"]}

+{"class":"RTCM2","type":31,"station_id":688,"zcount":829.8,"seqnum":0,"length":14,"station_health":6,"satellites":[{"ident":14,"udre":0,"change":false,"tod":0,"prc":142.140,"rrc":0.000},{"ident":5,"udre":0,"change":false,"tod":0,"prc":138.320,"rrc":0.002},{"ident":15,"udre":0,"change":false,"tod":0,"prc":136.440,"rrc":0.002},{"ident":21,"udre":0,"change":false,"tod":0,"prc":128.120,"rrc":0.000},{"ident":13,"udre":0,"change":false,"tod":0,"prc":133.620,"rrc":0.000},{"ident":6,"udre":0,"change":false,"tod":0,"prc":121.680,"rrc":0.008},{"ident":22,"udre":0,"change":false,"tod":0,"prc":125.940,"rrc":0.004},{"ident":20,"udre":0,"change":false,"tod":0,"prc":111.200,"rrc":-0.016}]}

 {"class":"RTCM2","type":1,"station_id":688,"zcount":844.8,"seqnum":1,"length":19,"station_health":6,"satellites":[{"ident":10,"udre":0,"iod":46,"prc":-2.400,"rrc":0.000},{"ident":13,"udre":0,"iod":94,"prc":-4.440,"rrc":0.000},{"ident":7,"udre":0,"iod":22,"prc":-5.160,"rrc":0.002},{"ident":2,"udre":0,"iod":34,"prc":-6.480,"rrc":0.000},{"ident":8,"udre":0,"iod":76,"prc":-7.980,"rrc":0.002},{"ident":4,"udre":0,"iod":47,"prc":-8.860,"rrc":0.000},{"ident":5,"udre":0,"iod":99,"prc":-8.260,"rrc":0.002},{"ident":23,"udre":0,"iod":81,"prc":-8.080,"rrc":0.000},{"ident":16,"udre":0,"iod":70,"prc":-11.740,"rrc":0.000},{"ident":30,"udre":0,"iod":4,"prc":-18.940,"rrc":-0.006},{"ident":29,"udre":0,"iod":101,"prc":-24.960,"rrc":-0.002}]}

-{"class":"RTCM2","type":31,"station_id":688,"zcount":831.0,"seqnum":2,"length":14,"station_health":6,"data":["0x0386f0f4","0x00000158","0x06c10049","0x4003c69b","0xe980400d","0x45464163","0xc0000371","0x46864034","0x000185f0","0x3141001a","0x85862652","0x80800514","0x056dbe3e","0x800282b8"]}

+{"class":"RTCM2","type":31,"station_id":688,"zcount":831.0,"seqnum":2,"length":14,"station_health":6,"satellites":[{"ident":14,"udre":0,"change":false,"tod":0,"prc":142.140,"rrc":0.000},{"ident":5,"udre":0,"change":false,"tod":0,"prc":138.320,"rrc":0.002},{"ident":15,"udre":0,"change":false,"tod":0,"prc":136.440,"rrc":0.002},{"ident":21,"udre":0,"change":false,"tod":0,"prc":128.100,"rrc":0.000},{"ident":13,"udre":0,"change":false,"tod":0,"prc":133.620,"rrc":0.000},{"ident":6,"udre":0,"change":false,"tod":0,"prc":121.700,"rrc":0.008},{"ident":22,"udre":0,"change":false,"tod":0,"prc":125.940,"rrc":0.004},{"ident":20,"udre":0,"change":false,"tod":0,"prc":111.160,"rrc":-0.016}]}

 {"class":"RTCM2","type":1,"station_id":688,"zcount":846.0,"seqnum":3,"length":19,"station_health":6,"satellites":[{"ident":10,"udre":0,"iod":46,"prc":-2.400,"rrc":0.000},{"ident":13,"udre":0,"iod":94,"prc":-4.440,"rrc":0.000},{"ident":7,"udre":0,"iod":22,"prc":-5.160,"rrc":0.002},{"ident":2,"udre":0,"iod":34,"prc":-6.480,"rrc":0.000},{"ident":8,"udre":0,"iod":76,"prc":-7.980,"rrc":0.002},{"ident":4,"udre":0,"iod":47,"prc":-8.880,"rrc":0.000},{"ident":5,"udre":0,"iod":99,"prc":-8.240,"rrc":0.002},{"ident":23,"udre":0,"iod":81,"prc":-8.080,"rrc":0.000},{"ident":16,"udre":0,"iod":70,"prc":-11.740,"rrc":0.000},{"ident":30,"udre":0,"iod":4,"prc":-18.960,"rrc":-0.006},{"ident":29,"udre":0,"iod":101,"prc":-24.960,"rrc":-0.002}]}

-{"class":"RTCM2","type":31,"station_id":688,"zcount":832.2,"seqnum":4,"length":14,"station_health":6,"data":["0x8386f120","0x00400155","0x46c1005f","0xc003c6b2","0xa980401b","0xc546414a","0x80000367","0xc686401d","0x400185e6","0xb1810024","0x0586267b","0xc0800502","0x856d3e08","0x00028291"]}

+{"class":"RTCM2","type":31,"station_id":688,"zcount":832.2,"seqnum":4,"length":14,"station_health":6,"satellites":[{"ident":14,"udre":0,"change":false,"tod":0,"prc":142.160,"rrc":0.002},{"ident":5,"udre":0,"change":false,"tod":0,"prc":138.320,"rrc":0.002},{"ident":15,"udre":0,"change":false,"tod":0,"prc":136.440,"rrc":0.002},{"ident":21,"udre":0,"change":false,"tod":0,"prc":128.100,"rrc":0.000},{"ident":13,"udre":0,"change":false,"tod":0,"prc":133.620,"rrc":0.000},{"ident":6,"udre":0,"change":false,"tod":0,"prc":121.720,"rrc":0.008},{"ident":22,"udre":0,"change":false,"tod":0,"prc":125.940,"rrc":0.004},{"ident":20,"udre":0,"change":false,"tod":0,"prc":111.120,"rrc":-0.016}]}

 {"class":"RTCM2","type":1,"station_id":688,"zcount":847.2,"seqnum":5,"length":19,"station_health":6,"satellites":[{"ident":10,"udre":0,"iod":46,"prc":-2.400,"rrc":0.000},{"ident":13,"udre":0,"iod":94,"prc":-4.440,"rrc":0.000},{"ident":7,"udre":0,"iod":22,"prc":-5.160,"rrc":0.002},{"ident":2,"udre":0,"iod":34,"prc":-6.480,"rrc":0.000},{"ident":8,"udre":0,"iod":76,"prc":-7.980,"rrc":0.002},{"ident":4,"udre":0,"iod":47,"prc":-8.860,"rrc":0.002},{"ident":5,"udre":0,"iod":99,"prc":-8.240,"rrc":0.002},{"ident":23,"udre":0,"iod":81,"prc":-8.080,"rrc":0.000},{"ident":16,"udre":0,"iod":70,"prc":-11.760,"rrc":0.000},{"ident":30,"udre":0,"iod":4,"prc":-18.980,"rrc":-0.006},{"ident":29,"udre":0,"iod":101,"prc":-24.980,"rrc":-0.002}]}