diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-08-28 20:03:58 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-08-28 20:03:58 +0000 |
| commit | 71fd9148a8f65c9ecfd4c2c93faa8046729922fa (patch) | |
| tree | f4e09c127cbfbd485066143d8966da989120f523 /driver_aivdm.c | |
| parent | c2186c86d6b36976f89bf622127b039e3a478993 (diff) | |
| download | gpsd-71fd9148a8f65c9ecfd4c2c93faa8046729922fa.tar.gz | |
AIS message types 1, 2 and 3 JSON decoding.
Diffstat (limited to 'driver_aivdm.c')
| -rw-r--r-- | driver_aivdm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver_aivdm.c b/driver_aivdm.c index df4075f3..7a9b90d0 100644 --- a/driver_aivdm.c +++ b/driver_aivdm.c @@ -696,10 +696,10 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, char *buf, size_t buf case 1: /* Position Report */ case 2: case 3: -#define TYPE123_UNSCALED_CSV "%u,%d,%u,%u,%d,%d,%u,%u,%u,0x%x,%d,0x%x" -#define TYPE123_UNSCALED_JSON "\"status\":%u,\"turn\":%d,\"speed\":%u,\"accuracy\":%u,\"lon\":%d,\"lat\":%d,\"course\":%u,\"heading\":%d,\"second\":%u,\"regional\":%d,\"radio\":%d}" -#define TYPE123_SCALED_CSV "%s,%s,%s,%u,%.4f,%.4f,%u,%u,%u,0x%x,%d,0x%x" -#define TYPE123_SCALED_JSON "\"status\":\"%s\",\"turn\":%s,\"speed\":%s,\"accuracy\":%u,\"lon\":%.4f,\"lat\":%.4f,\"course\":%u,\"heading\":%d,\"second\":%u,\"regional\":%d,\"radio\":%d}" +#define TYPE123_UNSCALED_CSV "%u,%d,%u,%u,%d,%d,%u,%d,%u,0x%x,%d,0x%x" +#define TYPE123_UNSCALED_JSON "\"status\":%u,\"turn\":%d,\"speed\":%u,\"accuracy\":%u,\"lon\":%d,\"lat\":%d,\"course\":%u,\"heading\":%d,\"second\":%u,\"maneuver\":%d,\"raim\":%u,\"radio\":%d}" +#define TYPE123_SCALED_CSV "%s,%s,%s,%u,%.4f,%.4f,%u,%d,%u,0x%x,%d,0x%x" +#define TYPE123_SCALED_JSON "\"status\":\"%s\",\"turn\":%s,\"speed\":%s,\"accuracy\":%u,\"lon\":%.4f,\"lat\":%.4f,\"course\":%u,\"heading\":%d,\"second\":%u,\"maneuver\":%d,\"raim\":%u,\"radio\":%d}" if (scaled) { char turnlegend[10]; char speedlegend[10]; |