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

Disallow Sh message decodes with nrxrpt .le. 6.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7460 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2017-01-06 20:53:50 +00:00
parent 2698fc02c6
commit da6c0c246e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/msk40decodeframe.f90
View File

@ -134,14 +134,14 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray, &
nrxrpt=iand(imsg,15) nrxrpt=iand(imsg,15)
nrxhash=(imsg-nrxrpt)/16 nrxhash=(imsg-nrxrpt)/16
if(nhammd.le.4 .and. cord .lt. 0.65 .and. nrxhash.eq.ihash) then if(nhammd.le.4 .and. cord .lt. 0.65 .and. &
nrxhash.eq.ihash .and. nrxrpt.ge.7) then
!write(*,*) 'decodeframe 1',nbadsync,nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma !write(*,*) 'decodeframe 1',nbadsync,nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma
nsuccess=1 nsuccess=1
write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall), & write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall), &
trim(hiscall),">",rpt(nrxrpt) trim(hiscall),">",rpt(nrxrpt)
return return
! elseif(bswl .and. nhammd.le.2 .and. cord.lt.0.40 .and. xsnr .gt. -3.0) then elseif(bswl .and. nhammd.le.4 .and. cord.lt.0.65 .and. nrxrpt.ge.7 ) then
elseif(bswl .and. nhammd.le.4 .and. cord.lt.0.65 ) then
do i=1,nrecent do i=1,nrecent
do j=i+1,nrecent do j=i+1,nrecent
if( nrxhash .eq. nhasharray(i,j) ) then if( nrxhash .eq. nhasharray(i,j) ) then
@ -157,7 +157,6 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray, &
endif endif
enddo enddo
enddo enddo
! if(nsuccess.eq.0 .and. nhammd.le.2 .and. cord.lt.0.40 .and. xsnr.gt. -3.0 ) then
if(nsuccess.eq.0) then if(nsuccess.eq.0) then
nsuccess=3 nsuccess=3
!write(*,*) 'decodeframe 4',bswl,nbadsync,nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma,nsuccess !write(*,*) 'decodeframe 4',bswl,nbadsync,nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma,nsuccess

12
lib/msk40spd.f90
View File

@ -69,12 +69,12 @@ subroutine msk40spd(cbig,n,ntol,mycall,hiscall,bswl,nhasharray,recent_calls, &
detfer=-999.99 detfer=-999.99
nfhi=2*(fc+500) nfhi=2*(fc+500)
nflo=2*(fc-500) nflo=2*(fc-500)
ihlo=(nfhi-2*ntol)/df+1 ihlo=nint((nfhi-2*ntol)/df)+1
ihhi=(nfhi+2*ntol)/df+1 ihhi=nint((nfhi+2*ntol)/df)+1
illo=(nflo-2*ntol)/df+1 illo=nint((nflo-2*ntol)/df)+1
ilhi=(nflo+2*ntol)/df+1 ilhi=nint((nflo+2*ntol)/df)+1
i2000=nflo/df+1 i2000=nint(nflo/df)+1
i4000=nfhi/df+1 i4000=nint(nfhi/df)+1
do istp=1,nstep do istp=1,nstep
ns=1+60*(istp-1) ns=1+60*(istp-1)
ne=ns+NSPM-1 ne=ns+NSPM-1