From eca274079dc5fa80fef244af40d1c50cc89bfce1 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 7 Sep 2012 15:22:56 +0000 Subject: [PATCH] Fix the A, C modes in decode1a.f. Still to do: compare full-length FFTs (maybe with smo() called?) and mode65-summed shorted FFTs. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2566 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- libm65/decode1a.f | 6 +++--- mainwindow.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libm65/decode1a.f b/libm65/decode1a.f index 555dab96e..c773bc784 100644 --- a/libm65/decode1a.f +++ b/libm65/decode1a.f @@ -85,8 +85,6 @@ sq0=aa*aa*sqa + bb*bb*sqb sync2=3.7*ccfbest/sq0 -! print*,n6,dt00,i0,nz,a(1),sync2 - ! Apply AFC corrections to the time-domain signal ! Now we are back to using the 1378.125 Hz sample rate, enough to ! accommodate the full JT65C bandwidth. @@ -124,7 +122,9 @@ do i=1,66 ! s2(i,k)=real(c5a(i))**2 + aimag(c5a(i))**2 jj=i - if(nfast.eq.1) jj=2*i-1 + if(nfast.eq.1 .and. mode65.eq.2) jj=2*i-1 + if(nfast.eq.2 .and. mode65.eq.4) jj=2*i-1 + if(nfast.eq.1 .and. mode65.eq.4) jj=4*i-3 s2(i,k)=real(c5a(jj))**2 + aimag(c5a(jj))**2 enddo else diff --git a/mainwindow.cpp b/mainwindow.cpp index 70822fd4b..c9dff6150 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"