From 9cef8892c70829e2619135aefcce4077c3c6d30f Mon Sep 17 00:00:00 2001 From: Zilog80 Date: Sat, 9 May 2020 12:10:48 +0200 Subject: [PATCH] LMS6 JSON: type=LMS , subtype=6,X,MK2A --- demod/mod/lms6Xmod.c | 4 ++-- demod/mod/lms6Xmod_soft.c | 4 ++-- demod/multi/lms6Xbase.c | 4 ++-- mk2a/mk2a_lms1680.c | 5 ++++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/demod/mod/lms6Xmod.c b/demod/mod/lms6Xmod.c index 18ba69f..290db02 100644 --- a/demod/mod/lms6Xmod.c +++ b/demod/mod/lms6Xmod.c @@ -738,13 +738,13 @@ static void print_frame(gpx_t *gpx, int crc_err, int len) { // UTC oder GPS? char sntyp[] = "LMS6-"; if (gpx->typ == 10) sntyp[3] = 'X'; - printf("{ \"type\": \"%s\"", "LMS6"); + printf("{ \"type\": \"%s\"", "LMS"); printf(", \"frame\": %d, \"id\": \"%s%d\", \"datetime\": \"", gpx->frnr, sntyp, gpx->sn ); //if (gpx->week > 0) printf("%04d-%02d-%02dT", gpx->jahr, gpx->monat, gpx->tag ); printf("%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f", gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV ); printf(", \"gpstow\": %d", gpx->gpstow ); - printf(", \"subtype\": \"%c\"", sntyp[3]); + printf(", \"subtype\": \"%c\"", sntyp[3]); // "6":LMS6-403, "X":lms6X, "MK2A":LMS6-1680/Mk2a printf(" }\n"); printf("\n"); } diff --git a/demod/mod/lms6Xmod_soft.c b/demod/mod/lms6Xmod_soft.c index 5bc2d8c..0472f68 100644 --- a/demod/mod/lms6Xmod_soft.c +++ b/demod/mod/lms6Xmod_soft.c @@ -753,13 +753,13 @@ static void print_frame(gpx_t *gpx, int crc_err, int len) { // UTC oder GPS? char sntyp[] = "LMS6-"; if (gpx->typ == 10) sntyp[3] = 'X'; - printf("{ \"type\": \"%s\"", "LMS6"); + printf("{ \"type\": \"%s\"", "LMS"); printf(", \"frame\": %d, \"id\": \"%s%d\", \"datetime\": \"", gpx->frnr, sntyp, gpx->sn ); //if (gpx->week > 0) printf("%04d-%02d-%02dT", gpx->jahr, gpx->monat, gpx->tag ); printf("%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f", gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV ); printf(", \"gpstow\": %d", gpx->gpstow ); - printf(", \"subtype\": \"%c\"", sntyp[3]); + printf(", \"subtype\": \"%c\"", sntyp[3]); // "6":LMS6-403, "X":lms6X, "MK2A":LMS6-1680/Mk2a printf(" }\n"); printf("\n"); } diff --git a/demod/multi/lms6Xbase.c b/demod/multi/lms6Xbase.c index 7b69e12..1648026 100644 --- a/demod/multi/lms6Xbase.c +++ b/demod/multi/lms6Xbase.c @@ -730,13 +730,13 @@ static int print_frame(gpx_t *gpx, int crc_err, int len) { // UTC oder GPS? char sntyp[] = "LMS6-"; if (gpx->typ == 10) sntyp[3] = 'X'; - printf("{ \"type\": \"%s\"", "LMS6"); + printf("{ \"type\": \"%s\"", "LMS"); printf(", \"frame\": %d, \"id\": \"%s%d\", \"datetime\": \"", gpx->frnr, sntyp, gpx->sn ); //if (gpx->week > 0) printf("%04d-%02d-%02dT", gpx->jahr, gpx->monat, gpx->tag ); printf("%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f", gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV ); printf(", \"gpstow\": %d", gpx->gpstow ); - printf(", \"subtype\": \"%c\"", sntyp[3]); + printf(", \"subtype\": \"%c\"", sntyp[3]); // "6":LMS6-403, "X":lms6X, "MK2A":LMS6-1680/Mk2a printf(" }\n"); printf("\n"); } diff --git a/mk2a/mk2a_lms1680.c b/mk2a/mk2a_lms1680.c index d483fcc..1438c56 100644 --- a/mk2a/mk2a_lms1680.c +++ b/mk2a/mk2a_lms1680.c @@ -637,8 +637,11 @@ void print_frame(int len) { if (crc_err==0 && (gpx.id & 0xFFFF0000)) { // CRC-OK and FullID if (gpx.prev_frnr != gpx.frnr) { //|| gpx.id != _id0 // UTC oder GPS? - printf("{ \"frame\": %d, \"id\": \"LMS6-%d\", \"datetime\": \"%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f }\n", + printf("{ \"type\": \"%s\"", "LMS"); + printf(", \"frame\": %d, \"id\": \"LMS6-%d\", \"datetime\": \"%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f", gpx.frnr, gpx.id, gpx.std, gpx.min, gpx.sek, gpx.lat, gpx.lon, gpx.alt, gpx.vH, gpx.vD, gpx.vV ); + printf(", \"subtype\": \"%s\"", "MK2A"); + printf(" }\n"); printf("\n"); gpx.prev_frnr = gpx.frnr; }