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 single_decode and lagain as intended in Q65.

Browse Source
This commit is contained in:
Joe Taylor 2021-02-02 09:58:04 -05:00
parent 5850317de0
commit 14d18306e6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/decoder.f90
View File

@ -208,6 +208,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
call my_q65%decode(q65_decoded,id2,params%nutc,params%ntr, & call my_q65%decode(q65_decoded,id2,params%nutc,params%ntr, &
params%nsubmode,params%nfqso,params%ntol,params%ndepth, & params%nsubmode,params%nfqso,params%ntol,params%ndepth, &
params%nfa,params%nfb,logical(params%nclearave), & params%nfa,params%nfb,logical(params%nclearave), &
single_decode,logical(params%nagain), &
logical(params%newdat),params%emedelay,mycall,hiscall,hisgrid, & logical(params%newdat),params%emedelay,mycall,hiscall,hisgrid, &
params%nQSOProgress,ncontest,logical(params%lapcqonly),navg0) params%nQSOProgress,ncontest,logical(params%lapcqonly),navg0)
call timer('dec_q65 ',1) call timer('dec_q65 ',1)

8
lib/q65_decode.f90
View File

@ -27,8 +27,8 @@ module q65_decode
contains contains
subroutine decode(this,callback,iwave,nutc,ntrperiod,nsubmode,nfqso, & subroutine decode(this,callback,iwave,nutc,ntrperiod,nsubmode,nfqso, &
ntol,ndepth,nfa0,nfb0,lclearave,lnewdat0,emedelay,mycall, & ntol,ndepth,nfa0,nfb0,lclearave,single_decode,lagain,lnewdat0, &
hiscall,hisgrid,nQSOprogress,ncontest,lapcqonly,navg0) emedelay,mycall,hiscall,hisgrid,nQSOprogress,ncontest,lapcqonly,navg0)
! Top-level routine that organizes the decoding of Q65 signals ! Top-level routine that organizes the decoding of Q65 signals
! Input: iwave Raw data, i*2 ! Input: iwave Raw data, i*2
@ -67,6 +67,7 @@ contains
integer dat4(13) !Decoded message as 12 6-bit integers integer dat4(13) !Decoded message as 12 6-bit integers
integer dgen(13) integer dgen(13)
logical lclearave,lnewdat0,lapcqonly,unpk77_success logical lclearave,lnewdat0,lapcqonly,unpk77_success
logical single_decode,lagain
complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s
complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s
@ -260,6 +261,7 @@ contains
idec,0,ntrperiod) idec,0,ntrperiod)
endif endif
navg0=1000*navg(0) + navg(1) navg0=1000*navg(0) + navg(1)
if(single_decode .or. lagain) go to 900
do icand=1,ncand do icand=1,ncand
! Prepare for single-period candidate decodes with iaptype = 0, 1, 2, or 4 ! Prepare for single-period candidate decodes with iaptype = 0, 1, 2, or 4
@ -333,7 +335,7 @@ contains
endif endif
enddo enddo
return 900 return
end subroutine decode end subroutine decode
end module q65_decode end module q65_decode