diff options
| author | Gary E. Miller <gem@rellim.com> | 2019-05-17 13:43:34 -0700 |
|---|---|---|
| committer | Gary E. Miller <gem@rellim.com> | 2019-05-17 13:43:34 -0700 |
| commit | fe694f610fc6ca6cb5904001fed1411f59a39453 (patch) | |
| tree | 6524bac79b41575ef5c30e1b6b42493f780e7fd8 /libgps_json.c | |
| parent | be2cabf020cdadce60086ab0ad526254492bae86 (diff) | |
| download | gpsd-fe694f610fc6ca6cb5904001fed1411f59a39453.tar.gz | |
libgps_json: Fix json_types for meas_t.
json_types are the C types, not really the JSON types.
Diffstat (limited to 'libgps_json.c')
| -rw-r--r-- | libgps_json.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libgps_json.c b/libgps_json.c index 02beabdb..46b854b6 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -153,23 +153,23 @@ static int json_raw_read(const char *buf, struct gps_data_t *gpsdata, const struct json_attr_t json_attrs_meas[] = { /* *INDENT-OFF* */ - {"gnssid", t_short, STRUCTOBJECT(struct meas_t, gnssid)}, - {"svid", t_short, STRUCTOBJECT(struct meas_t, svid)}, - {"snr", t_short, STRUCTOBJECT(struct meas_t, snr)}, - {"freqid", t_short, STRUCTOBJECT(struct meas_t, freqid)}, - {"obs", t_string, STRUCTOBJECT(struct meas_t, obs_code), + {"gnssid", t_ubyte, STRUCTOBJECT(struct meas_t, gnssid)}, + {"svid", t_ubyte, STRUCTOBJECT(struct meas_t, svid)}, + {"snr", t_ubyte, STRUCTOBJECT(struct meas_t, snr)}, + {"freqid", t_ubyte, STRUCTOBJECT(struct meas_t, freqid)}, + {"obs", t_string, STRUCTOBJECT(struct meas_t, obs_code), .len = sizeof(gpsdata->raw.meas[0].obs_code)}, - {"lli", t_integer, STRUCTOBJECT(struct meas_t, lli)}, - {"locktime", t_integer, STRUCTOBJECT(struct meas_t, locktime)}, - {"carrierphase", t_real, STRUCTOBJECT(struct meas_t, carrierphase), - .dflt.real = NAN}, - {"pseudorange", t_real, STRUCTOBJECT(struct meas_t, pseudorange), - .dflt.real = NAN}, - {"doppler", t_real, STRUCTOBJECT(struct meas_t, doppler), + {"lli", t_ubyte, STRUCTOBJECT(struct meas_t, lli)}, + {"locktime", t_uinteger, STRUCTOBJECT(struct meas_t, locktime)}, + {"carrierphase", t_real, STRUCTOBJECT(struct meas_t, carrierphase), + .dflt.real = NAN}, + {"pseudorange", t_real, STRUCTOBJECT(struct meas_t, pseudorange), + .dflt.real = NAN}, + {"doppler", t_real, STRUCTOBJECT(struct meas_t, doppler), .dflt.real = NAN}, - {"c2c", t_real, STRUCTOBJECT(struct meas_t, c2c), + {"c2c", t_real, STRUCTOBJECT(struct meas_t, c2c), .dflt.real = NAN}, - {"l2c", t_real, STRUCTOBJECT(struct meas_t, l2c), + {"l2c", t_real, STRUCTOBJECT(struct meas_t, l2c), .dflt.real = NAN}, /* *INDENT-ON* */ {NULL}, |