w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-26 06:08:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Send required parameters to qra64_dec().

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-11-07 16:58:37 +00:00
parent fe0aa5f9a6
commit bf8e290bbd
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/qra/qra64/qra64_subs.c
View File

@ -15,7 +15,8 @@ void qra64_enc_(int x[], int y[])
} }
void qra64_dec_(float r[], int* nc1, int* nc2, int* ng2, int* APtype, void qra64_dec_(float r[], int* nc1, int* nc2, int* ng2, int* APtype,
int* iset, int xdec[], float* snr, int* rc) int* iset, int* ns0, float* b0, int* nf0,
int xdec[], float* snr, int* rc)
{ {
/* /*
APtype: APtype:
@ -43,9 +44,9 @@ void qra64_dec_(float r[], int* nc1, int* nc2, int* ng2, int* APtype,
static int nc1z=-1; static int nc1z=-1;
float EbNodBEstimated; float EbNodBEstimated;
int err=0; int err=0;
int nSubmode=0; int nSubmode=*ns0;
int nFadingModel=1; float b90=*b0;
float b90=1.0; int nFadingModel=*nf0;
#ifdef NICO_WANTS_SNR_DUMP #ifdef NICO_WANTS_SNR_DUMP
FILE *fout; FILE *fout;

9
lib/qra64a.f90
View File

@ -27,9 +27,13 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mode64,mycall_12,hiscall_12, &
call packcall(mycall,nc1,ltext) call packcall(mycall,nc1,ltext)
call packcall(hiscall,nc2,ltext) call packcall(hiscall,nc2,ltext)
call packgrid(hisgrid,ng2,ltext) call packgrid(hisgrid,ng2,ltext)
nSubmode=nint(log(float(mode64)/log(2.0)))
b90=1.0
nFadingModel=1
if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z) then if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z) then
do naptype=0,5 do naptype=0,5
call qra64_dec(s3,nc1,nc2,ng2,naptype,1,dat4,snr2,irc) call qra64_dec(s3,nc1,nc2,ng2,naptype,1,nSubmode,b90, &
nFadingModel,dat4,snr2,irc)
enddo enddo
nc1z=nc1 nc1z=nc1
nc2z=nc2 nc2z=nc2
@ -55,7 +59,8 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mode64,mycall_12,hiscall_12, &
a(2)=-0.67*(idf1 + 0.67*kpk) a(2)=-0.67*(idf1 + 0.67*kpk)
call twkfreq(c00,c0,npts2,4000.0,a) call twkfreq(c00,c0,npts2,4000.0,a)
call spec64(c0,npts2,mode64,jpk,s3,LL,NN) call spec64(c0,npts2,mode64,jpk,s3,LL,NN)
call qra64_dec(s3,nc1,nc2,ng2,naptype,0,dat4,snr2,irc) call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90, &
nFadingModel,dat4,snr2,irc)
decoded=' ' decoded=' '
if(irc.ge.0) then if(irc.ge.0) then
call unpackmsg(dat4,decoded) !Unpack the user message call unpackmsg(dat4,decoded) !Unpack the user message

2
lib/spec64.f90
View File

@ -6,8 +6,6 @@ subroutine spec64(c0,npts2,mode64,jpk,s3,LL,NN)
real s3(LL,NN) !Synchronized symbol spectra real s3(LL,NN) !Synchronized symbol spectra
nfft6=nsps nfft6=nsps
fsample=4000.0
df=fsample/nfft6
do j=1,63 do j=1,63
jj=j+7 !Skip first Costas array jj=j+7 !Skip first Costas array
if(j.ge.32) jj=j+14 !Skip middle Costas array if(j.ge.32) jj=j+14 !Skip middle Costas array