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

Pass more parameters to fst240_decode().

Browse Source
This commit is contained in:
Joe Taylor 2020-06-29 12:21:34 -04:00
parent 133c32cb41
commit 83fddb1f57
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/decoder.f90
View File

@ -193,7 +193,8 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
call my_fst240%decode(fst240_decoded,id2,params%nutc, & call my_fst240%decode(fst240_decoded,id2,params%nutc, &
params%nQSOProgress,params%nfqso,params%nfa,params%nfb, & params%nQSOProgress,params%nfqso,params%nfa,params%nfb, &
params%nsubmode,params%ndepth,params%ntr,params%nexp_decode, & params%nsubmode,params%ndepth,params%ntr,params%nexp_decode, &
params%ntol) params%ntol,params%nzhsym,params%emedelay, &
logical(params%lapcqonly),params%napwid,mycall,hiscall)
call timer('dec240 ',1) call timer('dec240 ',1)
go to 800 go to 800
endif endif

8
lib/fst240_decode.f90
View File

@ -27,7 +27,8 @@ module fst240_decode
contains contains
subroutine decode(this,callback,iwave,nutc,nQSOProgress,nfqso, & subroutine decode(this,callback,iwave,nutc,nQSOProgress,nfqso, &
nfa,nfb,nsubmode,ndeep,ntrperiod,nexp_decode,ntol) nfa,nfb,nsubmode,ndeep,ntrperiod,nexp_decode,ntol,nzhsym, &
emedelay,lapcqonly,napwid,mycall,hiscall)
use timer_module, only: timer use timer_module, only: timer
use packjt77 use packjt77
@ -38,6 +39,7 @@ contains
character*37 decodes(100) character*37 decodes(100)
character*37 msg character*37 msg
character*77 c77 character*77 c77
character*12 mycall,hiscall
complex, allocatable :: c2(:) complex, allocatable :: c2(:)
complex, allocatable :: cframe(:) complex, allocatable :: cframe(:)
complex, allocatable :: c_bigfft(:) !Complex waveform complex, allocatable :: c_bigfft(:) !Complex waveform
@ -46,6 +48,7 @@ contains
real candidates(100,4) real candidates(100,4)
real bitmetrics(320,4) real bitmetrics(320,4)
real s4(0:3,NN) real s4(0:3,NN)
logical lapcqonly
integer itone(NN) integer itone(NN)
integer hmod integer hmod
integer*1 apmask(240),cw(240) integer*1 apmask(240),cw(240)
@ -58,6 +61,9 @@ contains
1,0,0,1,0,1,1,0,0,0,0,1,0,0,0,1,0,1,0,0,1,1,1,1,0,0,1,0,1, & 1,0,0,1,0,1,1,0,0,0,0,1,0,0,0,1,0,1,0,0,1,1,1,1,0,0,1,0,1, &
0,1,0,1,0,1,1,0,1,1,1,1,1,0,0,0,1,0,1/ 0,1,0,1,0,1,1,0,1,1,1,1,1,0,0,0,1,0,1/
write(*,3001) nzhsym,emedelay,lapcqonly,napwid,mycall,hiscall
3001 format(i4,f6.1,L3,i3,2x,2a12)
this%callback => callback this%callback => callback
hmod=2**nsubmode hmod=2**nsubmode
if(nfqso+nqsoprogress.eq.-999) return if(nfqso+nqsoprogress.eq.-999) return