From 22b782a4aee8ea40c1d688bea0de8cc01886b5aa Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 30 Jun 2020 20:04:44 -0400 Subject: [PATCH] Can now decode FST240W signals from WSJT-X, using FST240 and the option "Decode -> Also FST240W". --- lib/decoder.f90 | 3 ++- lib/fst240_decode.f90 | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index c6282c484..710c4844e 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -192,10 +192,11 @@ subroutine multimode_decoder(ss,id2,params,nfsample) ndepth=iand(params%ndepth,3) iwspr=0 if(iand(params%ndepth,128).ne.0) iwspr=2 +! if(iand(params%ndepth,128).ne.0) iwspr=1 call timer('dec240 ',0) call my_fst240%decode(fst240_decoded,id2,params%nutc, & params%nQSOProgress,params%nfqso,params%nfa,params%nfb, & - params%nsubmode,params%ndepth,params%ntr,params%nexp_decode, & + params%nsubmode,ndepth,params%ntr,params%nexp_decode, & params%ntol,params%nzhsym,params%emedelay, & logical(params%lapcqonly),params%napwid,mycall,hiscall, & params%nfsplit,iwspr) diff --git a/lib/fst240_decode.f90 b/lib/fst240_decode.f90 index 720d5ec8b..f340e8d29 100644 --- a/lib/fst240_decode.f90 +++ b/lib/fst240_decode.f90 @@ -238,7 +238,9 @@ contains r_data(nfft1+1:nfft1+2)=0.0 call four2a(r_data,nfft1,1,-1,0) c_bigfft=cmplx(r_data(1:nfft1+2:2),r_data(2:nfft1+2:2)) -iwspr=1 +! write(*,3001) iwspr,nfa,nfb,nfsplit,ndeep +!3001 format('a',5i5) +! iwspr=1 !### For hardwired tests ### if(iwspr.eq.0) then itype1=1 itype2=1