From 8f1d71230432598158ea15fbd6f61d25d8284c58 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 18 Oct 2016 02:02:58 +0000 Subject: [PATCH] Sh message hashes now computed using callsigns only. This version should be OK for on the air use - but Sh messages are not compatible with earlier revisions. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7196 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/detectmsk40.f90 | 2 +- lib/msk40decodeframe.f90 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/detectmsk40.f90 b/lib/detectmsk40.f90 index ba894f9ba..f50074e55 100644 --- a/lib/detectmsk40.f90 +++ b/lib/detectmsk40.f90 @@ -53,7 +53,7 @@ subroutine detectmsk40(cbig,n,mycall,hiscall,lines,nmessages, & data s8r/1,0,1,1,0,0,0,1/ ! codeword for the message RRR data testcw/0,1,0,0,0,1,0,1,0,0,1,1,1,1,0,1,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,0/ - save df,first,cb,cbr,fs,pi,twopi,dt,s8,s8r,rcw,pp,nmatchedfilter,rpt,mycall0,hiscall0 + save df,first,cb,cbr,fs,pi,twopi,dt,s8,s8r,rcw,pp,nmatchedfilter,rpt,mycall0,hiscall0,ihash if(first) then nmatchedfilter=1 diff --git a/lib/msk40decodeframe.f90 b/lib/msk40decodeframe.f90 index f6fa85a51..df8cf9013 100644 --- a/lib/msk40decodeframe.f90 +++ b/lib/msk40decodeframe.f90 @@ -24,7 +24,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,msgreceived,nsuccess) data rpt/"-03 ","+00 ","+03 ","+06 ","+10 ","+13 ","+16 ", & "R-03","R+00","R+03","R+06","R+10","R+13","R+16", & "RRR ","73 "/ - save first,cb,fs,pi,twopi,dt,s8r,pp,rpt,mycall0,hiscall0 + save first,cb,fs,pi,twopi,dt,s8r,pp,rpt,mycall0,hiscall0,ihash if(first) then ! define half-sine pulse and raised-cosine edge window @@ -129,7 +129,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,msgreceived,nsuccess) enddo nrxrpt=iand(imsg,15) nrxhash=(imsg-nrxrpt)/16 -!write(*,*) 'decodeframe ',nhammd,cord,nrxhash,nrxrpt,nhashes(nrxrpt) +!write(*,*) 'decodeframe ',nhammd,cord,nrxhash,nrxrpt,ihash ! if(nhammd.le.5 .and. cord .lt. 1.7 .and. nrxhash.eq.nhashes(nrxrpt)) then if(nhammd.le.5 .and. cord .lt. 1.7 .and. nrxhash.eq.ihash) then nsuccess=1