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

More work on K=50 decoding.

Browse Source
This commit is contained in:
Steven Franke 2020-12-14 10:19:48 -06:00
parent 771e71bc84
commit 939e35bd26
1 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
lib/fst4_decode.f90
View File

@ -68,8 +68,9 @@ contains
integer mcq(29),mrrr(19),m73(19),mrr73(19) integer mcq(29),mrrr(19),m73(19),mrr73(19)
logical badsync,unpk77_success,single_decode logical badsync,unpk77_success,single_decode
logical first,nohiscall,lwspr,ex,wcalls_exists,donocrcdecode logical first,nohiscall,lwspr
logical new_callsign logical new_callsign,plotspec_exists,wcalls_exists,do_nocrc_decode
logical decdata_exists
integer*2 iwave(30*60*12000) integer*2 iwave(30*60*12000)
@ -234,15 +235,15 @@ contains
if(ndepth.eq.3) then if(ndepth.eq.3) then
nblock=4 nblock=4
jittermax=2 jittermax=2
donocrcdecode=.true. do_nocrc_decode=.true.
elseif(ndepth.eq.2) then elseif(ndepth.eq.2) then
nblock=4 nblock=4
jittermax=2 jittermax=2
donocrcdecode=.false. do_nocrc_decode=.false.
elseif(ndepth.eq.1) then elseif(ndepth.eq.1) then
nblock=4 nblock=4
jittermax=0 jittermax=0
donocrcdecode=.false. do_nocrc_decode=.false.
endif endif
ndropmax=1 ndropmax=1
@ -479,52 +480,24 @@ contains
write(c77,'(77i1)') mod(message101(1:77)+rvec,2) write(c77,'(77i1)') mod(message101(1:77)+rvec,2)
call unpack77(c77,1,msg,unpk77_success) call unpack77(c77,1,msg,unpk77_success)
elseif(iwspr.eq.1) then elseif(iwspr.eq.1) then
iaptype=0 ! First try decoding with Keff=64
if( donocrcdecode ) then maxosd=2
maxosd=1 call timer('d240_74 ',0)
call timer('d240_74 ',0) Keff=64
Keff=50 norder=3
norder=4 call decode240_74(llr,Keff,maxosd,norder,apmask,message74,cw, &
call decode240_74(llr,Keff,maxosd,norder,apmask,message74,cw, & ntype,nharderrors,dmin)
ntype,nharderrors,dmin) call timer('d240_74 ',1)
call timer('d240_74 ',1) if(nharderrors.lt.0) goto 3465
if(count(cw.eq.1).eq.0) then if(count(cw.eq.1).eq.0) then
nharderrors=-nharderrors nharderrors=-nharderrors
cycle cycle
endif
write(c77,'(50i1)') message74(1:50)
c77(51:77)='000000000000000000000110000'
call unpack77(c77,1,msg,unpk77_success)
if(unpk77_success) then
unpk77_success=.false.
do i=1,nwcalls
if(index(msg,trim(wcalls(i))).gt.0) then
unpk77_success=.true.
iaptype=8
endif
enddo
endif
endif endif
if(.not. unpk77_success) then write(c77,'(50i1)') message74(1:50)
maxosd=2 c77(51:77)='000000000000000000000110000'
call timer('d240_74 ',0) call unpack77(c77,1,msg,unpk77_success)
Keff=64 if(unpk77_success) then
norder=3 ! If decode was obtained with Keff=64, save call/grid in fst4w_calls.txt if not there already.
call decode240_74(llr,Keff,maxosd,norder,apmask,message74,cw, &
ntype,nharderrors,dmin)
call timer('d240_74 ',1)
if(nharderrors.lt.0) cycle
if(count(cw.eq.1).eq.0) then
nharderrors=-nharderrors
cycle
endif
write(c77,'(50i1)') message74(1:50)
c77(51:77)='000000000000000000000110000'
call unpack77(c77,1,msg,unpk77_success)
endif
if(unpk77_success.and.Keff.eq.64) then
i1=index(msg,' ') i1=index(msg,' ')
i2=i1+index(msg(i1+1:),' ') i2=i1+index(msg(i1+1:),' ')
wpart=trim(msg(1:i2)) wpart=trim(msg(1:i2))
@ -545,6 +518,36 @@ contains
endif endif
endif endif
endif endif
3465 continue
! If no decode then try Keff=50
iaptype=0
if( .not. unpk77_success .and. do_nocrc_decode ) then
maxosd=1
call timer('d240_74 ',0)
Keff=50
norder=4
call decode240_74(llr,Keff,maxosd,norder,apmask,message74,cw, &
ntype,nharderrors,dmin)
call timer('d240_74 ',1)
if(count(cw.eq.1).eq.0) then
nharderrors=-nharderrors
cycle
endif
write(c77,'(50i1)') message74(1:50)
c77(51:77)='000000000000000000000110000'
call unpack77(c77,1,msg,unpk77_success)
! No CRC in this mode, so only accept the decode if call/grid have been seen before
if(unpk77_success) then
unpk77_success=.false.
do i=1,nwcalls
if(index(msg,trim(wcalls(i))).gt.0) then
unpk77_success=.true.
endif
enddo
endif
endif
endif endif
if(nharderrors .ge.0 .and. unpk77_success) then if(nharderrors .ge.0 .and. unpk77_success) then
@ -561,10 +564,10 @@ contains
else else
call get_fst4_tones_from_bits(message74,itone,1) call get_fst4_tones_from_bits(message74,itone,1)
endif endif
inquire(file='plotspec',exist=ex) inquire(file='plotspec',exist=plotspec_exists)
fmid=-999.0 fmid=-999.0
call timer('dopsprd ',0) call timer('dopsprd ',0)
if(ex) then if(plotspec_exists) then
call dopspread(itone,iwave,nsps,nmax,ndown,hmod, & call dopspread(itone,iwave,nsps,nmax,ndown,hmod, &
isbest,fc_synced,fmid,w50) isbest,fc_synced,fmid,w50)
endif endif
@ -586,13 +589,13 @@ contains
endif endif
nsnr=nint(xsnr) nsnr=nint(xsnr)
qual=0.0 qual=0.0
if(iaptype.eq.8) qual=1.
fsig=fc_synced - 1.5*baud fsig=fc_synced - 1.5*baud
if(ex) then inquire(file='decdata',exist=decdata_exists)
if(decdata_exists) then
write(21,3021) nutc,icand,itry,nsyncoh,iaptype, & write(21,3021) nutc,icand,itry,nsyncoh,iaptype, &
ijitter,ntype,nsync_qual,nharderrors,dmin, & ijitter,ntype,Keff,nsync_qual,nharderrors,dmin, &
sync,xsnr,xdt,fsig,w50,trim(msg) sync,xsnr,xdt,fsig,w50,trim(msg)
3021 format(i6.6,6i3,2i4,f6.1,f7.2,f6.1,f6.2,f7.1,f7.3,1x,a) 3021 format(i6.6,6i3,3i4,f6.1,f9.2,f6.1,f6.2,f7.1,f7.3,1x,a)
flush(21) flush(21)
endif endif
call this%callback(nutc,smax1,nsnr,xdt,fsig,msg, & call this%callback(nutc,smax1,nsnr,xdt,fsig,msg, &
@ -604,6 +607,7 @@ contains
enddo ! istart jitter enddo ! istart jitter
800 enddo !candidate list 800 enddo !candidate list
enddo ! noise blanker loop enddo ! noise blanker loop
if(new_callsign) then ! re-write the fst4w_calls.txt file if(new_callsign) then ! re-write the fst4w_calls.txt file
open(42,file=trim(data_dir)//'/fst4w_calls.txt',status='unknown') open(42,file=trim(data_dir)//'/fst4w_calls.txt',status='unknown')
do i=1,nwcalls do i=1,nwcalls
@ -611,6 +615,7 @@ contains
enddo enddo
close(42) close(42)
endif endif
900 return 900 return
end subroutine decode end subroutine decode