w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-29 23:58:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add -e option to msk144d - prints short messages regardless of hash.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6923 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-07-15 00:59:19 +00:00
parent d00e377d88
commit fca3805df7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/detectmsk32.f90
View File

@ -435,14 +435,15 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
ihash=iand(ihash,127) ihash=iand(ihash,127)
if(nrxhash.eq.ihash .or. t00.gt.0.0) then if(nrxhash.eq.ihash .or. t00.gt.0.0) then
nmessages=1
if(nrxhash.eq.ihash) then if(nrxhash.eq.ihash) then
nmessages=1
write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall), & write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall), &
trim(partnercall),">",rpt(nrxrpt) trim(partnercall),">",rpt(nrxrpt)
write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived
1020 format(i6.6,i4,f5.1,i5,' & ',a22) 1020 format(i6.6,i4,f5.1,i5,' & ',a22)
endif endif
if(nrxhash.ne.ihash .and. t00.gt.0.0 .and. nsnr.gt.-4) then if(nrxhash.ne.ihash .and. t00.gt.0.0 .and. nsnr.gt.-4) then
nmessages=1
write(msgreceived,'(a5,1x,a4)') "<...>",rpt(nrxrpt) write(msgreceived,'(a5,1x,a4)') "<...>",rpt(nrxrpt)
write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived
endif endif

11
lib/msk144d.f90
View File

@ -18,19 +18,20 @@ program msk144d
character*12 mycall,hiscall character*12 mycall,hiscall
character(len=500) optarg character(len=500) optarg
type (option) :: long_options(4) = [ & type (option) :: long_options(5) = [ &
option ('help',.false.,'h','Display this help message',''), & option ('help',.false.,'h','Display this help message',''), &
option ('mycall',.true.,'c','mycall',''), & option ('mycall',.true.,'c','mycall',''), &
option ('evemode',.true.,'e','',''), &
option ('nftol',.true.,'n','nftol',''), & option ('nftol',.true.,'n','nftol',''), &
option ('hiscall',.true.,'x','hiscall','') & option ('hiscall',.true.,'x','hiscall','') &
] ]
t0=0.0
ntol=100 ntol=100
mycall='' mycall=''
hiscall='' hiscall=''
do do
call getopt('c:hn:x:',long_options,c,optarg,narglen,nstat,noffset,nremain,.true.) call getopt('c:ehn:x:',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
@ -39,6 +40,8 @@ program msk144d
display_help = .true. display_help = .true.
case ('c') case ('c')
read (optarg(:narglen), *) mycall read (optarg(:narglen), *) mycall
case ('e')
t0=1e-4
case ('n') case ('n')
read (optarg(:narglen), *) ntol read (optarg(:narglen), *) ntol
case ('x') case ('x')
@ -78,7 +81,7 @@ program msk144d
read(unit=wav%lun) id2(1:npts) read(unit=wav%lun) id2(1:npts)
close(unit=wav%lun) close(unit=wav%lun)
call timer('read ',1) call timer('read ',1)
call msk144_decode(id2,npts,nutc,1,pchk_file,mycall,hiscall,bShMsgs,ntol,line) call msk144_decode(id2,npts,nutc,1,pchk_file,mycall,hiscall,bShMsgs,ntol,t0,line)
enddo enddo
call timer('msk144 ',1) call timer('msk144 ',1)