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

Label JT65 AP decodes as such.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8220 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2017-11-05 14:44:15 +00:00
parent 487cebf09c
commit f039bc6625
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/decoder.f90
View File

@ -316,7 +316,7 @@ contains
integer, intent(in) :: nsum integer, intent(in) :: nsum
integer, intent(in) :: minsync integer, intent(in) :: minsync
integer i,nft integer i,nap,nft
logical is_deep,is_average logical is_deep,is_average
character decoded*22,csync*2,cflags*3 character decoded*22,csync*2,cflags*3
@ -358,6 +358,10 @@ contains
write(cflags(2:2),'(i1)') min(nsum,9) write(cflags(2:2),'(i1)') min(nsum,9)
if(nsum.ge.10) cflags(2:2)='*' if(nsum.ge.10) cflags(2:2)='*'
endif endif
nap=ishft(ft,-2)
if(nap.ne.0) then
write(cflags(1:3),'(a1,i2.2)') 'a',nap
endif
endif endif
csync='# ' csync='# '
i=0 i=0

24
lib/fsk4hf/extract_ap.f90
View File

@ -24,7 +24,7 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
character decoded*22, apmessage*22 character decoded*22, apmessage*22
character*12 mycall_12,hiscall_12 character*12 mycall_12,hiscall_12
character*6 mycall,hiscall,hisgrid character*6 mycall,hiscall,hisgrid
integer apsymbols(12) integer apsymbols(12),ap(12)
integer dat4(12) integer dat4(12)
integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63) integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63)
integer correct(63),tmp(63) integer correct(63),tmp(63)
@ -90,14 +90,16 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
call graycode65(mr2sym,63,-1) !Remove gray code and interleaving call graycode65(mr2sym,63,-1) !Remove gray code and interleaving
call interleave63(mr2sym,-1) !from second-most-reliable symbols call interleave63(mr2sym,-1) !from second-most-reliable symbols
call interleave63(mr2prob,-1) call interleave63(mr2prob,-1)
do ipass=1,2
ap=-1
if(ipass.eq.2 .and. count(apsymbols.ge.0).gt.0) then
ap=apsymbols
endif
ntry=0 ntry=0
! call gf64_osd(s3,correct)
call timer('ftrsd ',0) call timer('ftrsd ',0)
param=0 param=0
! call ftrsd2(mrsym,mrprob,mr2sym,mr2prob,ntrials,correct,param,ntry) call ftrsdap(mrsym,mrprob,mr2sym,mr2prob,ap,ntrials,correct,param,ntry)
call ftrsdap(mrsym,mrprob,mr2sym,mr2prob,apsymbols,ntrials,correct,param,ntry)
call timer('ftrsd ',1) call timer('ftrsd ',1)
ncandidates=param(0) ncandidates=param(0)
nhard=param(1) nhard=param(1)
@ -112,7 +114,15 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, &
nd0=83 nd0=83
r0=0.90 r0=0.90
endif endif
if(ntotal.le.nd0 .and. rtt.le.r0) nft=1
if(ntotal.le.nd0 .and. rtt.le.r0) then
nft=1
nap=count(ap.ge.0)
nft=1+ishft(nap,2)
endif
if(nft.gt.0) exit
enddo
if(nft.eq.0 .and. iand(ndepth,32).eq.32) then if(nft.eq.0 .and. iand(ndepth,32).eq.32) then
qmin=2.0 - 0.1*naggressive qmin=2.0 - 0.1*naggressive

1
lib/jt65_decode.f90
View File

@ -255,6 +255,7 @@ contains
if(nsnr.gt.-1) nsnr=-1 if(nsnr.gt.-1) nsnr=-1
nftt=0 nftt=0
!********* DOES THIS STILL WORK WHEN NFT INCLUDES # OF AP SYMBOLS USED??
if(nft.ne.1 .and. iand(ndepth,16).eq.16 .and. (.not.prtavg)) then if(nft.ne.1 .and. iand(ndepth,16).eq.16 .and. (.not.prtavg)) then
! Single-sequence FT decode failed, so try for an average FT decode. ! Single-sequence FT decode failed, so try for an average FT decode.
if(nutc.ne.nutc0 .or. abs(nfreq-nfreq0).gt.ntol) then if(nutc.ne.nutc0 .or. abs(nfreq-nfreq0).gt.ntol) then