Add -r (Rx Equalize) option to command-line MSK144 decoder.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7423 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-12-22 18:17:23 +00:00
parent 353c2bb4c3
commit 873d481458

View File

@ -17,13 +17,14 @@ program msk144d2
logical :: display_help=.false. logical :: display_help=.false.
logical*1 bShMsgs logical*1 bShMsgs
logical*1 bcontest logical*1 bcontest
logical*1 brxequal
type(wav_header) :: wav type(wav_header) :: wav
integer*2 id2(30*12000) integer*2 id2(30*12000)
integer*2 ichunk(7*1024) integer*2 ichunk(7*1024)
type (option) :: long_options(8) = [ & type (option) :: long_options(9) = [ &
option ('ndepth',.true.,'c','ndepth',''), & option ('ndepth',.true.,'c','ndepth',''), &
option ('dxcall',.true.,'d','hiscall',''), & option ('dxcall',.true.,'d','hiscall',''), &
option ('evemode',.true.,'e','',''), & option ('evemode',.true.,'e','',''), &
@ -31,6 +32,7 @@ program msk144d2
option ('help',.false.,'h','Display this help message',''), & option ('help',.false.,'h','Display this help message',''), &
option ('mycall',.true.,'m','mycall',''), & option ('mycall',.true.,'m','mycall',''), &
option ('nftol',.true.,'n','nftol',''), & option ('nftol',.true.,'n','nftol',''), &
option ('rxequalize',.false.,'r','Rx Equalize',''), &
option ('short',.false.,'s','enable Sh','') & option ('short',.false.,'s','enable Sh','') &
] ]
t0=0.0 t0=0.0
@ -42,9 +44,10 @@ program msk144d2
hiscall='' hiscall=''
bShMsgs=.false. bShMsgs=.false.
bcontest=.false. bcontest=.false.
brxequal=.false.
do do
call getopt('c:d:ef:hm:n:s',long_options,c,optarg,narglen,nstat,noffset,nremain,.true.) call getopt('c:d:ef:hm:n:rs',long_options,c,optarg,narglen,nstat,noffset,nremain,.true.)
if( nstat .ne. 0 ) then if( nstat .ne. 0 ) then
exit exit
end if end if
@ -63,6 +66,8 @@ program msk144d2
read (optarg(:narglen), *) mycall read (optarg(:narglen), *) mycall
case ('n') case ('n')
read (optarg(:narglen), *) ntol read (optarg(:narglen), *) ntol
case ('r')
brxequal=.true.
case ('s') case ('s')
bShMsgs=.true. bShMsgs=.true.
end select end select
@ -103,8 +108,12 @@ program msk144d2
tsec=(i-1)/12000.0 tsec=(i-1)/12000.0
tt=sum(float(abs(id2(i:i+7*512-1)))) tt=sum(float(abs(id2(i:i+7*512-1))))
if( tt .ne. 0.0 ) then if( tt .ne. 0.0 ) then
call mskrtd(ichunk,nutc,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,bShMsgs,bcontest,line) call mskrtd(ichunk,nutc,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,bShMsgs, &
if( index(line,"^") .ne. 0 .or. index(line,"&") .ne. 0 ) then bcontest,brxequal,line)
if( index(line,"&") .ne. 0 .or. &
index(line,"^") .ne. 0 .or. &
index(line,"!") .ne. 0 .or. &
index(line,"@") .ne. 0 ) then
write(*,*) line write(*,*) line
endif endif
endif endif