w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-01 13:42:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

"Also FST240W" should set iwspr=2, not 1. Change ndeep to ndepth, for consistency.

Browse Source
This commit is contained in:
Joe Taylor 2020-07-02 13:30:18 -04:00
parent ee013f8687
commit 185cf3eb48
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decoder.f90
View File

@ -191,7 +191,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
! We're in FST240 mode ! We're in FST240 mode
ndepth=iand(params%ndepth,3) ndepth=iand(params%ndepth,3)
iwspr=0 iwspr=0
if(iand(params%ndepth,128).ne.0) iwspr=1 if(iand(params%ndepth,128).ne.0) iwspr=2
call timer('dec240 ',0) call timer('dec240 ',0)
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, &

13
lib/fst240_decode.f90
View File

@ -28,7 +28,7 @@ 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,nzhsym, & nfa,nfb,nsubmode,ndepth,ntrperiod,nexp_decode,ntol,nzhsym, &
emedelay,lapcqonly,napwid,mycall,hiscall,nfsplit,iwspr) emedelay,lapcqonly,napwid,mycall,hiscall,nfsplit,iwspr)
use timer_module, only: timer use timer_module, only: timer
@ -80,6 +80,7 @@ contains
this%callback => callback this%callback => callback
print*,'AAA',iwspr,ndepth
dxcall13=hiscall ! initialize for use in packjt77 dxcall13=hiscall ! initialize for use in packjt77
mycall13=mycall mycall13=mycall
@ -216,17 +217,17 @@ contains
allocate( cframe(0:160*nss-1) ) allocate( cframe(0:160*nss-1) )
if(ndeep.eq.3) then if(ndepth.eq.3) then
nblock=1 nblock=1
if(hmod.eq.1) nblock=4 ! number of block sizes to try if(hmod.eq.1) nblock=4 ! number of block sizes to try
jittermax=2 jittermax=2
norder=3 norder=3
elseif(ndeep.eq.2) then elseif(ndepth.eq.2) then
nblock=1 nblock=1
if(hmod.eq.1) nblock=3 if(hmod.eq.1) nblock=3
jittermax=0 jittermax=0
norder=3 norder=3
elseif(ndeep.eq.1) then elseif(ndepth.eq.1) then
nblock=1 nblock=1
jittermax=0 jittermax=0
norder=3 norder=3
@ -238,7 +239,7 @@ contains
r_data(nfft1+1:nfft1+2)=0.0 r_data(nfft1+1:nfft1+2)=0.0
call four2a(r_data,nfft1,1,-1,0) call four2a(r_data,nfft1,1,-1,0)
c_bigfft=cmplx(r_data(1:nfft1+2:2),r_data(2:nfft1+2:2)) c_bigfft=cmplx(r_data(1:nfft1+2:2),r_data(2:nfft1+2:2))
! write(*,3001) iwspr,nfa,nfb,nfsplit,ndeep ! write(*,3001) iwspr,nfa,nfb,nfsplit,ndepth
!3001 format('a',5i5) !3001 format('a',5i5)
! iwspr=1 !### For hardwired tests ### ! iwspr=1 !### For hardwired tests ###
if(iwspr.eq.0) then if(iwspr.eq.0) then
@ -436,7 +437,7 @@ contains
apmag=maxval(abs(llra))*1.1 apmag=maxval(abs(llra))*1.1
ntmax=nblock+nappasses(nQSOProgress) ntmax=nblock+nappasses(nQSOProgress)
if(lapcqonly) ntmax=nblock+1 if(lapcqonly) ntmax=nblock+1
if(ndeep.eq.1) ntmax=nblock if(ndepth.eq.1) ntmax=nblock
apmask=0 apmask=0
if(iqorw.eq.2) then ! 50-bit msgs, no ap decoding if(iqorw.eq.2) then ! 50-bit msgs, no ap decoding