rs41: ecc2 errors

pull/8/head
Zilog80 2018-06-30 23:29:40 +02:00
rodzic 5c5d5c1fc2
commit 1a3a803e8a
2 zmienionych plików z 28 dodań i 4 usunięć

Wyświetl plik

@ -975,7 +975,12 @@ int rs41_ecc(int frmlen) {
ret = errors1 + errors2;
if (errors1 < 0 || errors2 < 0) ret = -1;
if (errors1 < 0 || errors2 < 0) {
ret = 0;
if (errors1 < 0) ret |= 0x1;
if (errors2 < 0) ret |= 0x2;
ret = -ret;
}
return ret;
}
@ -1051,7 +1056,14 @@ int print_position(int ec) {
for (i=0; i<5; i++) fprintf(stdout, "%d", (gpx.crc>>i)&1);
fprintf(stdout, "]");
}
if (option_ecc == 2 && ec > 0) fprintf(stdout, " (%d)", ec);
if (option_ecc == 2) {
if (ec > 0) fprintf(stdout, " (%d)", ec);
if (ec < 0) {
if (ec == -1) fprintf(stdout, " (-+)");
else if (ec == -2) fprintf(stdout, " (+-)");
else /*ec == -3*/ fprintf(stdout, " (--)");
}
}
}
}

Wyświetl plik

@ -1206,7 +1206,12 @@ int rs41_ecc(int frmlen) {
ret = errors1 + errors2;
if (errors1 < 0 || errors2 < 0) ret = -1;
if (errors1 < 0 || errors2 < 0) {
ret = 0;
if (errors1 < 0) ret |= 0x1;
if (errors2 < 0) ret |= 0x2;
ret = -ret;
}
return ret;
}
@ -1282,7 +1287,14 @@ int print_position(int ec) {
for (i=0; i<5; i++) fprintf(stdout, "%d", (gpx.crc>>i)&1);
fprintf(stdout, "]");
}
if (option_ecc == 2 && ec > 0) fprintf(stdout, " (%d)", ec);
if (option_ecc == 2) {
if (ec > 0) fprintf(stdout, " (%d)", ec);
if (ec < 0) {
if (ec == -1) fprintf(stdout, " (-+)");
else if (ec == -2) fprintf(stdout, " (+-)");
else /*ec == -3*/ fprintf(stdout, " (--)");
}
}
}
}