Try both X and Y pol; increase jstep in sync64.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7518 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-16 21:15:23 +00:00
parent 79d3aa2439
commit ae1a6a8486
3 changed files with 58 additions and 52 deletions

View File

@ -70,8 +70,10 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
naptype=maxaptype naptype=maxaptype
npts2=NFFT2 npts2=NFFT2
do ip=0,1
!### !###
c00(0:NFFT2-1)=conjg(cy) if(ip.eq.0) c00(0:NFFT2-1)=conjg(cx)
if(ip.eq.1) c00(0:NFFT2-1)=conjg(cy)
!### !###
call sync64(c00,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk0,sync, & call sync64(c00,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk0,sync, &
@ -122,12 +124,14 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
dtxkeep=jpk/6000.0 - 1.0 dtxkeep=jpk/6000.0 - 1.0
itry0keep=itry0 itry0keep=itry0
iterkeep=iter iterkeep=iter
npolkeep=ip*90
endif endif
enddo enddo
if(irc.eq.0) exit if(irc.eq.0) goto 5
enddo
enddo enddo
if(napmin.ne.99) then 5 if(napmin.ne.99) then
dat4=dat4x dat4=dat4x
b90=b90x b90=b90x
snr2=snr2x snr2=snr2x
@ -135,10 +139,12 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
dtx=dtxkeep dtx=dtxkeep
itry0=itry0keep itry0=itry0keep
iter=iterkeep iter=iterkeep
npol=npolkeep
endif endif
10 decoded=' ' 10 decoded=' '
if(irc.ge.0) then if(irc.ge.0) then
if(irc.eq.0) npol=ip*90
call unpackmsg(dat4,decoded) !Unpack the user message call unpackmsg(dat4,decoded) !Unpack the user message
call fmtmsg(decoded,iz) call fmtmsg(decoded,iz)
if(index(decoded,"000AAA ").ge.1) then if(index(decoded,"000AAA ").ge.1) then
@ -161,7 +167,6 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, &
if(nSubmode.eq.4) nsnr=nint(10.0*log10(sy)-24.0) !E if(nSubmode.eq.4) nsnr=nint(10.0*log10(sy)-24.0) !E
endif endif
npol=0
cp='H' cp='H'
ntxpol=0 ntxpol=0
if(irc.ge.0) then if(irc.ge.0) then

View File

@ -62,7 +62,8 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, &
jpk=0 jpk=0
ja=0 ja=0
jb=(5.0+emedelay)*6000 jb=(5.0+emedelay)*6000
jstep=100 ! jstep=100
jstep=200
ipk=0 ipk=0
kpk=0 kpk=0
nadd=10*mode64 nadd=10*mode64

View File

@ -1,4 +1,4 @@
//------------------------------------------------------------- MainWindow //-------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"