From 48b1ad1e461c30d5ab62bb804ff817ec18d9014e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 28 Oct 2021 15:19:40 -0400 Subject: [PATCH] Send xdt and xsnr from ft8_dec7 to ft8_decode. --- lib/ft8_decode.f90 | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 626284fc8..259ccc10c 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -237,22 +237,17 @@ contains do i=1,ndec(jseq,0) if(f0(i,jseq,0).eq.-99.0) exit if(f0(i,jseq,0).eq.-98.0) cycle -! f0(i,jseq,0)=527 -! msg0(i,jseq,0)='LX1KL OE6MDF' -! print*,'aa',i,jseq,newdat,f0(i,jseq,0),trim(msg0(i,jseq,0)) call ft8_downsample(dd,newdat,f0(i,jseq,0),cd0) - call ft8_dec7(cd0,dt0(i,jseq,0),f0(i,jseq,0),msg0(i,jseq,0),msg37,snr7) - if(snr7.gt.4.0) then -! print*,i,msg0(i,jseq,0)(1:22),msg37(1:22),snr7 + call ft8_dec7(cd0,dt0(i,jseq,0),f0(i,jseq,0),msg0(i,jseq,0), & + xdt,xsnr,msg37) + if(xsnr.gt.-99.0) then if(associated(this%callback)) then - nsnr=nint(db(snr7)-24.0) - xdt=0. + nsnr=nint(xsnr) f1=f0(i,jseq,0) iaptype=7 qual=1.0 call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual) endif - endif newdat=.false. enddo