w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-15 08:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Good decode implies sync OK. Also some code cleanup.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6949 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-07-26 16:44:35 +00:00
parent 38113068cd
commit f5737348fe
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decoder.f90
View File

@ -248,7 +248,7 @@ contains
if(ft.ge.80) then if(ft.ge.80) then
nft=ft-100 nft=ft-100
csync=': ' csync=': '
if(snr.gt.-30) csync=':*' if(snr.gt.-30 .or. nft.ge.0) csync=':*'
if(nft.lt.0) then if(nft.lt.0) then
write(*,1009) params%nutc,snr,dt,freq,csync,decoded write(*,1009) params%nutc,snr,dt,freq,csync,decoded
else else

12
lib/qra64a.f90
View File

@ -11,11 +11,11 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mycall_12,hiscall_12, &
complex c00(0:360000) !Complex spectrum of dd() complex c00(0:360000) !Complex spectrum of dd()
complex c0(0:360000) !Complex spectrum of dd() complex c0(0:360000) !Complex spectrum of dd()
! integer*8 count0,count1,clkfreq ! integer*8 count0,count1,clkfreq
integer icos7(0:6)
integer dat4(12)
real a(3) real a(3)
real dd(NMAX) real dd(NMAX) !Raw data sampled at 12000 Hz
real s3(0:63,1:63) real s3(0:63,1:63) !Symbol spectra
integer dat4(12) !Decoded message (as 12 integers)
integer icos7(0:6)
data icos7/2,5,6,0,4,1,3/ !Costas 7x7 pattern data icos7/2,5,6,0,4,1,3/ !Costas 7x7 pattern
data nc1z/-1/,nc2z/-1/,ng2z/-1/ data nc1z/-1/,nc2z/-1/,ng2z/-1/
save save
@ -28,7 +28,6 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mycall_12,hiscall_12, &
call packcall(mycall,nc1,ltext) call packcall(mycall,nc1,ltext)
call packcall(hiscall,nc2,ltext) call packcall(hiscall,nc2,ltext)
call packgrid(hisgrid,ng2,ltext) call packgrid(hisgrid,ng2,ltext)
if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z) then if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z) then
do naptype=0,5 do naptype=0,5
call qra64_dec(s3,nc1,nc2,ng2,naptype,1,dat4,snr2,irc) call qra64_dec(s3,nc1,nc2,ng2,naptype,1,dat4,snr2,irc)
@ -39,12 +38,9 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mycall_12,hiscall_12, &
endif endif
maxf1=5 maxf1=5
! maxf1=0
call sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snr1,c00) call sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snr1,c00)
!###
npts2=216000 npts2=216000
snr2=-99.
naptype=4 naptype=4
do itry0=1,3 do itry0=1,3
idf0=itry0/2 idf0=itry0/2

15
lib/sync64.f90
View File

@ -43,7 +43,6 @@ subroutine sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snrdb,c0)
nfft2=nfft1/3 nfft2=nfft1/3
df1=12000.0/nfft1 df1=12000.0/nfft1
fac=2.0/nfft1 fac=2.0/nfft1
! x=fac*dd(1:nfft1)
do i=0,nfft1/2 do i=0,nfft1/2
c0(i)=fac*cmplx(dd(1+2*i),dd(2+2*i)) c0(i)=fac*cmplx(dd(1+2*i),dd(2+2*i))
enddo enddo
@ -108,22 +107,10 @@ subroutine sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snrdb,c0)
ja=max(0,jpk-2*jstep) ja=max(0,jpk-2*jstep)
jb=min(336000-NSPC,jpk+2*jstep) jb=min(336000-NSPC,jpk+2*jstep)
jstep=10 jstep=10
! ka=kpk
! kb=kpk
enddo enddo
!### write(17) ia,ib,s0a(ia:ib) !Save data for red curve
! rewind 73
! do i=ia,ib
! write(73,3201) i*df3,s0a(i),db(s0a(i))
!3201 format(3f10.3)
! enddo
! flush(73)
!###
write(17) ia,ib,s0a(ia:ib) !Save red()
close(17) close(17)
snrdb=10.0*log10(snr)-39.0 snrdb=10.0*log10(snr)-39.0
return return