mirror
/
RS-tracker
kopia lustrzana https://github.com/rs1729/RS
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

LMS6 JSON: type=LMS , subtype=6,X,MK2A

pull/27/head
Zilog80 2020-05-09 12:10:48 +02:00
rodzic 3ed7f6550f
commit 9cef8892c7
4 zmienionych plików z 10 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
demod/mod/lms6Xmod.c
Wyświetl plik

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

4
demod/mod/lms6Xmod_soft.c
Wyświetl plik

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

4
demod/multi/lms6Xbase.c
Wyświetl plik

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

5
mk2a/mk2a_lms1680.c
Wyświetl plik

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