w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-26 15:16:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

For the user, define FST280 frequency as that of the lowest tone.

Browse Source
This commit is contained in:
Joe Taylor 2020-06-19 11:57:49 -04:00
parent acd04cc050
commit b2ae563a7d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/fst280/fst280sim.f90
View File

@ -28,7 +28,7 @@ program fst280sim
call getarg(2,arg) call getarg(2,arg)
read(arg,*) nsec !TR sequence length, seconds read(arg,*) nsec !TR sequence length, seconds
call getarg(3,arg) call getarg(3,arg)
read(arg,*) f0 !Frequency (only used for single-signal) read(arg,*) f00 !Frequency (only used for single-signal)
call getarg(4,arg) call getarg(4,arg)
read(arg,*) xdt !Time offset from nominal (s) read(arg,*) xdt !Time offset from nominal (s)
call getarg(5,arg) call getarg(5,arg)
@ -46,7 +46,6 @@ program fst280sim
twopi=8.0*atan(1.0) twopi=8.0*atan(1.0)
fs=12000.0 !Sample rate (Hz) fs=12000.0 !Sample rate (Hz)
dt=1.0/fs !Sample interval (s) dt=1.0/fs !Sample interval (s)
baud=1.0/tt !Keying rate (baud)
nsps=0 nsps=0
if(nsec.eq.15) nsps=800 if(nsec.eq.15) nsps=800
if(nsec.eq.30) nsps=1680 if(nsec.eq.30) nsps=1680
@ -57,6 +56,7 @@ program fst280sim
print*,'Invalid TR sequence length.' print*,'Invalid TR sequence length.'
go to 999 go to 999
endif endif
baud=12000.0/nsps !Keying rate (baud)
nmax=nsec*12000 nmax=nsec*12000
nz=nsps*NN nz=nsps*NN
nz2=nsps*NN2 nz2=nsps*NN2
@ -78,7 +78,7 @@ program fst280sim
write(*,*) write(*,*)
write(*,'(a9,a37)') 'Message: ',msgsent37 write(*,'(a9,a37)') 'Message: ',msgsent37
write(*,1000) f0,xdt,hmod,txt,snrdb write(*,1000) f00,xdt,hmod,txt,snrdb
1000 format('f0:',f9.3,' DT:',f6.2,' hmod:',i6,' TxT:',f6.1,' SNR:',f6.1) 1000 format('f0:',f9.3,' DT:',f6.2,' hmod:',i6,' TxT:',f6.1,' SNR:',f6.1)
write(*,*) write(*,*)
if(i3.eq.1) then if(i3.eq.1) then
@ -97,6 +97,7 @@ program fst280sim
fsample=12000.0 fsample=12000.0
icmplx=1 icmplx=1
f0=f00+1.5*hmod*baud
call gen_fst280wave(itone,NN,nsps,nmax,fsample,hmod,f0,icmplx,c0,wave) call gen_fst280wave(itone,NN,nsps,nmax,fsample,hmod,f0,icmplx,c0,wave)
k=nint((xdt+1.0)/dt)-nsps k=nint((xdt+1.0)/dt)-nsps
c0=cshift(c0,-k) c0=cshift(c0,-k)
@ -135,7 +136,7 @@ program fst280sim
open(10,file=trim(fname),status='unknown',access='stream') open(10,file=trim(fname),status='unknown',access='stream')
write(10) h,iwave !Save to *.wav file write(10) h,iwave !Save to *.wav file
close(10) close(10)
write(*,1110) ifile,xdt,f0,snrdb,fname write(*,1110) ifile,xdt,f00,snrdb,fname
1110 format(i4,f7.2,f8.2,f7.1,2x,a17) 1110 format(i4,f7.2,f8.2,f7.1,2x,a17)
enddo enddo

5
lib/fst280_decode.f90
View File

@ -89,7 +89,7 @@ contains
dt=1.0/fs !Sample interval (s) dt=1.0/fs !Sample interval (s)
dt2=1.0/fs2 dt2=1.0/fs2
tt=nsps*dt !Duration of "itone" symbols (s) tt=nsps*dt !Duration of "itone" symbols (s)
baud=1.0/tt
nfft1=2*int(nmax/2) nfft1=2*int(nmax/2)
nh1=nfft1/2 nh1=nfft1/2
allocate( r_data(1:nfft1+2) ) allocate( r_data(1:nfft1+2) )
@ -261,7 +261,8 @@ contains
nsnr=nint(xsnr) nsnr=nint(xsnr)
iaptype=0 iaptype=0
qual=0. qual=0.
call this%callback(nutc,smax1,nsnr,xdt,fc_synced,msg, & fsig=fc_synced - 1.5*hmod*baud
call this%callback(nutc,smax1,nsnr,xdt,fsig,msg, &
iaptype,qual) iaptype,qual)
goto 2002 goto 2002
else else