lms6-1680: re-reorder prev_frnr, more json-frames

pull/18/head
Zilog80 2019-08-18 18:36:19 +02:00
rodzic 9c7c46f3de
commit b04cd6ea61
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -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;
}
}