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

Prepare for doing AP=012 decodes from s1a.

Browse Source
This commit is contained in:
Joe Taylor 2021-01-14 15:52:51 -05:00
parent 70a3481a4f
commit b64c1faba4
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/q65_decode.f90
View File

@ -145,7 +145,6 @@ contains
do ipass=0,npasses !Loop over AP passes
apmask=0 !Try first with no AP information
apsymbols=0
if(ipass.ge.1) then
! Subsequent passes use AP information appropiate for nQSOprogress
call q65_ap(nQSOprogress,ipass,ncontest,lapcqonly,iaptype, &
@ -164,12 +163,13 @@ contains
! idec=-1 !### TEMPORARY ###
call timer('q65loops',1)
if(idec.ge.0) go to 100 !Successful decode, we're done
enddo
enddo ! ipass
if(iand(ndepth,16).eq.16) then
! There was no single-transmission decode. Try for an average 'q3n' decode.
call timer('list_avg',0)
! Call top-level routine in q65 module: establish sync and try for a q3 decode.
! Call top-level routine in q65 module: establish sync and try for a q3
! decode, this time using the cumulative 's1a' symbol spectra.
iavg=1
call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
@ -180,7 +180,21 @@ contains
endif
! There was no 'q3n' decode. Try for a 'q[012]n' decode.
! call q65_q012a()
do ipass=0,npasses !Loop over AP passes
apmask=0 !Try first with no AP information
apsymbols=0
if(ipass.ge.1) then
! Subsequent passes use AP information appropiate for nQSOprogress
call q65_ap(nQSOprogress,ipass,ncontest,lapcqonly,iaptype, &
apsym0,apmask1,apsymbols1)
write(c78,1050) apmask1
read(c78,1060) apmask
write(c78,1050) apsymbols1
read(c78,1060) apsymbols
endif
! call q65_dec012()
if(idec.ge.0) go to 100 !Successful decode, we're done
enddo
endif
100 decoded=' '

4
lib/timer_impl.f90
View File

@ -5,8 +5,8 @@ module timer_impl
implicit none
public :: init_timer, fini_timer
! integer, public :: limtrace=0
integer, public :: limtrace=10000000
integer, public :: limtrace=0
! integer, public :: limtrace=10000000
private