w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.0.0-rc4' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc4

Browse Source
This commit is contained in:
Bill Somerville 2018-10-26 03:28:14 +01:00
commit e575cdd11b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fsk4hf/wsprsimf.f90
View File

@ -77,7 +77,7 @@ program wsprsim
c=c0 c=c0
if(nwav.eq.0) then if(nwav.eq.0) then
if( fspread .ne. 0.0 .or. delay .ne. 0.0 ) then if( fspread .ne. 0.0 .or. delay .ne. 0.0 ) then
call watterson(c,NMAX/NDOWN,fs,delay,fspread) call watterson(c,NMAX/NDOWN,NN*NSPS,fs,delay,fspread)
endif endif
c=c*sig c=c*sig
if(snrdb.lt.90) then if(snrdb.lt.90) then

2
lib/ft8/ft8sim.f90
View File

@ -102,7 +102,7 @@ program ft8sim
phi=mod(phi+dphi,twopi) phi=mod(phi+dphi,twopi)
enddo enddo
enddo enddo
if(fspread.ne.0.0 .or. delay.ne.0.0) call watterson(c0,NMAX,fs,delay,fspread) if(fspread.ne.0.0 .or. delay.ne.0.0) call watterson(c0,NMAX,NWAVE,fs,delay,fspread)
c=sig*c0 c=sig*c0
ib=k ib=k

9
lib/ft8/watterson.f90
View File

@ -1,5 +1,8 @@
subroutine watterson(c,npts,fs,delay,fspread) subroutine watterson(c,npts,nsig,fs,delay,fspread)
!
! npts is the total length of the simulated data vector
! nsig is the number of points that are occupied by signal
!
complex c(0:npts-1) complex c(0:npts-1)
complex c2(0:npts-1) complex c2(0:npts-1)
complex cs1(0:npts-1) complex cs1(0:npts-1)
@ -55,7 +58,7 @@ subroutine watterson(c,npts,fs,delay,fspread)
! write(61,3001) i/12000.0,c(i) ! write(61,3001) i/12000.0,c(i)
!3001 format(3f12.6) !3001 format(3f12.6)
enddo enddo
rms=sqrt(sq/npts) rms=sqrt(sq/nsig)
c=c/rms c=c/rms
return return