summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-03-02 17:45:40 -0500
committerEric S. Raymond <esr@thyrsus.com>2011-03-02 17:45:40 -0500
commit27c6bcc7ac058aba262d4a4a81812c6fd65ee530 (patch)
tree77ea273394262a66e9d024d3630f009d3b350ef0
parent3a3dcd8c4ebd351fe986ce276e60283d8c02d645 (diff)
downloadgpsd-27c6bcc7ac058aba262d4a4a81812c6fd65ee530.tar.gz
Add RTCM3 regression-test load.
Very sad that it contains only one verified sentencem, a type 1029. We badly need better test loads for RTCM2 and RTCM3.
-rw-r--r--gpsd_json.c6
-rw-r--r--test/daemon/rtcm3.logbin0 -> 369 bytes
-rw-r--r--test/daemon/rtcm3.log.chk1
3 files changed, 4 insertions, 3 deletions
diff --git a/gpsd_json.c b/gpsd_json.c
index 405fd733..2285035d 100644
--- a/gpsd_json.c
+++ b/gpsd_json.c
@@ -898,7 +898,7 @@ void json_rtcm3_dump(const struct rtcm3_t *rtcm,
for (i = 0; i < rtcm->rtcmtypes.rtcm3_1001.header.satcount; i++) {
#define R1001 rtcm->rtcmtypes.rtcm3_1001.rtk_data[i]
(void)snprintf(buf + strlen(buf), buflen - strlen(buf),
- "{\"ident\":%u,\"ind\":%u,\"prange\"=%8.1f,"
+ "{\"ident\":%u,\"ind\":%u,\"prange\":%8.1f,"
"\"delta\":%6.4f,\"lockt\":%u},",
R1001.ident,
CODE(R1001.L1.indicator),
@@ -1204,7 +1204,7 @@ void json_rtcm3_dump(const struct rtcm3_t *rtcm,
INT(rtcm->rtcmtypes.rtcm3_1013.leapsecs));
for (i = 0; i < (unsigned short)rtcm->rtcmtypes.rtcm3_1013.ncount; i++)
(void)snprintf(buf + strlen(buf), buflen - strlen(buf),
- "{\"id\":%u,\"sync\"=\"%s\",\"interval\":%u}",
+ "{\"id\":%u,\"sync\":\"%s\",\"interval\":%u}",
rtcm->rtcmtypes.rtcm3_1013.announcements[i].id,
JSON_BOOL(rtcm->rtcmtypes.rtcm3_1013.
announcements[i].sync),
@@ -1247,7 +1247,7 @@ void json_rtcm3_dump(const struct rtcm3_t *rtcm,
case 1029:
(void)snprintf(buf + strlen(buf), buflen - strlen(buf),
"\"station_id\":%u,\"mjd\":%u,\"sec\":%u,"
- "\"len\":%zd,\"units\":%zd,\"msg\"=\"%s\",",
+ "\"len\":%zd,\"units\":%zd,\"msg\":\"%s\",",
rtcm->rtcmtypes.rtcm3_1029.station_id,
rtcm->rtcmtypes.rtcm3_1029.mjd,
rtcm->rtcmtypes.rtcm3_1029.sod,
diff --git a/test/daemon/rtcm3.log b/test/daemon/rtcm3.log
new file mode 100644
index 00000000..e6abf682
--- /dev/null
+++ b/test/daemon/rtcm3.log
Binary files differ
diff --git a/test/daemon/rtcm3.log.chk b/test/daemon/rtcm3.log.chk
new file mode 100644
index 00000000..51737b47
--- /dev/null
+++ b/test/daemon/rtcm3.log.chk
@@ -0,0 +1 @@
+{"class":"RTCM3","type":1029,"length":39,"station_id":23,"mjd":132,"sec":59100,"len":21,"units":30,"msg":"UTF-8 \u00d0\u00bf\u00d1\u0080\u00d0\u00be\u00d0\u00b2\u00d0\u00b5\u00d1\u0080\u00d0\u00ba\u00d0\u00b0 w\u00c3\u00b6rter"}