diff --git a/libm65/map65a.f90 b/libm65/map65a.f90 index c02efd9c3..8cc0c2349 100644 --- a/libm65/map65a.f90 +++ b/libm65/map65a.f90 @@ -34,10 +34,9 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & mode65=mod(nmode,10) if(mode65.eq.3) mode65=4 - modeqra64=nmode/10 + mode64=nmode/10 nwrite_qra64=0 - - bqra64=modeqra64.gt.0 + bqra64=mode64.gt.0 mcall3a=mcall3b mousefqso0=mousefqso xpol=(nxpol.ne.0) @@ -217,7 +216,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & ifreq=i ikHz=nint(freq+0.5*(nfa+nfb)-foffset)-nfshift idf=nint(1000.0*(freq+0.5*(nfa+nfb)-foffset-(ikHz+nfshift))) - call decode1a(dd,newdat,f00,nflip,mode65,nfsample, & + call decode1a(dd,newdat,f00,nflip,mode65,nfsample, & xpol,mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi, & ndphi,iloop,nutc,ikHz,idf,ipol,ntol,bqra64,sync2, & a,dt,pol,nkv,nhist,nsum,nsave,qual,decoded) @@ -225,7 +224,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & if(nqd.eq.2) then call timer('qra64 ',0) call qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall, & - hiscall,hisgrid,nwrite_qra64) + hiscall,hisgrid,mode64,nwrite_qra64) call timer('qra64 ',1) cycle endif diff --git a/libm65/qra64b.f90 b/libm65/qra64b.f90 index fcf9b6bfa..a8b43c1ea 100644 --- a/libm65/qra64b.f90 +++ b/libm65/qra64b.f90 @@ -1,5 +1,5 @@ subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, & - hisgrid_6,nwrite_qra64) + hisgrid_6,mode64,nwrite_qra64) parameter (NFFT1=5376000) !56*96000 parameter (NFFT2=336000) !56*6000 (downsampled by 1/16) @@ -33,7 +33,7 @@ subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, & call four2a(cy,NFFT2,1,-1,1) call qra64c(cx,cy,nutc,nqd,ikhz,mousedf,ntol,xplo,mycall_12, & - hiscall_12,hisgrid_6,nwrite_qra64) + hiscall_12,hisgrid_6,mode64,nwrite_qra64) close(17) return diff --git a/libm65/qra64c.f90 b/libm65/qra64c.f90 index 95cb3305c..db1329cf9 100644 --- a/libm65/qra64c.f90 +++ b/libm65/qra64c.f90 @@ -1,5 +1,5 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, & - hiscall_12,hisgrid_6,nwrite_qra64) + hiscall_12,hisgrid_6,mode64,nwrite_qra64) use packjt parameter (NFFT2=336000) !56*6000 (downsampled by 1/16) @@ -27,7 +27,7 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, & ! For now: nf1=-3000 nf2=3000 - mode64=1 + ! mode64=1 minsync=-1 ndepth=3 emedelay=2.5 diff --git a/mainwindow.cpp b/mainwindow.cpp index 122bbe4eb..4dce5ffb4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//---------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"