mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-12-24 11:40:31 -05:00
Send the hinted-decode options into exp_decode65().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6285 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
523ee92a70
commit
e8788ece2d
@ -25,7 +25,7 @@ subroutine decode65b(s2,nflip,mode65,ntrials,naggressive,ndepth, &
|
||||
|
||||
nadd=mode65
|
||||
call extract(s3,nadd,ntrials,naggressive,ndepth,mycall,hiscall,hisgrid, &
|
||||
ncount,nhist,decoded,ltext,nft,qual) !Extract the message
|
||||
nexp_decode,ncount,nhist,decoded,ltext,nft,qual) !Extract the message
|
||||
|
||||
! Suppress "birdie messages" and other garbage decodes:
|
||||
if(decoded(1:7).eq.'000AAA ') ncount=-1
|
||||
|
@ -1,5 +1,5 @@
|
||||
subroutine exp_decode65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,mode65,flip, &
|
||||
mycall,qual,decoded)
|
||||
mycall,hiscall0,hisgrid0,nexp_decode,qual,decoded)
|
||||
|
||||
use packjt
|
||||
use prog_args
|
||||
@ -12,7 +12,7 @@ subroutine exp_decode65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,mode65,flip, &
|
||||
integer mrsym(0:62),mr2sym(0:62),mrprob(0:62)
|
||||
integer dgen(12),sym(0:62),sym_rev(0:62)
|
||||
integer test(0:62)
|
||||
character*6 mycall,hiscall(NMAX)
|
||||
character*6 mycall,hiscall0,hisgrid0,hiscall(NMAX)
|
||||
character*4 hisgrid(NMAX)
|
||||
character callsign*12,grid*4
|
||||
character*180 line
|
||||
@ -23,6 +23,8 @@ subroutine exp_decode65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,mode65,flip, &
|
||||
data first/.true./,nn/0/
|
||||
save first,sym1,nused,msg0,sym2,nn
|
||||
|
||||
! print*,mycall,hiscall0,hisgrid0,nexp_decode
|
||||
|
||||
if(first) then
|
||||
neme=1
|
||||
open(23,file=trim(data_dir)//'/CALL3.TXT',status='unknown')
|
||||
|
@ -1,5 +1,5 @@
|
||||
subroutine extract(s3,nadd,ntrials,naggressive,ndepth, &
|
||||
mycall_12,hiscall_12,hisgrid,ncount,nhist,decoded,ltext,nft,qual)
|
||||
subroutine extract(s3,nadd,ntrials,naggressive,ndepth,mycall_12, &
|
||||
hiscall_12,hisgrid,nexp_decode,ncount,nhist,decoded,ltext,nft,qual)
|
||||
|
||||
! Input:
|
||||
! s3 64-point spectra for each of 63 data symbols
|
||||
@ -91,7 +91,7 @@ subroutine extract(s3,nadd,ntrials,naggressive,ndepth, &
|
||||
mode65=1
|
||||
flip=1.0
|
||||
call exp_decode65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,mode65,flip, &
|
||||
mycall,qual,decoded)
|
||||
mycall,hiscall,hisgrid,nexp_decode,qual,decoded)
|
||||
if(qual.ge.qmin) then
|
||||
nft=2
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user