diff options
author | Gary E. Miller <gem@rellim.com> | 2018-10-30 20:15:20 -0700 |
---|---|---|
committer | Gary E. Miller <gem@rellim.com> | 2018-10-30 20:15:20 -0700 |
commit | b790812ef5c9e052c22725163e96e0f5ba674931 (patch) | |
tree | c42be31375397cc80b6cecbbb082465b987b65c4 /libgps_json.c | |
parent | f5b60f30f5bcd32b12314b1af8130f2c71690959 (diff) | |
download | gpsd-b790812ef5c9e052c22725163e96e0f5ba674931.tar.gz |
json: Fis encode/decode of rawdata_t.
Diffstat (limited to 'libgps_json.c')
-rw-r--r-- | libgps_json.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgps_json.c b/libgps_json.c index ae3f2dc0..8ad0b8ef 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -145,7 +145,8 @@ static int json_raw_read(const char *buf, struct gps_data_t *gpsdata, {"svid", t_short, STRUCTOBJECT(struct meas_t, svid)}, {"snr", t_short, STRUCTOBJECT(struct meas_t, snr)}, {"freqid", t_short, STRUCTOBJECT(struct meas_t, freqid)}, - {"ops", t_string, STRUCTOBJECT(struct meas_t, obs_code)}, + {"obs", t_string, STRUCTOBJECT(struct meas_t, obs_code), + .len = sizeof(gpsdata->raw.meas[0].obs_code)}, {"carrierphase", t_short, STRUCTOBJECT(struct meas_t, carrierphase)}, {"pseudorange", t_short, STRUCTOBJECT(struct meas_t, pseudorange)}, {"doppler", t_real, STRUCTOBJECT(struct meas_t, doppler)}, @@ -161,8 +162,7 @@ static int json_raw_read(const char *buf, struct gps_data_t *gpsdata, .dflt.real = NAN}, {"nsec", t_real, .addr.real = &mtime_ns, .dflt.real = NAN}, - {"meas", t_array, - STRUCTARRAY(gpsdata->raw.meas, + {"rawdata", t_array, STRUCTARRAY(gpsdata->raw.meas, json_attrs_meas, &measurements)}, {NULL}, /* *INDENT-ON* */ |