diff options
| author | Gary E. Miller <gem@rellim.com> | 2018-09-19 16:33:26 -0700 |
|---|---|---|
| committer | Gary E. Miller <gem@rellim.com> | 2018-09-19 16:33:26 -0700 |
| commit | b020a079842d9f7547f2bf7655f62bb94f377a72 (patch) | |
| tree | 8988dddd133fc6c1822e8e2b09314f0fdae2f9ca /gpsd_json.c | |
| parent | 1ec18702871f805c87a9534f6ed20806caaa4467 (diff) | |
| download | gpsd-b020a079842d9f7547f2bf7655f62bb94f377a72.tar.gz | |
gpsd_json.c: Add gnssid:svid to SKY.
Update regression tests for new values.
Diffstat (limited to 'gpsd_json.c')
| -rw-r--r-- | gpsd_json.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gpsd_json.c b/gpsd_json.c index 4eb13a4b..3e7ff9aa 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -331,12 +331,19 @@ void json_sky_dump(const struct gps_data_t *datap, for (i = 0; i < reported; i++) { if (datap->skyview[i].PRN) { str_appendf(reply, replylen, - "{\"PRN\":%d,\"el\":%d,\"az\":%d,\"ss\":%.0f,\"used\":%s},", - datap->skyview[i].PRN, - datap->skyview[i].elevation, - datap->skyview[i].azimuth, - datap->skyview[i].ss, - datap->skyview[i].used ? "true" : "false"); + "{\"PRN\":%d,\"el\":%d,\"az\":%d,\"ss\":%.0f,\"used\":%s", + datap->skyview[i].PRN, + datap->skyview[i].elevation, + datap->skyview[i].azimuth, + datap->skyview[i].ss, + datap->skyview[i].used ? "true" : "false"); + if (0 != datap->skyview[i].svid) { + str_appendf(reply, replylen, + ",\"gnssid\":%d,\"svid\":%d", + datap->skyview[i].gnssid, + datap->skyview[i].svid); + } + (void)strlcat(reply, "},", replylen); } } str_rstrip_char(reply, ','); |