w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-04 16:31:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks for code cleanup.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7786 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-07-06 14:19:39 +00:00
parent aaeb59544c
commit ca8e9502b2
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fsk4hf/ft8_downsample.f90
View File

@ -2,7 +2,7 @@ subroutine ft8_downsample(dd,newdat,f0,c1)
! Downconvert to complex data sampled at 200 Hz ==> 32 samples/symbol ! Downconvert to complex data sampled at 200 Hz ==> 32 samples/symbol
parameter (NMAX=15*12000) parameter (NMAX=15*12000,NSPS=1920)
parameter (NFFT1=192000,NFFT2=3200) !192000/60 = 3200 parameter (NFFT1=192000,NFFT2=3200) !192000/60 = 3200
logical newdat logical newdat
@ -21,7 +21,7 @@ subroutine ft8_downsample(dd,newdat,f0,c1)
endif endif
df=12000.0/NFFT1 df=12000.0/NFFT1
baud=12000.0/1920.0 baud=12000.0/NSPS
i0=nint(f0/df) i0=nint(f0/df)
ft=f0+8.0*baud ft=f0+8.0*baud
it=min(nint(ft/df),NFFT1/2) it=min(nint(ft/df),NFFT1/2)

3
lib/fsk4hf/ft8_params.f90
View File

@ -7,4 +7,5 @@ parameter (NSPS=1920) !Samples per symbol at 12000 S/s
parameter (NZ=NSPS*NN) !Samples in full 15 s waveform (151,680) parameter (NZ=NSPS*NN) !Samples in full 15 s waveform (151,680)
parameter (NMAX=15*12000) !Samples in iwave (180,000) parameter (NMAX=15*12000) !Samples in iwave (180,000)
parameter (NFFT1=2*NSPS, NH1=NFFT1/2) !Length of FFTs for symbol spectra parameter (NFFT1=2*NSPS, NH1=NFFT1/2) !Length of FFTs for symbol spectra
parameter (NHSYM=2*NMAX/NH1-1) !Number of symbol spectra (1/2-symbol steps) parameter (NHSYM=2*NMAX/NH1-1) !Number of symbol spectra (1/2-sym steps)
parameter (NDOWN=60) !Downsample factor

2
lib/fsk4hf/ft8b.f90
View File

@ -19,7 +19,7 @@ subroutine ft8b(dd0,newdat,nfqso,f1,xdt,nharderrors,dmin,nbadcrc,message,xsnr)
max_iterations=40 max_iterations=40
norder=2 norder=2
fs2=12000.0/60.0 fs2=12000.0/NDOWN
dt2=1.0/fs2 dt2=1.0/fs2
twopi=8.0*atan(1.0) twopi=8.0*atan(1.0)
delfbest=0. delfbest=0.

4
lib/fsk4hf/sync8d.f90
View File

@ -2,7 +2,7 @@ subroutine sync8d(cd0,i0,ctwk,itwk,sync)
! Compute sync power for a complex, downsampled FT8 signal. ! Compute sync power for a complex, downsampled FT8 signal.
parameter(NP2=2812) parameter(NP2=2812,NDOWN=60)
complex cd0(3125) complex cd0(3125)
complex csync(0:6,32) complex csync(0:6,32)
complex csync2(32) complex csync2(32)
@ -19,7 +19,7 @@ subroutine sync8d(cd0,i0,ctwk,itwk,sync)
! Set some constants and compute the csync array. ! Set some constants and compute the csync array.
if( first ) then if( first ) then
twopi=8.0*atan(1.0) twopi=8.0*atan(1.0)
fs2=12000.0/60.0 !Sample rate after downsampling fs2=12000.0/NDOWN !Sample rate after downsampling
dt2=1/fs2 !Corresponding sample interval dt2=1/fs2 !Corresponding sample interval
taus=32*dt2 !Symbol duration taus=32*dt2 !Symbol duration
baud=1.0/taus !Keying rate baud=1.0/taus !Keying rate