From d1530b0c19d0a5de9ee8a2b61c273e75f7d84537 Mon Sep 17 00:00:00 2001 From: Steve Franke Date: Wed, 27 Nov 2019 09:08:17 -0600 Subject: [PATCH] Rename ft8sim files as follows: ft8sim_gfsk.f90 => ft8sim.f90 ft8sim.f90 => ft8sim_fsk.f90 This change reflects the fact that the GFSK waveform is now used in WSJT-X for ft8 and ft4. --- CMakeLists.txt | 8 +-- lib/ft8/ft8sim.f90 | 42 +++++------- lib/ft8/ft8sim_fsk.f90 | 141 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 30 deletions(-) create mode 100644 lib/ft8/ft8sim_fsk.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index b7ca1f3f2..f578ac270 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,8 +469,8 @@ set (wsjt_FSRCS lib/ft8/ft8_downsample.f90 lib/ft8.f90 lib/ft8dec.f90 + lib/ft8/ft8sim_fsk.f90 lib/ft8/ft8sim.f90 - lib/ft8/ft8sim_gfsk.f90 lib/gen4.f90 lib/gen65.f90 lib/gen9.f90 @@ -1306,12 +1306,12 @@ target_link_libraries (ft8code wsjt_fort wsjt_cxx) add_executable (ft8 lib/ft8.f90 wsjtx.rc) target_link_libraries (ft8 wsjt_fort wsjt_cxx) +add_executable (ft8sim_fsk lib/ft8/ft8sim_fsk.f90 wsjtx.rc) +target_link_libraries (ft8sim_fsk wsjt_fort wsjt_cxx) + add_executable (ft8sim lib/ft8/ft8sim.f90 wsjtx.rc) target_link_libraries (ft8sim wsjt_fort wsjt_cxx) -add_executable (ft8sim_gfsk lib/ft8/ft8sim_gfsk.f90 wsjtx.rc) -target_link_libraries (ft8sim_gfsk wsjt_fort wsjt_cxx) - add_executable (msk144sim lib/msk144sim.f90 wsjtx.rc) target_link_libraries (msk144sim wsjt_fort wsjt_cxx) diff --git a/lib/ft8/ft8sim.f90 b/lib/ft8/ft8sim.f90 index c5dd82bb7..4cca67e48 100644 --- a/lib/ft8/ft8sim.f90 +++ b/lib/ft8/ft8sim.f90 @@ -1,4 +1,4 @@ -program ft8sim +program ft8sim_gfsk ! Generate simulated "type 2" ft8 files ! Output is saved to a *.wav file. @@ -13,17 +13,19 @@ program ft8sim character c77*77 complex c0(0:NMAX-1) complex c(0:NMAX-1) + complex cwave(0:NWAVE-1) real wave(NMAX) + real xjunk(NWAVE) integer itone(NN) integer*1 msgbits(77) integer*2 iwave(NMAX) !Generated full-length waveform ! Get command-line argument(s) nargs=iargc() - if(nargs.ne.8) then - print*,'Usage: ft8sim "message" f0 DT fdop del width nfiles snr' - print*,'Examples: ft8sim "K1ABC W9XYZ EN37" 1500.0 0.0 0.1 1.0 0 10 -18' - print*,' ft8sim "WA9XYZ/R KA1ABC/R FN42" 1500.0 0.0 0.1 1.0 0 10 -18' + if(nargs.ne.7) then + print*,'Usage: ft8sim "message" f0 DT fdop del nfiles snr' + print*,'Examples: ft8sim "K1ABC W9XYZ EN37" 1500.0 0.0 0.1 1.0 10 -18' + print*,' ft8sim "WA9XYZ/R KA1ABC/R FN42" 1500.0 0.0 0.1 1.0 10 -18' print*,' ft8sim "K1ABC RR73; W9XYZ -11" 300 0 0 0 25 1 -10' go to 999 endif @@ -37,10 +39,8 @@ program ft8sim call getarg(5,arg) read(arg,*) delay !Watterson delay (ms) call getarg(6,arg) - read(arg,*) width !Filter transition width (Hz) - call getarg(7,arg) read(arg,*) nfiles !Number of files - call getarg(8,arg) + call getarg(7,arg) read(arg,*) snrdb !SNR_2500 nsig=1 @@ -57,6 +57,7 @@ program ft8sim baud=1.0/tt !Keying rate (baud) bw=8*baud !Occupied bandwidth (Hz) txt=NZ*dt !Transmission length (s) + bt=2.0 bandwidth_ratio=2500.0/(fs/2.0) sig=sqrt(2*bandwidth_ratio) * 10.0**(0.05*snrdb) if(snrdb.gt.90.0) sig=1.0 @@ -67,6 +68,7 @@ program ft8sim n3=-1 call pack77(msg37,i3,n3,c77) call genft8(msg37,i3,n3,msgsent37,msgbits,itone) + call gen_ft8wave(itone,NN,NSPS,bt,fs,f0,cwave,xjunk,1,NWAVE) !Generate complex cwave write(*,*) write(*,'(a23,a37,3x,a7,i1,a1,i1)') 'New Style FT8 Message: ',msgsent37,'i3.n3: ',i3,'.',n3 @@ -90,26 +92,15 @@ program ft8sim msg0=msg do ifile=1,nfiles - k=nint((xdt+0.5)/dt) - ia=max(1,k) - phi=0.0 - c0=0.0 - do j=1,NN !Generate complex waveform - dphi=twopi*(f0*dt+itone(j)/real(NSPS)) - do i=1,NSPS - if(k.ge.0 .and. k.lt.NMAX) c0(k)=cmplx(cos(phi),sin(phi)) - k=k+1 - phi=mod(phi+dphi,twopi) - enddo - enddo + c0=0. + c0(0:NWAVE-1)=cwave + c0=cshift(c0,-nint((xdt+0.5)/dt)) if(fspread.ne.0.0 .or. delay.ne.0.0) call watterson(c0,NMAX,NWAVE,fs,delay,fspread) c=sig*c0 - ib=min(k,NMAX) - wave=real(c) - peak=maxval(abs(wave(ia:ib))) + wave=imag(c) + peak=maxval(abs(wave)) nslots=1 - if(width.gt.0.0) call filt8(f0,nslots,width,wave) if(snrdb.lt.90) then do i=1,NMAX !Add gaussian noise at specified SNR @@ -128,7 +119,6 @@ program ft8sim endif if(any(abs(wave).gt.32767.0)) print*,"Warning - data will be clipped." iwave=nint(wave) - h=default_header(12000,NMAX) write(fname,1102) ifile 1102 format('000000_',i6.6,'.wav') @@ -138,4 +128,4 @@ program ft8sim write(*,1110) ifile,xdt,f0,snrdb,fname 1110 format(i4,f7.2,f8.2,f7.1,2x,a17) enddo -999 end program ft8sim +999 end program ft8sim_gfsk diff --git a/lib/ft8/ft8sim_fsk.f90 b/lib/ft8/ft8sim_fsk.f90 new file mode 100644 index 000000000..c5dd82bb7 --- /dev/null +++ b/lib/ft8/ft8sim_fsk.f90 @@ -0,0 +1,141 @@ +program ft8sim + +! Generate simulated "type 2" ft8 files +! Output is saved to a *.wav file. + + use wavhdr + use packjt77 + include 'ft8_params.f90' !Set various constants + parameter (NWAVE=NN*NSPS) + type(hdr) h !Header for .wav file + character arg*12,fname*17 + character msg37*37,msgsent37*37 + character c77*77 + complex c0(0:NMAX-1) + complex c(0:NMAX-1) + real wave(NMAX) + integer itone(NN) + integer*1 msgbits(77) + integer*2 iwave(NMAX) !Generated full-length waveform + +! Get command-line argument(s) + nargs=iargc() + if(nargs.ne.8) then + print*,'Usage: ft8sim "message" f0 DT fdop del width nfiles snr' + print*,'Examples: ft8sim "K1ABC W9XYZ EN37" 1500.0 0.0 0.1 1.0 0 10 -18' + print*,' ft8sim "WA9XYZ/R KA1ABC/R FN42" 1500.0 0.0 0.1 1.0 0 10 -18' + print*,' ft8sim "K1ABC RR73; W9XYZ -11" 300 0 0 0 25 1 -10' + go to 999 + endif + call getarg(1,msg37) !Message to be transmitted + call getarg(2,arg) + read(arg,*) f0 !Frequency (only used for single-signal) + call getarg(3,arg) + read(arg,*) xdt !Time offset from nominal (s) + call getarg(4,arg) + read(arg,*) fspread !Watterson frequency spread (Hz) + call getarg(5,arg) + read(arg,*) delay !Watterson delay (ms) + call getarg(6,arg) + read(arg,*) width !Filter transition width (Hz) + call getarg(7,arg) + read(arg,*) nfiles !Number of files + call getarg(8,arg) + read(arg,*) snrdb !SNR_2500 + + nsig=1 + if(f0.lt.100.0) then + nsig=f0 + f0=1500 + endif + + nfiles=abs(nfiles) + twopi=8.0*atan(1.0) + fs=12000.0 !Sample rate (Hz) + dt=1.0/fs !Sample interval (s) + tt=NSPS*dt !Duration of symbols (s) + baud=1.0/tt !Keying rate (baud) + bw=8*baud !Occupied bandwidth (Hz) + txt=NZ*dt !Transmission length (s) + bandwidth_ratio=2500.0/(fs/2.0) + sig=sqrt(2*bandwidth_ratio) * 10.0**(0.05*snrdb) + if(snrdb.gt.90.0) sig=1.0 + txt=NN*NSPS/12000.0 + + ! Source-encode, then get itone() + i3=-1 + n3=-1 + call pack77(msg37,i3,n3,c77) + call genft8(msg37,i3,n3,msgsent37,msgbits,itone) + + write(*,*) + write(*,'(a23,a37,3x,a7,i1,a1,i1)') 'New Style FT8 Message: ',msgsent37,'i3.n3: ',i3,'.',n3 + write(*,1000) f0,xdt,txt,snrdb,bw +1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, & + ' BW:',f4.1) + write(*,*) + if(i3.eq.1) then + write(*,*) ' mycall hiscall hisgrid' + write(*,'(28i1,1x,i1,1x,28i1,1x,i1,1x,i1,1x,15i1,1x,3i1)') msgbits(1:77) + else + write(*,'(a14)') 'Message bits: ' + write(*,'(77i1)') msgbits + endif + write(*,*) + write(*,'(a17)') 'Channel symbols: ' + write(*,'(79i1)') itone + write(*,*) + + call sgran() + + msg0=msg + do ifile=1,nfiles + k=nint((xdt+0.5)/dt) + ia=max(1,k) + phi=0.0 + c0=0.0 + do j=1,NN !Generate complex waveform + dphi=twopi*(f0*dt+itone(j)/real(NSPS)) + do i=1,NSPS + if(k.ge.0 .and. k.lt.NMAX) c0(k)=cmplx(cos(phi),sin(phi)) + k=k+1 + phi=mod(phi+dphi,twopi) + enddo + enddo + if(fspread.ne.0.0 .or. delay.ne.0.0) call watterson(c0,NMAX,NWAVE,fs,delay,fspread) + c=sig*c0 + + ib=min(k,NMAX) + wave=real(c) + peak=maxval(abs(wave(ia:ib))) + nslots=1 + if(width.gt.0.0) call filt8(f0,nslots,width,wave) + + if(snrdb.lt.90) then + do i=1,NMAX !Add gaussian noise at specified SNR + xnoise=gran() + wave(i)=wave(i) + xnoise + enddo + endif + + gain=100.0 + if(snrdb.lt.90.0) then + wave=gain*wave + else + datpk=maxval(abs(wave)) + fac=32766.9/datpk + wave=fac*wave + endif + if(any(abs(wave).gt.32767.0)) print*,"Warning - data will be clipped." + iwave=nint(wave) + + h=default_header(12000,NMAX) + write(fname,1102) ifile +1102 format('000000_',i6.6,'.wav') + open(10,file=fname,status='unknown',access='stream') + write(10) h,iwave !Save to *.wav file + close(10) + write(*,1110) ifile,xdt,f0,snrdb,fname +1110 format(i4,f7.2,f8.2,f7.1,2x,a17) + enddo +999 end program ft8sim