diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-02-01 18:58:41 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-02-01 18:58:41 -0500 |
| commit | cecc68819d987633d2b138f6a033b0422527ad9c (patch) | |
| tree | 5e9c316b6ef9698e19f23b2eafd74a689c2b2212 /libgps_json.c | |
| parent | ba280a508f5d6b95334864946517f6ff2953f64f (diff) | |
| download | gpsd-cecc68819d987633d2b138f6a033b0422527ad9c.tar.gz | |
More name changes related to GST.
All regression tests pass.
Diffstat (limited to 'libgps_json.c')
| -rw-r--r-- | libgps_json.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libgps_json.c b/libgps_json.c index 611e9917..fbce7f19 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -129,26 +129,26 @@ static int json_noise_read(const char *buf, struct gps_data_t *gpsdata, /*@ -fullinitblock @*/ const struct json_attr_t json_attrs_1[] = { /* *INDENT-OFF* */ - {"class", t_check, .dflt.check = "NOISE"}, + {"class", t_check, .dflt.check = "GST"}, {"device", t_string, .addr.string = gpsdata->dev.path, .len = sizeof(gpsdata->dev.path)}, {"tag", t_string, .addr.string = gpsdata->tag, .len = sizeof(gpsdata->tag)}, {"time", t_string, .addr.string = tbuf, .len = sizeof(tbuf)}, - {"rms", t_real, .addr.real = &gpsdata->noise_stats.rms_deviation, + {"rms", t_real, .addr.real = &gpsdata->gst.rms_deviation, .dflt.real = NAN}, - {"major", t_real, .addr.real = &gpsdata->noise_stats.smajor_deviation, + {"major", t_real, .addr.real = &gpsdata->gst.smajor_deviation, .dflt.real = NAN}, - {"minor", t_real, .addr.real = &gpsdata->noise_stats.sminor_deviation, + {"minor", t_real, .addr.real = &gpsdata->gst.sminor_deviation, .dflt.real = NAN}, - {"orient", t_real, .addr.real = &gpsdata->noise_stats.smajor_orientation, + {"orient", t_real, .addr.real = &gpsdata->gst.smajor_orientation, .dflt.real = NAN}, - {"lat", t_real, .addr.real = &gpsdata->noise_stats.lat_err_deviation, + {"lat", t_real, .addr.real = &gpsdata->gst.lat_err_deviation, .dflt.real = NAN}, - {"lon", t_real, .addr.real = &gpsdata->noise_stats.lon_err_deviation, + {"lon", t_real, .addr.real = &gpsdata->gst.lon_err_deviation, .dflt.real = NAN}, - {"alt", t_real, .addr.real = &gpsdata->noise_stats.alt_err_deviation, + {"alt", t_real, .addr.real = &gpsdata->gst.alt_err_deviation, .dflt.real = NAN}, {NULL}, /* *INDENT-ON* */ @@ -161,12 +161,12 @@ static int json_noise_read(const char *buf, struct gps_data_t *gpsdata, /*@-usedef@*/ if (tbuf[0] == '\0') - gpsdata->noise_stats.utctime = NAN; + gpsdata->gst.utctime = NAN; else - gpsdata->noise_stats.utctime = iso8601_to_unix(tbuf); + gpsdata->gst.utctime = iso8601_to_unix(tbuf); /*@+usedef@*/ - gpsdata->set |= NOISE_SET; + gpsdata->set |= GST_SET; return 0; } |