w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-09 18:12:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Connect submode indicator to the QRA64 decode routines.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-19 15:45:30 +00:00
parent 3fa52a1a86
commit 4acd0c8795
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libm65/map65a.f90
View File

@ -34,10 +34,9 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
mode65=mod(nmode,10) mode65=mod(nmode,10)
if(mode65.eq.3) mode65=4 if(mode65.eq.3) mode65=4
modeqra64=nmode/10 mode64=nmode/10
nwrite_qra64=0 nwrite_qra64=0
bqra64=mode64.gt.0
bqra64=modeqra64.gt.0
mcall3a=mcall3b mcall3a=mcall3b
mousefqso0=mousefqso mousefqso0=mousefqso
xpol=(nxpol.ne.0) xpol=(nxpol.ne.0)
@ -217,7 +216,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
ifreq=i ifreq=i
ikHz=nint(freq+0.5*(nfa+nfb)-foffset)-nfshift ikHz=nint(freq+0.5*(nfa+nfb)-foffset)-nfshift
idf=nint(1000.0*(freq+0.5*(nfa+nfb)-foffset-(ikHz+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, & xpol,mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi, &
ndphi,iloop,nutc,ikHz,idf,ipol,ntol,bqra64,sync2, & ndphi,iloop,nutc,ikHz,idf,ipol,ntol,bqra64,sync2, &
a,dt,pol,nkv,nhist,nsum,nsave,qual,decoded) 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 if(nqd.eq.2) then
call timer('qra64 ',0) call timer('qra64 ',0)
call qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall, & call qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall, &
hiscall,hisgrid,nwrite_qra64) hiscall,hisgrid,mode64,nwrite_qra64)
call timer('qra64 ',1) call timer('qra64 ',1)
cycle cycle
endif endif

4
libm65/qra64b.f90
View File

@ -1,5 +1,5 @@
subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, & 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 (NFFT1=5376000) !56*96000
parameter (NFFT2=336000) !56*6000 (downsampled by 1/16) 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 four2a(cy,NFFT2,1,-1,1)
call qra64c(cx,cy,nutc,nqd,ikhz,mousedf,ntol,xplo,mycall_12, & 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) close(17)
return return

4
libm65/qra64c.f90
View File

@ -1,5 +1,5 @@
subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, & 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 use packjt
parameter (NFFT2=336000) !56*6000 (downsampled by 1/16) 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: ! For now:
nf1=-3000 nf1=-3000
nf2=3000 nf2=3000
mode64=1 ! mode64=1
minsync=-1 minsync=-1
ndepth=3 ndepth=3
emedelay=2.5 emedelay=2.5

2
mainwindow.cpp
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"