diff --git a/CMakeLists.txt b/CMakeLists.txt index b7ca1f3f2..6b3a4e010 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 @@ -487,6 +487,7 @@ set (wsjt_FSRCS lib/geodist.f90 lib/getlags.f90 lib/getmet4.f90 + lib/ft8/get_spectrum_baseline.f90 lib/ft2/gfsk_pulse.f90 lib/graycode.f90 lib/graycode65.f90 @@ -1248,9 +1249,9 @@ if (${OPENMP_FOUND} OR APPLE) ) endif (APPLE) if (WIN32) - # set_target_properties (jt9 PROPERTIES - # LINK_FLAGS -Wl,--stack,16777216 - # ) + set_target_properties (jt9 PROPERTIES + LINK_FLAGS -Wl,--stack,16777216 + ) endif () target_link_libraries (jt9 wsjt_fort_omp wsjt_cxx Qt5::Core) else (${OPENMP_FOUND} OR APPLE) @@ -1306,12 +1307,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/Transceiver/HamlibTransceiver.hpp b/Transceiver/HamlibTransceiver.hpp index bcc040d23..fcc17eeb9 100644 --- a/Transceiver/HamlibTransceiver.hpp +++ b/Transceiver/HamlibTransceiver.hpp @@ -10,13 +10,6 @@ #include "TransceiverFactory.hpp" #include "PollingTransceiver.hpp" -extern "C" -{ - typedef struct rig RIG; - struct rig_caps; - typedef int vfo_t; -} - // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class class HamlibTransceiver final : public PollingTransceiver diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 790f25515..14d10416c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -158,6 +158,7 @@ function (document) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_source_path}/${lang} COMMAND ${ASCIIDOCTOR_EXECUTABLE} ${_args_ASCIIDOCTOR_OPTIONS} -b html5 + -a nofooter -a VERSION_MAJOR=${WSJTX_VERSION_MAJOR} -a VERSION_MINOR=${WSJTX_VERSION_MINOR} -a VERSION_PATCH=${WSJTX_VERSION_PATCH} diff --git a/lib/ft8/baseline.f90 b/lib/ft8/baseline.f90 index 035f9ab4b..496795108 100644 --- a/lib/ft8/baseline.f90 +++ b/lib/ft8/baseline.f90 @@ -37,6 +37,7 @@ subroutine baseline(s,nfa,nfb,sbase) kz=k a=0. call polyfit(x,y,y,kz,nterms,0,a,chisqr) !Fit a low-order polynomial + sbase=0.0 do i=ia,ib t=i-i0 sbase(i)=a(1)+t*(a(2)+t*(a(3)+t*(a(4)+t*(a(5))))) + 0.65 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_gfsk.f90 b/lib/ft8/ft8sim_fsk.f90 similarity index 84% rename from lib/ft8/ft8sim_gfsk.f90 rename to lib/ft8/ft8sim_fsk.f90 index 4cca67e48..c5dd82bb7 100644 --- a/lib/ft8/ft8sim_gfsk.f90 +++ b/lib/ft8/ft8sim_fsk.f90 @@ -1,4 +1,4 @@ -program ft8sim_gfsk +program ft8sim ! Generate simulated "type 2" ft8 files ! Output is saved to a *.wav file. @@ -13,19 +13,17 @@ program ft8sim_gfsk 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.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' + 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 @@ -39,8 +37,10 @@ program ft8sim_gfsk call getarg(5,arg) read(arg,*) delay !Watterson delay (ms) call getarg(6,arg) - read(arg,*) nfiles !Number of files + 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 @@ -57,7 +57,6 @@ program ft8sim_gfsk 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 @@ -68,7 +67,6 @@ program ft8sim_gfsk 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 @@ -92,15 +90,26 @@ program ft8sim_gfsk msg0=msg do ifile=1,nfiles - c0=0. - c0(0:NWAVE-1)=cwave - c0=cshift(c0,-nint((xdt+0.5)/dt)) + 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 - wave=imag(c) - peak=maxval(abs(wave)) + 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 @@ -119,6 +128,7 @@ program ft8sim_gfsk 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') @@ -128,4 +138,4 @@ program ft8sim_gfsk write(*,1110) ifile,xdt,f0,snrdb,fname 1110 format(i4,f7.2,f8.2,f7.1,2x,a17) enddo -999 end program ft8sim_gfsk +999 end program ft8sim diff --git a/lib/ft8/get_spectrum_baseline.f90 b/lib/ft8/get_spectrum_baseline.f90 new file mode 100644 index 000000000..843e08c2c --- /dev/null +++ b/lib/ft8/get_spectrum_baseline.f90 @@ -0,0 +1,43 @@ +subroutine get_spectrum_baseline(dd,nfa,nfb,sbase) + + include 'ft8_params.f90' + parameter(NST=NFFT1/2,NF=NMAX/NST-1) + real s(NH1,NF) + real savg(NH1) + real sbase(NH1) + real x(NFFT1) + real window(NFFT1) + complex cx(0:NH1) + real dd(NMAX) + equivalence (x,cx) + logical first + data first/.true./ + save first,window + + if(first) then + first=.false. + pi=4.0*atan(1.) + window=0. + call nuttal_window(window,NFFT1) + window=window/sum(window)*NSPS*2/300.0 + endif + +! Compute symbol spectra, stepping by NSTEP steps. + savg=0. + df=12000.0/NFFT1 + do j=1,NF + ia=(j-1)*NST + 1 + ib=ia+NFFT1-1 + if(ib.gt.NMAX) exit + x=dd(ia:ib)*window + call four2a(x,NFFT1,1,-1,0) !r2c FFT + s(1:NH1,j)=abs(cx(1:NH1))**2 + savg=savg + s(1:NH1,j) !Average spectrum + enddo + + if(nfa.lt.nint(200.0)) nfa=nint(200.0) + if(nfb.gt.nint(4910.0)) nfb=nint(4910.0) + call baseline(savg,nfa,nfb,sbase) + +return +end subroutine get_spectrum_baseline diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90 index 219c6ebf1..3d2141c02 100644 --- a/lib/ft8/sync8.f90 +++ b/lib/ft8/sync8.f90 @@ -37,7 +37,8 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,s,candidate, & enddo savg=savg + s(1:NH1,j) !Average spectrum enddo - call baseline(savg,nfa,nfb,sbase) +! call baseline(savg,nfa,nfb,sbase) + call get_spectrum_baseline(dd,nfa,nfb,sbase) ia=max(1,nint(nfa/df)) ib=nint(nfb/df)