From 2e19f512ae7a9a60a8f293b9612cd29d960155b7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 28 Nov 2012 12:47:42 +0000 Subject: [PATCH] Bring the "stand-alone" part of JT9 up to date. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2780 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/jt9.f90 | 13 ++++++------- mainwindow.cpp | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 4dbaac116..2ae92964c 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -130,20 +130,19 @@ program jt9 f=(i-1)*df3 if((i.eq.ipk .or. ccfred(i).ge.3.0) .and. f.gt.fgood+10.0*df8) then - call timer('test9 ',0) + call timer('decode9a',0) fpk=1000.0 + df3*(i-1) c1(1:npts8)=conjg(c0(1:npts8)) - call test9(c1,npts8,nsps8,fpk,syncpk,snrdb,xdt,freq,drift, & - i1SoftSymbols) - call timer('test9 ',1) - + call decode9a(c1,npts8,nsps8,fpk,syncpk,snrdb,xdt,freq, & + drift,i1SoftSymbols) + call timer('decode9a',1) call timer('decode9 ',0) call decode9(i1SoftSymbols,limit,nlim,msg) 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) diff --git a/mainwindow.cpp b/mainwindow.cpp index 555e5db69..04b7626f6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//---------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"