w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 20:48:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove common/early/ and its variables -- they are not used in q65w.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-13 12:58:52 -05:00
parent 9d89042d44
commit f68d4e2e6f
5 changed files with 6 additions and 31 deletions

2
q65w/libq65/decode0.f90
View File

@ -6,7 +6,6 @@ subroutine decode0(dd,ss,savg)
real*4 dd(2,NSMAX),ss(322,NFFT),savg(NFFT)
real*8 fcenter
integer hist(0:32768)
logical ldecoded
character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20
character mycall0*12,hiscall0*12,hisgrid0*6
character*60 result
@ -15,7 +14,6 @@ subroutine decode0(dd,ss,savg)
ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, &
mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, &
ndop00,nsave,max_drift,nhsym,mycall,mygrid,hiscall,hisgrid,datetime
common/early/nhsym1,nhsym2,ldecoded(32768)
data neme0/-99/
save

4
q65w/libq65/q65b.f90
View File

@ -19,7 +19,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
integer*2 iwave(60*12000)
complex ca(MAXFFT1) !FFTs of raw x,y data
complex cx(0:MAXFFT2-1),cz(0:MAXFFT2)
logical ldecoded
integer ipk1(1)
real*8 fcenter,freq0,freq1
character*12 mycall0,hiscall0
@ -32,7 +31,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
character*60 result
common/decodes/ndecodes,ncand,result(50)
common/cacb/ca
common/early/nhsym1,nhsym2,ldecoded(32768)
data nutc00/-1/,msg00/' '/
save
@ -48,7 +46,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
ib=nint(ifreq+ntol/df3)
ipk1=maxloc(sync(ia:ib)%ccfmax)
ipk=ia+ipk1(1)-1
if(ldecoded(ipk)) go to 900
snr1=sync(ipk)%ccfmax
ipol=1
@ -129,7 +126,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
freq0=MHz + 0.001d0*ikhz
if(nsnr0.gt.-99) then
ldecoded(ipk)=.true.
nq65df=nint(1000*(0.001*k0*df+nkhz_center-48.0+1.000-1.27046-ikhz))-nfcal
nq65df=nq65df + nfreq0 - 1000
npol=nint(poldeg)

3
q65w/libq65/q65c.f90
View File

@ -11,7 +11,7 @@ subroutine q65c(itimer)
include 'njunk.f90'
real*8 fcenter
integer nparams0(NJUNK+3),nparams(NJUNK+3)
logical ldecoded,first
logical first
character*12 mycall,hiscall
character*6 mygrid,hisgrid
character*20 datetime
@ -26,7 +26,6 @@ subroutine q65c(itimer)
datetime,junk1,junk2
!### REMEMBER that /npar/ is not updated until nparams=nparams0 is executed. ###
common/early/nhsym1,nhsym2,ldecoded(32768)
equivalence (nparams,fcenter)
data first/.true./
save first

25
q65w/libq65/q65wa.f90
View File

@ -18,13 +18,11 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
character mycall*12,hiscall*12,hisgrid*6,cm*1
logical bq65
logical candec(MAX_CANDIDATES)
logical ldecoded
character blank*22
type(candidate) :: cand(MAX_CANDIDATES)
character*60 result
common/decodes/ndecodes,ncand,result(50)
common/testcom/ifreq
common/early/nhsym1,nhsym2,ldecoded(32768)
data blank/' '/,cm/'#'/
data shmsg0/'ATT','RO ','RRR','73 '/
@ -34,31 +32,16 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
nagain=0 !### TEMPORARY ###
rewind 12
! Clean start for Q65 at early decode
if(nhsym.eq.nhsym1 .or. nagain.ne.0) ldecoded=.false.
if(ndiskdat.eq.1) ldecoded=.false.
nkhz_center=nint(1000.0*(fcenter-int(fcenter)))
mfa=nfa-nkhz_center+48
mfb=nfb-nkhz_center+48
mode_q65=nmode/10
nts_q65=2**(mode_q65-1) !Q65 tone separation factor
! if(nagain.eq.0) then
call timer('get_cand',0)
call get_candidates(ss,savg,nhsym,mfa,mfb,nts_jt65,nts_q65,cand,ncand)
call timer('get_cand',1)
candec=.false.
! endif
!###
! do k=1,ncand
! freq=cand(k)%f+nkhz_center-48.0
! ipk=cand(k)%indx
! write(71,3071) k,db(cand(k)%snr),freq,cand(k)%xdt, &
! cand(k)%ipol,cand(k)%iflip,ipk,ldecoded(ipk)
!3071 format(i3,f8.2,f10.3,f8.2,2i3,i6,L4)
! enddo
!###
call timer('get_cand',0)
call get_candidates(ss,savg,nhsym,mfa,mfb,nts_jt65,nts_q65,cand,ncand)
call timer('get_cand',1)
candec=.false.
nwrite_q65=0
bq65=mode_q65.gt.0

3
q65w/libq65/wideband_sync.f90
View File

@ -37,10 +37,9 @@ subroutine get_candidates(ss,savg,jz,nfa,nfb,nts_jt65,nts_q65,cand,ncand)
real ss(322,NFFT),savg(NFFT)
real pavg(-20:20)
integer indx(NFFT)
logical skip,ldecoded
logical skip
type(candidate) :: cand(MAX_CANDIDATES)
type(candidate) :: cand0(MAX_CANDIDATES)
common/early/nhsym1,nhsym2,ldecoded(32768)
call wb_sync(ss,savg,jz,nfa,nfb) !Output to sync() array