RS92: --exsat <n>, n=1..32, exclude single satellite

dump
Zilog80 2016-10-06 14:52:28 +02:00
rodzic d0e3caa0e9
commit 26bf4198bd
2 zmienionych plików z 22 dodań i 2 usunięć

Wyświetl plik

@ -117,6 +117,8 @@ int rollover = 0,
int almanac = 0,
ephem = 0;
int exSat = -1;
/* --- RS92-SGP: 8N1 manchester --- */
#define BITS (2*(1+8+1)) // 20
#define HEADOFS 40 // HEADOFS+HEADLEN = 120 (bis 0x10)
@ -870,7 +872,7 @@ int get_pseudorange() {
if ( dist(sat[prns[j]].X, sat[prns[j]].Y, sat[prns[j]].Z, 0, 0, 0) > 6700000 )
{
for (i = 0; i < k; i++) { if (prn[i] == prns[j]) break; }
if (i == k) {
if (i == k && prns[j] != exSat) {
prn[k] = prns[j];
k++;
}
@ -1212,6 +1214,14 @@ int main(int argc, char *argv[]) {
}
else return -1;
}
else if ( (strcmp(*argv, "--exsat") == 0) ) {
++argv;
if (*argv) {
exSat = atoi(*argv);
if (exSat < 1 || exSat > 32) return -1;
}
else return -1;
}
else if (strcmp(*argv, "-g1") == 0) { option_vergps = 1; } // verbose1 GPS
else if (strcmp(*argv, "-g2") == 0) { option_vergps = 2; } // verbose2 GPS (bancroft)
else if (strcmp(*argv, "-gg") == 0) { option_vergps = 8; } // vverbose GPS

Wyświetl plik

@ -87,6 +87,8 @@ int rollover = 0,
int almanac = 0,
ephem = 0;
int exSat = -1;
/* --- RS92-SGP: 8N1 manchester --- */
#define BITS (2*(1+8+1)) // 20
#define HEADOFS 40 // HEADOFS+HEADLEN = 120 (bis 0x10)
@ -840,7 +842,7 @@ int get_pseudorange() {
if ( dist(sat[prns[j]].X, sat[prns[j]].Y, sat[prns[j]].Z, 0, 0, 0) > 6700000 )
{
for (i = 0; i < k; i++) { if (prn[i] == prns[j]) break; }
if (i == k) {
if (i == k && prns[j] != exSat) {
prn[k] = prns[j];
k++;
}
@ -1130,6 +1132,14 @@ int main(int argc, char *argv[]) {
}
else return -1;
}
else if ( (strcmp(*argv, "--exsat") == 0) ) {
++argv;
if (*argv) {
exSat = atoi(*argv);
if (exSat < 1 || exSat > 32) return -1;
}
else return -1;
}
else if (strcmp(*argv, "-g1") == 0) { option_vergps = 1; } // verbose1 GPS
else if (strcmp(*argv, "-g2") == 0) { option_vergps = 2; } // verbose2 GPS (bancroft)
else if (strcmp(*argv, "-gg") == 0) { option_vergps = 8; } // vverbose GPS