From b04cd6ea61c5e0aa5d39c10b327ad0b77dbe917a Mon Sep 17 00:00:00 2001 From: Zilog80 Date: Sun, 18 Aug 2019 18:36:19 +0200 Subject: [PATCH] lms6-1680: re-reorder prev_frnr, more json-frames --- mk2a/mk2a_lms1680.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk2a/mk2a_lms1680.c b/mk2a/mk2a_lms1680.c index 114f129..d483fcc 100644 --- a/mk2a/mk2a_lms1680.c +++ b/mk2a/mk2a_lms1680.c @@ -634,14 +634,14 @@ void print_frame(int len) { if (option_jsn) { // Print JSON output required by auto_rx. - if (gpx.prev_frnr != gpx.frnr) { //|| gpx.id != _id0 - if (crc_err==0 && (gpx.id & 0xFFFF0000)) { // CRC-OK and FullID + 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", gpx.frnr, gpx.id, gpx.std, gpx.min, gpx.sek, gpx.lat, gpx.lon, gpx.alt, gpx.vH, gpx.vD, gpx.vV ); printf("\n"); + gpx.prev_frnr = gpx.frnr; } - gpx.prev_frnr = gpx.frnr; } }