From 4beae92bfb2eb69fea84a1bbfdf9c8902698e4d3 Mon Sep 17 00:00:00 2001 From: Zilog80 Date: Thu, 21 Jan 2016 14:47:56 +0100 Subject: [PATCH] rs92: keine pseudoranges/gps ohne bahndaten --- rs92/rs92gps.c | 22 ++++++++++++---------- rs92/rs92gps_rawin.c | 34 ++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/rs92/rs92gps.c b/rs92/rs92gps.c index 5ee9344..2decc95 100644 --- a/rs92/rs92gps.c +++ b/rs92/rs92gps.c @@ -858,16 +858,18 @@ int print_position() { // GPS-Hoehe ueber Ellipsoid if (option_verbose) fprintf(stdout, " (W %d)", gpx.week); */ - k = get_pseudorange(); - if ((almanac || ephem) && (k >= 4)) { - if (get_GPSkoord(k) > 0) { - fprintf(stdout, " "); - if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); - else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); - if (option_vergps) { - fprintf(stdout, " sats: "); - for (j = 0; j < 4; j++) fprintf(stdout, "%02d ", gpx.sats[j]); - fprintf(stdout, " GDOP: %.1f ", gpx.dop); + if (almanac || ephem) { + k = get_pseudorange(); + if (k >= 4) { + if (get_GPSkoord(k) > 0) { + fprintf(stdout, " "); + if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); + else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); + if (option_vergps) { + fprintf(stdout, " sats: "); + for (j = 0; j < 4; j++) fprintf(stdout, "%02d ", gpx.sats[j]); + fprintf(stdout, " GDOP: %.1f ", gpx.dop); + } } } } diff --git a/rs92/rs92gps_rawin.c b/rs92/rs92gps_rawin.c index 0b07674..022ed77 100644 --- a/rs92/rs92gps_rawin.c +++ b/rs92/rs92gps_rawin.c @@ -868,22 +868,24 @@ int print_position() { // GPS-Hoehe ueber Ellipsoid if (option_verbose) fprintf(stdout, " (W %d)", gpx.week); */ - k = get_pseudorange(); - if ((almanac || ephem) && (k >= 4)) { - if (get_GPSkoord(k) > 0) { - fprintf(stdout, " "); - if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); - else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); - if (option_vergps) { - if (option_vergps != 2) { - fprintf(stdout, " GDOP[%02d,%02d,%02d,%02d] %.1f", - gpx.sats[0], gpx.sats[1], gpx.sats[2], gpx.sats[3], gpx.dop); - } - else { - fprintf(stdout, " GDOP["); - for (j = 0; j < k; j++) { - printf("%d", prn[j]); - if (j < k-1) printf(","); else printf("] %.1f ", gpx.dop); + if (almanac || ephem) { + k = get_pseudorange(); + if (k >= 4) { + if (get_GPSkoord(k) > 0) { + fprintf(stdout, " "); + if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); + else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h); + if (option_vergps) { + if (option_vergps != 2) { + fprintf(stdout, " GDOP[%02d,%02d,%02d,%02d] %.1f", + gpx.sats[0], gpx.sats[1], gpx.sats[2], gpx.sats[3], gpx.dop); + } + else { + fprintf(stdout, " GDOP["); + for (j = 0; j < k; j++) { + printf("%d", prn[j]); + if (j < k-1) printf(","); else printf("] %.1f ", gpx.dop); + } } } }