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

Working toward a better sync scheme.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7724 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-06-16 20:14:36 +00:00
parent 9d89cc0719
commit 383bff512c
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/fsk4hf/ft8d.f90
View File

@ -58,10 +58,9 @@ program ft8d
datetime=infile(j2-13:j2-1) datetime=infile(j2-13:j2-1)
call system_clock(count0,clkfreq) call system_clock(count0,clkfreq)
! call ft8filbig(iwave,NN*NSPS) call ft8filbig(iwave,NN*NSPS,xdta,f1a,xsnr)
call sync8(iwave,xdt,f1,s) call sync8(iwave,xdt,f1,s)
xsnr=0.
tstep=0.5*NSPS/12000.0 tstep=0.5*NSPS/12000.0
df=12000.0/NFFT1 df=12000.0/NFFT1
i0=nint(f1/df) i0=nint(f1/df)
@ -109,8 +108,8 @@ program ft8d
call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent) call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent)
endif endif
nsnr=nint(xsnr) nsnr=nint(xsnr)
write(13,1110) datetime,0,nsnr,xdt,f1,niterations,nharderrors,message write(13,1110) datetime,0,nsnr,xdt,f1,xdta,f1a,niterations,nharderrors,message
1110 format(a13,2i4,f6.2,f7.1,2i4,2x,a22) 1110 format(a13,2i4,2(f6.2,f7.1),2i4,2x,a22)
write(*,1112) datetime(8:13),nsnr,xdt,nint(f1),message write(*,1112) datetime(8:13),nsnr,xdt,nint(f1),message
1112 format(a6,i4,f5.1,i6,2x,a22) 1112 format(a6,i4,f5.1,i6,2x,a22)
if(abs(xdt).le.0.1 .or. abs(f1-1500).le.2.93) nsync=nsync+1 if(abs(xdt).le.0.1 .or. abs(f1-1500).le.2.93) nsync=nsync+1
@ -121,7 +120,7 @@ program ft8d
tsec=tsec+float(count1-count0)/float(clkfreq) tsec=tsec+float(count1-count0)/float(clkfreq)
enddo ! ifile loop enddo ! ifile loop
write(*,1100) max_iterations,norder,float(nsync)/nfiles,float(ngood)/nfiles, & write(21,1100) max_iterations,norder,float(nsync)/nfiles,float(ngood)/nfiles, &
float(nbad)/nfiles,tsec/nfiles float(nbad)/nfiles,tsec/nfiles
1100 format(2i5,3f8.4,f9.3) 1100 format(2i5,3f8.4,f9.3)

4
lib/fsk4hf/ft8sim.f90
View File

@ -94,10 +94,6 @@ program ft8sim
close(10) close(10)
write(*,1110) ifile,xdt,f0,snrdb,fname write(*,1110) ifile,xdt,f0,snrdb,fname
1110 format(i4,f7.2,f8.2,f7.1,2x,a17) 1110 format(i4,f7.2,f8.2,f7.1,2x,a17)
! do i=0,NZ-1
! write(13,3001) i,i/12000.0,c(i),iwave(i+1)
!3001 format(i8,f12.6,2f12.3,i8)
! enddo
enddo enddo
999 end program ft8sim 999 end program ft8sim