w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7196 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-10-18 02:02:58 +00:00
parent 532afa0d56
commit 8f1d712304
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/detectmsk40.f90
View File

@ -53,7 +53,7 @@ subroutine detectmsk40(cbig,n,mycall,hiscall,lines,nmessages, &
data s8r/1,0,1,1,0,0,0,1/ data s8r/1,0,1,1,0,0,0,1/
! codeword for the message <K9AN K1JT> RRR ! codeword for the message <K9AN K1JT> 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/ 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 if(first) then
nmatchedfilter=1 nmatchedfilter=1

4
lib/msk40decodeframe.f90
View File

@ -24,7 +24,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,msgreceived,nsuccess)
data rpt/"-03 ","+00 ","+03 ","+06 ","+10 ","+13 ","+16 ", & data rpt/"-03 ","+00 ","+03 ","+06 ","+10 ","+13 ","+16 ", &
"R-03","R+00","R+03","R+06","R+10","R+13","R+16", & "R-03","R+00","R+03","R+06","R+10","R+13","R+16", &
"RRR ","73 "/ "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 if(first) then
! define half-sine pulse and raised-cosine edge window ! define half-sine pulse and raised-cosine edge window
@ -129,7 +129,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,msgreceived,nsuccess)
enddo enddo
nrxrpt=iand(imsg,15) nrxrpt=iand(imsg,15)
nrxhash=(imsg-nrxrpt)/16 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.nhashes(nrxrpt)) then
if(nhammd.le.5 .and. cord .lt. 1.7 .and. nrxhash.eq.ihash) then if(nhammd.le.5 .and. cord .lt. 1.7 .and. nrxhash.eq.ihash) then
nsuccess=1 nsuccess=1