From fca3805df7960a1782792aea7f0c5e7bb9840aa6 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Fri, 15 Jul 2016 00:59:19 +0000 Subject: [PATCH] Add -e option to msk144d - prints short messages regardless of hash. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6923 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/detectmsk32.f90 | 3 ++- lib/msk144d.f90 | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/detectmsk32.f90 b/lib/detectmsk32.f90 index 3472fbbcc..42516c5ca 100644 --- a/lib/detectmsk32.f90 +++ b/lib/detectmsk32.f90 @@ -435,14 +435,15 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00) ihash=iand(ihash,127) if(nrxhash.eq.ihash .or. t00.gt.0.0) then - nmessages=1 if(nrxhash.eq.ihash) then + nmessages=1 write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall), & trim(partnercall),">",rpt(nrxrpt) write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived 1020 format(i6.6,i4,f5.1,i5,' & ',a22) endif if(nrxhash.ne.ihash .and. t00.gt.0.0 .and. nsnr.gt.-4) then + nmessages=1 write(msgreceived,'(a5,1x,a4)') "<...>",rpt(nrxrpt) write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived endif diff --git a/lib/msk144d.f90 b/lib/msk144d.f90 index ff2e2c70c..d378f3a21 100644 --- a/lib/msk144d.f90 +++ b/lib/msk144d.f90 @@ -18,19 +18,20 @@ program msk144d character*12 mycall,hiscall character(len=500) optarg - type (option) :: long_options(4) = [ & + type (option) :: long_options(5) = [ & option ('help',.false.,'h','Display this help message',''), & option ('mycall',.true.,'c','mycall',''), & + option ('evemode',.true.,'e','',''), & option ('nftol',.true.,'n','nftol',''), & option ('hiscall',.true.,'x','hiscall','') & ] - + t0=0.0 ntol=100 mycall='' hiscall='' 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 exit end if @@ -39,6 +40,8 @@ program msk144d display_help = .true. case ('c') read (optarg(:narglen), *) mycall + case ('e') + t0=1e-4 case ('n') read (optarg(:narglen), *) ntol case ('x') @@ -78,7 +81,7 @@ program msk144d read(unit=wav%lun) id2(1:npts) close(unit=wav%lun) 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 call timer('msk144 ',1)