diff options
| -rw-r--r-- | gpsd_json.c | 3 | ||||
| -rw-r--r-- | subframe.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gpsd_json.c b/gpsd_json.c index 5d7737cd..a43cae82 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -359,8 +359,9 @@ void subframe_json_dump(const struct subframe_t *subframe, /*@out@*/ char buf[], int len = 0; (void)snprintf(buf, buflen, "{\"class\":\"SUBFRAME\",\"tSV\":%u," - "\"frame\":%u", + "\"TOW17\":%u,\"frame\":%u", (unsigned int)subframe->tSVID, + subframe->TOW17, subframe->subframe_num); /* only do subframe 5 almanac right now */ @@ -103,7 +103,7 @@ static void subframe_almanac(unsigned int tSVID, uint32_t words[], almp->omega = ( words[7] & 0xFFFFFF); almp->omega = uint2int(almp->omega, 24); almp->d_omega = pow(2.0, -23) * almp->omega; - almp->M0 = ( words[8] & 0xFFFFFF); + almp->M0 = ( words[8] & 0x00FFFFFF); almp->M0 = uint2int(almp->M0, 24); almp->d_M0 = pow(2.0,-23) * almp->M0; almp->af1 = ((words[9] >> 5) & 0x0007FF); |