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

Merge branch 'develop' into map65

Browse Source
This commit is contained in:
Joe Taylor
2023-02-15 12:08:54 -05:00
parent b252abb462 aef5c198bb
commit 9d576c1bff
7 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/decoder.f90
+8 -5
View File
@@ -44,6 +44,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
real ss(184,NSMAX)
logical baddata,newdat65,newdat9,single_decode,bVHF,bad0,newdat,ex
logical lprinthash22
integer*2 id2(NTMAX*12000)
integer nqf(20)
type(params_block) :: params
@@ -237,27 +238,30 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
! We're in FST4 mode
ndepth=iand(params%ndepth,3)
iwspr=0
lprinthash22=.false.
params%nsubmode=0
call timer('dec_fst4',0)
call my_fst4%decode(fst4_decoded,id2,params%nutc, &
params%nQSOProgress,params%nfa,params%nfb, &
params%nfqso,ndepth,params%ntr,params%nexp_decode, &
params%ntol,params%emedelay,logical(params%nagain), &
logical(params%lapcqonly),mycall,hiscall,iwspr)
logical(params%lapcqonly),mycall,hiscall,iwspr,lprinthash22)
call timer('dec_fst4',1)
go to 800
endif
if(params%nmode.eq.241) then
if(params%nmode.eq.241 .or. params%nmode.eq.242) then
! We're in FST4W mode
ndepth=iand(params%ndepth,3)
iwspr=1
lprinthash22=.false.
if(params%nmode.eq.242) lprinthash22=.true.
call timer('dec_fst4',0)
call my_fst4%decode(fst4_decoded,id2,params%nutc, &
params%nQSOProgress,params%nfa,params%nfb, &
params%nfqso,ndepth,params%ntr,params%nexp_decode, &
params%ntol,params%emedelay,logical(params%nagain), &
logical(params%lapcqonly),mycall,hiscall,iwspr)
logical(params%lapcqonly),mycall,hiscall,iwspr,lprinthash22)
call timer('dec_fst4',1)
go to 800
endif
@@ -721,7 +725,7 @@ contains
end subroutine ft4_decoded
subroutine fst4_decoded (this,nutc,sync,nsnr,dt,freq,decoded,nap, &
qual,ntrperiod,lwspr,fmid,w50)
qual,ntrperiod,fmid,w50)
use fst4_decode
implicit none
@@ -736,7 +740,6 @@ contains
integer, intent(in) :: nap
real, intent(in) :: qual
integer, intent(in) :: ntrperiod
logical, intent(in) :: lwspr
real, intent(in) :: fmid
real, intent(in) :: w50