w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement "pick to decode" on the MSK144 horizontal waterfall. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6917 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-07-14 17:06:52 +00:00
parent 3522f3706a
commit 9544f60b5a
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/detectmsk144.f90
View File

@ -1,4 +1,4 @@
subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol,t00)
use timer_module, only: timer
parameter (NSPM=864, NPTS=3*NSPM, MAXSTEPS=1700, NFFT=NSPM, MAXCAND=12)
@ -168,7 +168,7 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
imid=times(ip)*fs
if( imid .lt. NPTS/2 ) imid=NPTS/2
if( imid .gt. n-NPTS/2 ) imid=n-NPTS/2
t0=times(ip)
t0=times(ip) + t00
cdat=cbig(imid-NPTS/2+1:imid+NPTS/2)
ferr=ferrs(ip)
nsnr=2*nint(snrs(ip)/2.0)

4
lib/detectmsk32.f90
View File

@ -1,4 +1,4 @@
subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol)
subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
use timer_module, only: timer
parameter (NSPM=192, NPTS=3*NSPM, MAXSTEPS=7500, NFFT=3*NSPM, MAXCAND=40)
@ -205,7 +205,7 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol)
imid=times(ip)*fs
if( imid .lt. NPTS/2 ) imid=NPTS/2
if( imid .gt. n-NPTS/2 ) imid=n-NPTS/2
t0=times(ip)
t0=times(ip) + t00
cdat=cbig(imid-NPTS/2+1:imid+NPTS/2)
ferr=ferrs(ip)
nsnr=2*nint(snrs(ip)/2.0)

7
lib/fast_decode.f90
View File

@ -38,8 +38,11 @@ subroutine fast_decode(id2,narg,bShMsgs,line,pchk_file,mycall_12,hiscall_12)
call jtmsk_decode(id2,narg,line)
go to 900
else if(nmode.eq.104) then
call msk144_decode(id2,ndat0,nutc,0,pchk_file,mycall,hiscall,bShMsgs, &
ntol,line)
ia=max(1,nint(t0*12000.0))
ib=min(ndat0,nint(t1*12000.0))
nz=ib-ia+1
call msk144_decode(id2(ia),nz,nutc,0,pchk_file,mycall,hiscall,bShMsgs, &
ntol,t0,line)
go to 900
endif

6
lib/msk144_decode.f90
View File

@ -1,5 +1,5 @@
subroutine msk144_decode(id2,npts,nutc,nprint,pchk_file,mycall,hiscall, &
bShMsgs,ntol,line)
bShMsgs,ntol,t0,line)
! Calls the experimental decoder for MSK 72ms/16ms messages
@ -32,7 +32,7 @@ subroutine msk144_decode(id2,npts,nutc,nprint,pchk_file,mycall,hiscall, &
n=log(float(npts))/log(2.0) + 1.0
nfft=min(2**n,1024*1024)
call analytic(d,npts,nfft,c) !Convert to analytic signal and filter
call detectmsk144(c,npts,pchk_file,line,nline,nutc,ntol)
call detectmsk144(c,npts,pchk_file,line,nline,nutc,ntol,t0)
if( nprint .ne. 0 ) then
do i=1,nline
write(*,'(a80)') line(i)
@ -41,7 +41,7 @@ subroutine msk144_decode(id2,npts,nutc,nprint,pchk_file,mycall,hiscall, &
if(nline.eq.0 .and. bShMsgs) then
call detectmsk32(c,npts,mycall,hiscall,line,nline,nutc,ntol)
call detectmsk32(c,npts,mycall,hiscall,line,nline,nutc,ntol,t0)
if( nprint .ne. 0 ) then
do i=1,nline
write(*,'(a80)') line(i)

2
mainwindow.cpp
View File

@ -5661,7 +5661,7 @@ void MainWindow::setRig ()
void MainWindow::fastPick(int x0, int x1, int y)
{
if(m_mode!="ISCAT") return;
if(m_mode!="ISCAT" and m_mode!="MSK144") return;
if(!m_decoderBusy) {
dec_data.params.newdat=0;
dec_data.params.nagain=1;