w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 20:28:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2018-09-26 14:50:02 -04:00
commit 9666fb9531
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/crc.f90
View File

@ -26,7 +26,7 @@ module crc
integer (c_int), value :: length integer (c_int), value :: length
end function crc13 end function crc13
function crc13_check (data, length) bind (C, name="crc14_check") function crc13_check (data, length) bind (C, name="crc13_check")
use, intrinsic :: iso_c_binding, only: c_bool, c_ptr, c_int use, intrinsic :: iso_c_binding, only: c_bool, c_ptr, c_int
implicit none implicit none
logical (c_bool) :: crc13_check logical (c_bool) :: crc13_check

17
lib/ft8/ft8b_2.f90
View File

@ -124,7 +124,7 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
ctwk(i)=cmplx(cos(phi),sin(phi)) ctwk(i)=cmplx(cos(phi),sin(phi))
phi=mod(phi+dphi,twopi) phi=mod(phi+dphi,twopi)
enddo enddo
call sync8d(cd0,i0,ctwk,1,2,sync) call sync8d(cd0,i0,ctwk,1,2,sync)
if( sync .gt. smax ) then if( sync .gt. smax ) then
smax=sync smax=sync
delfbest=delf delfbest=delf
@ -335,13 +335,16 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
xnoi=xnoi+s8(ios,i)**2 xnoi=xnoi+s8(ios,i)**2
enddo enddo
xsnr=0.001 xsnr=0.001
if(xnoi.gt.0 .and. xnoi.lt.xsig) xsnr=xsig/xnoi-1.0 xsnr2=0.001
! if(.not.nagain) then arg=xsig/xnoi-1.0
! xbase=10**(xbase/10.0) if(arg.gt.0.1) xsnr=arg
! arg=xsig/xbase/3.6e6-1.0 arg=xsig/xbase/2.8e6-1.0
! if(arg.gt.0.1) xsnr=arg if(arg.gt.0.1) xsnr2=arg
! endif
xsnr=10.0*log10(xsnr)-27.0 xsnr=10.0*log10(xsnr)-27.0
xsnr2=10.0*log10(xsnr2)-27.0
if(.not.nagain) then
xsnr=xsnr2
endif
if(xsnr .lt. -24.0) xsnr=-24.0 if(xsnr .lt. -24.0) xsnr=-24.0
return return