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

dfm09mod: raw+json output

pull/52/head
Zilog80 2021-06-05 22:58:31 +02:00
rodzic 300b206859
commit e2a704faf8
1 zmienionych plików z 31 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

58
demod/mod/dfm09mod.c
Wyświetl plik

@ -731,8 +731,9 @@ static void print_gpx(gpx_t *gpx) {
for (i = 0; i < 9; i++) {
for (j = 0; j < 13; j++) gpx->dat_str[i][j] = ' ';
}
printf("\n");
}
else {
else if (!gpx->option.raw) {
if (gpx->option.aut && gpx->option.vbs >= 2) printf("<%c> ", gpx->option.inv?'-':'+');
printf("[%3d] ", gpx->frnr);
printf("%4d-%02d-%02d ", gpx->jahr, gpx->monat, gpx->tag);
@ -776,17 +777,17 @@ static void print_gpx(gpx_t *gpx) {
gpx->sonde_typ ^= SNbit;
}
}
}
printf("\n");
if (gpx->option.sat) {
printf(" ");
printf(" dMSL: %+.2f", gpx->gps.dMSL); // MSL = alt + gps.dMSL
printf(" sats: %d", gpx->gps.nSV);
printf(" (");
for (j = 0; j < 32; j++) { if ((gpx->gps.prn >> j)&1) printf(" %02d", j+1); }
printf(" )");
printf("\n");
if (gpx->option.sat) {
printf(" ");
printf(" dMSL: %+.2f", gpx->gps.dMSL); // MSL = alt + gps.dMSL
printf(" sats: %d", gpx->gps.nSV);
printf(" (");
for (j = 0; j < 32; j++) { if ((gpx->gps.prn >> j)&1) printf(" %02d", j+1); }
printf(" )");
printf("\n");
}
}
if (gpx->option.jsn && jsonout && gpx->sek < 60.0)
@ -902,29 +903,32 @@ static int print_frame(gpx_t *gpx) {
printf("\n");
}
else if (gpx->option.ecc) {
if ( gpx->option.raw != 1 || gpx->option.jsn )
{
if (gpx->option.ecc) {
if (ret0 == 0 || ret0 > 0 || gpx->option.ecc == 2) {
conf_out(gpx, block_conf, ret0);
}
if (ret1 == 0 || ret1 > 0 || gpx->option.ecc == 2) {
frid = dat_out(gpx, block_dat1, ret1);
if (frid == 8) print_gpx(gpx);
}
if (ret2 == 0 || ret2 > 0 || gpx->option.ecc == 2) {
frid = dat_out(gpx, block_dat2, ret2);
if (frid == 8) print_gpx(gpx);
}
if (ret0 == 0 || ret0 > 0 || gpx->option.ecc == 2) {
conf_out(gpx, block_conf, ret0);
}
if (ret1 == 0 || ret1 > 0 || gpx->option.ecc == 2) {
else {
conf_out(gpx, block_conf, ret0);
frid = dat_out(gpx, block_dat1, ret1);
if (frid == 8) print_gpx(gpx);
}
if (ret2 == 0 || ret2 > 0 || gpx->option.ecc == 2) {
frid = dat_out(gpx, block_dat2, ret2);
if (frid == 8) print_gpx(gpx);
}
}
else {
conf_out(gpx, block_conf, ret0);
frid = dat_out(gpx, block_dat1, ret1);
if (frid == 8) print_gpx(gpx);
frid = dat_out(gpx, block_dat2, ret2);
if (frid == 8) print_gpx(gpx);
}
return ret;