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

Generation of FT4 Tx waveform from itone() moved to a separate subroutine.

Browse Source
This commit is contained in:
Joe Taylor 2019-01-31 16:07:07 -05:00
parent b32799d2b8
commit 9c2700128c
3 changed files with 60 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -463,6 +463,7 @@ set (wsjt_FSRCS
lib/genmsk_128_90.f90
lib/genmsk40.f90
lib/ft4/genft4.f90
lib/ft4/gen_ft4wave.f90
lib/genqra64.f90
lib/ft8/genft8refsig.f90
lib/genwspr.f90

43
lib/ft4/ft4sim_mult.f90
View File

@ -10,10 +10,9 @@ program ft4sim_mult
type(hdr) h !Header for .wav file
character arg*12,fname*17,cjunk*4
character msg37*37,msgsent37*37,c77*77
real wave0((NN+2)*NSPS)
real wave(NZZ)
real tmp(NZZ)
real dphi(0:NMAX-1)
real pulse(3*NSPS)
integer itone(NN)
integer*2 iwave(NZZ) !Generated full-length waveform
integer icos4(4)
@ -41,12 +40,6 @@ program ft4sim_mult
bandwidth_ratio=2500.0/(fs/2.0)
txt=NN*NSPS/12000.0
xdtmax=10.0 - 0.086
! Compute the filtered frequency pulse
do i=1,3*NSPS
tt=(i-1.5*NSPS)/real(NSPS)
pulse(i)=gfsk_pulse(1.0,tt)
enddo
open(10,file='messages.txt',status='old',err=998)
do ifile=1,nfiles
@ -70,36 +63,14 @@ program ft4sim_mult
n3=-1
call pack77(msg37,i3,n3,c77)
call genft4(msg37,0,msgsent37,itone)
nwave0=(NN+2)*NSPS
call gen_ft4wave(itone,NN,NSPS,12000.0,f0,wave0,nwave0)
! Compute the smoothed frequency waveform.
! Length = (NN+2)*NSPS samples, zero-padded to NMAX
dphi_peak=twopi*hmod/real(NSPS)
dphi=0.0
do j=1,NN
ib=(j-1)*NSPS
ie=ib+3*NSPS-1
dphi(ib:ie) = dphi(ib:ie) + dphi_peak*pulse*itone(j)
enddo
! Calculate and insert the audio waveform
phi=0.0
dphi = dphi + twopi*f0*dt !Shift frequency up by f0
tmp=0.
k0=nint(xdt/dt)
k=k0-1
do j=0,NMAX-1
k=k+1
tmp(k)=sin(phi)
phi=mod(phi+dphi(j),twopi)
enddo
k1=k0+(NN+1)*NSPS
! Compute the ramp-up and ramp-down symbols
tmp(k0:k0+NSPS-1)=tmp(k0:k0+NSPS-1) * &
(1.0-cos(twopi*(/(i,i=0,NSPS-1)/)/(2.0*NSPS)))/2.0
tmp(k1:k1+NSPS-1)=tmp(k1:k1+NSPS-1) * &
(1.0+cos(twopi*(/(i,i=0,NSPS-1)/)/(2.0*NSPS)))/2.0
tmp(k1+NSPS:)=0.
if(k0.lt.1) k0=1
tmp(:k0-1)=0.0
tmp(k0:k0+nwave0-1)=wave0
tmp(k0+nwave0:)=0.0
! Insert this signal into wave() array
sig=sqrt(2*bandwidth_ratio) * 10.0**(0.05*isnr)

52
lib/ft4/gen_ft4wave.f90 Normal file
View File

@ -0,0 +1,52 @@
subroutine gen_ft4wave(itone,nsym,nsps,fsample,f0,wave,nwave)
real wave(nwave)
real pulse(6144) !512*4*3
real dphi(0:240000-1)
integer itone(nsym)
logical first
data first/.true./
save pulse,first,twopi,dt,hmod
if(first) then
twopi=8.0*atan(1.0)
dt=1.0/fsample
hmod=1.0
! Compute the frequency-smoothing pulse
do i=1,3*nsps
tt=(i-1.5*nsps)/real(nsps)
pulse(i)=gfsk_pulse(1.0,tt)
enddo
first=.false.
endif
! Compute the smoothed frequency waveform.
! Length = (nsym+2)*nsps samples, zero-padded
dphi_peak=twopi*hmod/real(nsps)
dphi=0.0
do j=1,nsym
ib=(j-1)*nsps
ie=ib+3*nsps-1
dphi(ib:ie) = dphi(ib:ie) + dphi_peak*pulse(1:3*nsps)*itone(j)
enddo
! Calculate and insert the audio waveform
phi=0.0
dphi = dphi + twopi*f0*dt !Shift frequency up by f0
wave=0.
k=0
do j=0,nwave-1
k=k+1
wave(k)=sin(phi)
phi=mod(phi+dphi(j),twopi)
enddo
! Compute the ramp-up and ramp-down symbols
wave(1:nsps)=wave(1:nsps) * &
(1.0-cos(twopi*(/(i,i=0,nsps-1)/)/(2.0*nsps)))/2.0
k1=(nsym+1)*nsps+1
wave(k1:k1+nsps-1)=wave(k1:k1+nsps-1) * &
(1.0+cos(twopi*(/(i,i=0,nsps-1)/)/(2.0*nsps)))/2.0
return
end subroutine gen_ft4wave