From dcbe163ecdd74258a0fa58f7a835548de83b9154 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 27 Nov 2012 20:49:33 +0000 Subject: [PATCH] Tweak to minimize spurious sync values (from QRN ??). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2778 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 10 ++++------ mainwindow.cpp | 2 +- wsjtx.iss | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 4cac45551..33d8c137d 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -78,15 +78,13 @@ subroutine decoder(ss,c0) fgood=0. nsps8=nsps/8 df8=1500.0/nsps8 - sbest=0. + sbest=-1.0 + dblim=db(864.0/nsps8) - 26.2 10 ii=maxloc(ccfred(ia:ib)) i=ii(1) + ia - 1 f=(i-1)*df3 if((i.eq.ipk .or. ccfred(i).ge.3.0) .and. abs(f-fgood).gt.10.0*df8) then -! call timer('spec9 ',0) -! call spec9(c0,npts8,nsps,f,fpk,xdt,snr,i1SoftSymbols) -! call timer('spec9 ',1) call timer('decode9a',0) fpk=1000.0 + df3*(i-1) @@ -99,11 +97,11 @@ subroutine decoder(ss,c0) call timer('decode9 ',1) sync=(syncpk-1.0)/2.0 - if(sync.lt.0.0) sync=0.0 + if(sync.lt.0.0 .or. snrdb.lt.dblim-2.0) sync=0.0 nsync=sync if(nsync.gt.10) nsync=10 nsnr=nint(snrdb) - + if(sync.gt.sbest .and. fgood.eq.0.0) then sbest=sync write(line,fmt) nutc,nsync,nsnr,xdt,freq,drift diff --git a/mainwindow.cpp b/mainwindow.cpp index b1642789c..04b7626f6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/wsjtx.iss b/wsjtx.iss index 112dfa809..6a9177515 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 0.4 r2746 +AppVerName=wsjtx Version 0.5 r2777 AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx DefaultGroupName=wsjtx