mirror
/
rtlsdr-wsprd
kopia lustrzana https://github.com/Guenael/rtlsdr-wsprd
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

chore: wsprd lib update

pull/111/head
Guenael 2021-12-22 22:58:27 -05:00
rodzic 7dc970ee74
commit df6e87068b
3 zmienionych plików z 15 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
Makefile
Wyświetl plik

@ -1,6 +1,6 @@
CC = clang CC = clang
CFLAGS = -O3 -std=gnu17 -Wall CFLAGS = -O3 -std=gnu17
LIBS = -lusb-1.0 -lrtlsdr -lpthread -lfftw3f -lcurl -lm -Wall LIBS = -lusb-1.0 -lrtlsdr -lpthread -lfftw3f -lcurl -lm
# Note # Note
# gcc is a bit faster that clang on this app # gcc is a bit faster that clang on this app

2
wsprd/wsprd_utils.c
Wyświetl plik

@ -297,7 +297,7 @@ int unpk_(signed char *message, char *hashtab, char *loctab, char *call_loc_pow,
strncat(call_loc_pow, cdbm, 2); strncat(call_loc_pow, cdbm, 2);
strncat(call_loc_pow, "\0", 1); strncat(call_loc_pow, "\0", 1);
int nu = ndbm % 10; int nu = ndbm % 10;
if (nu == 0 || nu == 3 || nu == 7 || nu == 10) { // make sure power is OK if (nu == 0 || nu == 3 || nu == 7) { // make sure power is OK
ihash = nhash(callsign, strlen(callsign), (uint32_t)146); ihash = nhash(callsign, strlen(callsign), (uint32_t)146);
strcpy(hashtab + ihash * 13, callsign); strcpy(hashtab + ihash * 13, callsign);
} else } else

23
wsprd/wsprsim_utils.c
Wyświetl plik

@ -164,16 +164,17 @@ int get_wspr_channel_symbols(char *rawmessage, char *hashtab, char *loctab, unsi
int m = 0, ntype = 0; int m = 0, ntype = 0;
long unsigned int n = 0; long unsigned int n = 0;
int i, j, ihash; int i, j, ihash;
unsigned char pr3[162] = unsigned char pr3vector[162] = {
{1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0,
0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1,
0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,
1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1,
0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0,
0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1,
0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,
0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0,
0, 0}; 0, 0 };
int nu[10] = {0, -1, 1, 0, -1, 2, 1, 0, -1, 1}; int nu[10] = {0, -1, 1, 0, -1, 2, 1, 0, -1, 1};
char *callsign, *grid, *powstr; char *callsign, *grid, *powstr;
char grid4[5], message[23]; char grid4[5], message[23];
@ -297,7 +298,7 @@ int get_wspr_channel_symbols(char *rawmessage, char *hashtab, char *loctab, unsi
interleave(channelbits); interleave(channelbits);
for (i = 0; i < 162; i++) { for (i = 0; i < 162; i++) {
symbols[i] = 2 * channelbits[i] + pr3[i]; symbols[i] = 2 * channelbits[i] + pr3vector[i];
} }
free(check_call_loc_pow); free(check_call_loc_pow);
free(check_callsign); free(check_callsign);