w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 04:28:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow click-to-decode for overlapping signals that are otherwise missed.

Browse Source
This commit is contained in:
Joe Taylor 2023-01-19 11:53:52 -05:00
parent 2992a37ae1
commit 824478697b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
q65w/libq65/getcand2.f90
View File

@ -1,4 +1,4 @@
subroutine getcand2(ss,savg0,nts_q65,cand,ncand)
subroutine getcand2(ss,savg0,nts_q65,nagain,ntol,f0_selected,cand,ncand)
! Get candidates for Q65 decodes, based on presence of sync tone.
@ -33,9 +33,15 @@ subroutine getcand2(ss,savg0,nts_q65,cand,ncand)
nb0=2*nts_q65 !Range of peak search, in bins
smin=1.4 !First threshold
nguard=5 !Guard range in bins
i1=1
i2=NFFT-nbw-nguard
if(nagain.eq.1) then
i1=nint((1000.0*f0_selected-ntol)/df)
i2=nint((1000.0*f0_selected+ntol)/df)
endif
j=0
do i=1,NFFT-nbw-nguard !Look for local peaks in average spectrum
do i=i1,i2 !Look for local peaks in average spectrum
if(savg(i).lt.smin) cycle
spk=maxval(savg(i:i+nb0))
ipk1=maxloc(savg(i:i+nb0))

10
q65w/libq65/q65wa.f90
View File

@ -36,9 +36,11 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
mfb=nfb-nkhz_center+48
mode_q65=nmode/10
nts_q65=2**(mode_q65-1) !Q65 tone separation factor
f0_selected=fselected - nkhz_center + 48.0
call timer('get_cand',0)
call getcand2(ss,savg,nts_q65,cand,ncand) !Get a list of decoding candidates
! Get a list of decoding candidates
call getcand2(ss,savg,nts_q65,nagain,ntol,f0_selected,cand,ncand)
call timer('get_cand',1)
nwrite_q65=0
@ -48,6 +50,7 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
foffset=0.001*(1270 + nfcal) !Offset from sync tone, plus CAL
fqso=mousefqso + foffset - 0.5*(nfa+nfb) + nfshift !fqso at baseband (khz)
nqd=0
nagain2=0
call timer('filbig ',0)
call filbig(dd,NSMAX,f0,newdat,nfsample,cx,n5) !Do the full-length FFT
@ -55,11 +58,6 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
do icand=1,ncand !Attempt to decode each candidate
f0=cand(icand)%f
! if(f0-mfa.lt.0.0 .or. f0-mfb.gt.0.0) cycle
! print*,'cc',nagain,ntol,fselected,f0+nkhz_center-48.0
if(nagain.eq.1 .and. abs(f0+nkhz_center-48.0 - fselected).gt.0.001*ntol) cycle
nagain2=0
! print*,'dd',nagain,ntol,fselected,f0+nkhz_center-48.0
freq=cand(icand)%f+nkhz_center-48.0-1.27046
ikhz=nint(freq)
idec=-1