w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use ntol to distinguise spectra to be used for message averaging.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2544 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-08-30 18:47:41 +00:00
parent ed03e0003d
commit d83d2d4407
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libm65/decode1a.f
View File

@ -1,6 +1,6 @@
subroutine decode1a(dd,newdat,f0,nflip,mode65,nfsample,xpol, subroutine decode1a(dd,newdat,f0,nflip,mode65,nfsample,xpol,
+ mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi,iloop, + mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi,iloop,
+ nutc,nkhz,ndf,ipol,sync2,a,dt,pol,nkv,nhist,nsum,nsave, + nutc,nkhz,ndf,ipol,ntol,sync2,a,dt,pol,nkv,nhist,nsum,nsave,
+ qual,decoded) + qual,decoded)
! Apply AFC corrections to a candidate JT65 signal, then decode it. ! Apply AFC corrections to a candidate JT65 signal, then decode it.
@ -134,14 +134,15 @@
if(nqd.eq.1 .and. nkv.eq.0) then if(nqd.eq.1 .and. nkv.eq.0) then
nhz=1000*nkhz + ndf nhz=1000*nkhz + ndf
if(nutc.ne.nutc0 .or. abs(nhz-nhz0).ge.1000) syncbest=0. !### 1000 ?? ihzdiff=min(500,ntol)
if(nutc.ne.nutc0 .or. abs(nhz-nhz0).ge.ihzdiff) syncbest=0.
if(sync2.gt.syncbest) then if(sync2.gt.syncbest) then
nsave=nsave+1 nsave=nsave+1
nsave=mod(nsave-1,64)+1 nsave=mod(nsave-1,64)+1
npol=nint(57.296*pol) npol=nint(57.296*pol)
xdt=dt+0.8 xdt=dt+0.8
call s3avg(nsave,mode65,nutc,nhz,xdt,npol,s3,nsum, call s3avg(nsave,mode65,nutc,nhz,xdt,npol,ntol,s3,nsum,
+ nkv,decoded) + nkv,decoded)
syncbest=sync2 syncbest=sync2
nhz0=nhz nhz0=nhz

4
libm65/map65a.f90
View File

@ -206,8 +206,8 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
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,xpol, & call decode1a(dd,newdat,f00,nflip,mode65,nfsample,xpol, &
mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi, & mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi, &
iloop,nutc,ikHz,idf,ipol,sync2,a,dt,pol,nkv,nhist, & iloop,nutc,ikHz,idf,ipol,ntol,sync2,a,dt,pol,nkv, &
nsum,nsave,qual,decoded) nhist,nsum,nsave,qual,decoded)
dt=dt+0.8 !### empirical tweak dt=dt+0.8 !### empirical tweak
call timer('decode1a',1) call timer('decode1a',1)

4
libm65/s3avg.f90
View File

@ -1,4 +1,4 @@
subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,s3,nsum,nkv,decoded) subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,ntol,s3,nsum,nkv,decoded)
! Save the current synchronized spectra, s3(64,63), for possible ! Save the current synchronized spectra, s3(64,63), for possible
! decoding of average. ! decoding of average.
@ -18,7 +18,7 @@ subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,s3,nsum,nkv,decoded)
ihz=0 ihz=0
ipol=0 ipol=0
first=.false. first=.false.
ihzdiff=100 ihzdiff=min(100,ntol)
dtdiff=0.2 dtdiff=0.2
endif endif

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"