From 1bc8b059b844a8c91771b65b4969e25279717c39 Mon Sep 17 00:00:00 2001 From: Zilog80 Date: Wed, 16 Dec 2020 22:18:48 +0100 Subject: [PATCH] m10-json cleanup --- demod/mod/m10mod.c | 2 +- demod/mod/mXXmod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demod/mod/m10mod.c b/demod/mod/m10mod.c index 4acc854..c5f5b43 100644 --- a/demod/mod/m10mod.c +++ b/demod/mod/m10mod.c @@ -985,7 +985,7 @@ static int print_pos(gpx_t *gpx, int csOK) { for (j = 0; sn_id[j]; j++) { if (sn_id[j] == ' ') sn_id[j] = '-'; } fprintf(stdout, "{ \"type\": \"%s\"", "M10"); - fprintf(stdout, ", \"frame\": %lu ,", (unsigned long)(sec_gps0+0.5)); + fprintf(stdout, ", \"frame\": %lu, ", (unsigned long)(sec_gps0+0.5)); fprintf(stdout, "\"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d", sn_id, utc_jahr, utc_monat, utc_tag, utc_std, utc_min, utc_sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV, gpx->numSV); // APRS id, 9 characters diff --git a/demod/mod/mXXmod.c b/demod/mod/mXXmod.c index b238840..64ea49d 100644 --- a/demod/mod/mXXmod.c +++ b/demod/mod/mXXmod.c @@ -638,7 +638,7 @@ static int print_pos(gpx_t *gpx, int bcOK, int csOK) { for (j = 0; sn_id[j]; j++) { if (sn_id[j] == ' ') sn_id[j] = '-'; } fprintf(stdout, "{ \"type\": \"%s\"", "M20"); - fprintf(stdout, ", \"frame\": %lu ,", (unsigned long)(sec_gps0+0.5)); + fprintf(stdout, ", \"frame\": %lu, ", (unsigned long)(sec_gps0+0.5)); fprintf(stdout, "\"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f", sn_id, gpx->jahr, gpx->monat, gpx->tag, gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV); fprintf(stdout, ", \"rawid\": \"M20_%02X%02X%02X\"", gpx->frame_bytes[pos_SN], gpx->frame_bytes[pos_SN+1], gpx->frame_bytes[pos_SN+2]); // gpx->type