diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-09-18 15:39:28 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-09-18 15:39:28 +0000 |
| commit | 63659ed129e343ea748fe016b99beea78f723acb (patch) | |
| tree | bdd512e1be12fc9ee937b21329aaa96dc5976833 /gpsd_json.c | |
| parent | e925f7671328d5c89d405e7e553b45d8facda39b (diff) | |
| download | gpsd-63659ed129e343ea748fe016b99beea78f723acb.tar.gz | |
The NMEA-dump flags is now properly separated from the raw flag.
In new protocol, raw=1 dumps hex; NMEA dumping is separate. All
regression tests psss.
Diffstat (limited to 'gpsd_json.c')
| -rw-r--r-- | gpsd_json.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gpsd_json.c b/gpsd_json.c index 7cde8745..59760808 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -308,8 +308,9 @@ void json_watch_dump(const struct policy_t *ccp, { /*@-compdef@*/ (void)snprintf(reply+strlen(reply), replylen-strlen(reply), - "{\"class\":\"WATCH\",\"enable\":%s,\"raw\":%d,\"scaled\":%s}\r\n", + "{\"class\":\"WATCH\",\"enable\":%s,\"nmea\":%s,\"raw\":%d,\"scaled\":%s}\r\n", ccp->watcher ? "true" : "false", + ccp->nmea ? "true" : "false", ccp->raw, ccp->scaled ? "true" : "false"); /*@+compdef@*/ @@ -1247,6 +1248,8 @@ int json_watch_read(const char *buf, .dflt.boolean = true}, {"raw", integer, .addr.integer = &ccp->raw, .nodefault = true}, + {"nmea", boolean, .addr.boolean = &ccp->nmea, + .nodefault = true}, {"scaled", boolean, .addr.boolean = &ccp->scaled}, {NULL}, }; |