kopia lustrzana https://github.com/rs1729/RS
rs92: keine pseudoranges/gps ohne bahndaten
rodzic
47243e4eef
commit
4beae92bfb
|
@ -858,16 +858,18 @@ int print_position() { // GPS-Hoehe ueber Ellipsoid
|
||||||
if (option_verbose) fprintf(stdout, " (W %d)", gpx.week);
|
if (option_verbose) fprintf(stdout, " (W %d)", gpx.week);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
k = get_pseudorange();
|
if (almanac || ephem) {
|
||||||
if ((almanac || ephem) && (k >= 4)) {
|
k = get_pseudorange();
|
||||||
if (get_GPSkoord(k) > 0) {
|
if (k >= 4) {
|
||||||
fprintf(stdout, " ");
|
if (get_GPSkoord(k) > 0) {
|
||||||
if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
fprintf(stdout, " ");
|
||||||
else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
||||||
if (option_vergps) {
|
else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
||||||
fprintf(stdout, " sats: ");
|
if (option_vergps) {
|
||||||
for (j = 0; j < 4; j++) fprintf(stdout, "%02d ", gpx.sats[j]);
|
fprintf(stdout, " sats: ");
|
||||||
fprintf(stdout, " GDOP: %.1f ", gpx.dop);
|
for (j = 0; j < 4; j++) fprintf(stdout, "%02d ", gpx.sats[j]);
|
||||||
|
fprintf(stdout, " GDOP: %.1f ", gpx.dop);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -868,22 +868,24 @@ int print_position() { // GPS-Hoehe ueber Ellipsoid
|
||||||
if (option_verbose) fprintf(stdout, " (W %d)", gpx.week);
|
if (option_verbose) fprintf(stdout, " (W %d)", gpx.week);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
k = get_pseudorange();
|
if (almanac || ephem) {
|
||||||
if ((almanac || ephem) && (k >= 4)) {
|
k = get_pseudorange();
|
||||||
if (get_GPSkoord(k) > 0) {
|
if (k >= 4) {
|
||||||
fprintf(stdout, " ");
|
if (get_GPSkoord(k) > 0) {
|
||||||
if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
fprintf(stdout, " ");
|
||||||
else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
if (almanac) fprintf(stdout, " lat: %.4f lon: %.4f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
||||||
if (option_vergps) {
|
else fprintf(stdout, " lat: %.5f lon: %.5f alt: %.1f ", gpx.lat, gpx.lon, gpx.h);
|
||||||
if (option_vergps != 2) {
|
if (option_vergps) {
|
||||||
fprintf(stdout, " GDOP[%02d,%02d,%02d,%02d] %.1f",
|
if (option_vergps != 2) {
|
||||||
gpx.sats[0], gpx.sats[1], gpx.sats[2], gpx.sats[3], gpx.dop);
|
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[");
|
else {
|
||||||
for (j = 0; j < k; j++) {
|
fprintf(stdout, " GDOP[");
|
||||||
printf("%d", prn[j]);
|
for (j = 0; j < k; j++) {
|
||||||
if (j < k-1) printf(","); else printf("] %.1f ", gpx.dop);
|
printf("%d", prn[j]);
|
||||||
|
if (j < k-1) printf(","); else printf("] %.1f ", gpx.dop);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue