w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-24 22:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in wspr callsign packing that affected wsprsim and signal subtraction for a subset of callsigns.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7090 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-09-16 19:38:18 +00:00
parent b15e3aed04
commit 538f814905
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wsprd/wsprd_utils.c
View File

@ -74,7 +74,7 @@ int unpackcall( int32_t ncall, char *call )
int32_t n; int32_t n;
int i; int i;
char tmp[7]; char tmp[7];
n=ncall; n=ncall;
strcpy(call,"......"); strcpy(call,"......");
if (n < 262177560 ) { if (n < 262177560 ) {
@ -251,7 +251,7 @@ int unpk_(signed char *message, char *hashtab, char *call_loc_pow, char *callsig
int ntype = (n2&127) - 64; int ntype = (n2&127) - 64;
callsign[12]=0; callsign[12]=0;
grid[4]=0; grid[4]=0;
/* /*
Based on the value of ntype, decide whether this is a Type 1, 2, or Based on the value of ntype, decide whether this is a Type 1, 2, or
3 message. 3 message.

8
lib/wsprd/wsprsim_utils.c
View File

@ -41,7 +41,7 @@ long unsigned int pack_grid4_power(char *grid4, int power) {
} }
long unsigned int pack_call(char *callsign) { long unsigned int pack_call(char *callsign) {
int i; unsigned int i;
long unsigned int n; long unsigned int n;
char call6[6]; char call6[6];
memset(call6,32,sizeof(char)*6); memset(call6,32,sizeof(char)*6);
@ -51,7 +51,7 @@ long unsigned int pack_call(char *callsign) {
return 0; return 0;
} }
if( isdigit(*(callsign+2)) ) { if( isdigit(*(callsign+2)) ) {
for (i=0; i<6; i++) { for (i=0; i<call_len; i++) {
if( callsign[i] == 0 ) { if( callsign[i] == 0 ) {
call6[i]=32; call6[i]=32;
} else { } else {
@ -59,7 +59,7 @@ long unsigned int pack_call(char *callsign) {
} }
} }
} else if( isdigit(*(callsign+1)) ) { } else if( isdigit(*(callsign+1)) ) {
for (i=0; i<6; i++) { for (i=0; i<call_len; i++) {
if( i==0 || callsign[i-1]==0 ) { if( i==0 || callsign[i-1]==0 ) {
call6[i]=32; call6[i]=32;
} else { } else {
@ -285,8 +285,6 @@ int get_wspr_channel_symbols(char* rawmessage, char* hashtab, unsigned char* sym
// make sure that the 11-byte data vector is unpackable // make sure that the 11-byte data vector is unpackable
// unpack it with the routine that the decoder will use and display // unpack it with the routine that the decoder will use and display
// the result. let the operator decide whether it worked. // the result. let the operator decide whether it worked.
// char hashtab[32768][13];
// memset(hashtab,0,sizeof(char)*32768*13);
char *check_call_loc_pow, *check_callsign; char *check_call_loc_pow, *check_callsign;
check_call_loc_pow=malloc(sizeof(char)*23); check_call_loc_pow=malloc(sizeof(char)*23);