w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-04 15:12:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup...

Browse Source
This commit is contained in:
Joe Taylor 2022-12-13 15:04:50 -05:00
parent 68d036913a
commit 8507f6ff46
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
q65w/libq65/decode0.f90
View File

@ -43,8 +43,7 @@ subroutine decode0(dd,ss,savg)
call timer('q65wa ',0) call timer('q65wa ',0)
call q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & call q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, &
nfcal,nsum,mycall,hiscall,hisgrid,nhsym,nfsample, & nfcal,mycall,hiscall,hisgrid,nhsym,nfsample,nmode,ndop00)
ndiskdat,nmode,ndop00)
call timer('q65wa ',1) call timer('q65wa ',1)
flush(6) flush(6)

5
q65w/libq65/q65b.f90
View File

@ -104,11 +104,6 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
enddo enddo
iwave(2*nfft2+1:)=0 iwave(2*nfft2+1:)=0
! open(30,file='000000_0001.wav',status='unknown',access='stream')
! h=default_header(12000,NMAX)
! write(30) h,iwave
! close(30)
nsubmode=mode_q65-1 nsubmode=mode_q65-1
nfa=990 !Tight limits around ipk for the wideband decode nfa=990 !Tight limits around ipk for the wideband decode
nfb=1010 nfb=1010

29
q65w/libq65/q65wa.f90
View File

@ -1,7 +1,6 @@
subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, &
nfcal,nsum,mycall,hiscall,hisgrid,nhsym,nfsample, & nfcal,mycall,hiscall,hisgrid,nhsym,nfsample,nmode,ndop00)
ndiskdat,nmode,ndop00)
! Processes timf2 data from Linrad to find and decode JT65 and Q65 signals. ! Processes timf2 data from Linrad to find and decode JT65 and Q65 signals.
@ -14,22 +13,19 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
real dd(2,NSMAX) real dd(2,NSMAX)
real*4 ss(322,NFFT),savg(NFFT) real*4 ss(322,NFFT),savg(NFFT)
real*8 fcenter real*8 fcenter
character*3 shmsg0(4) character mycall*12,hiscall*12,hisgrid*6
character mycall*12,hiscall*12,hisgrid*6,cm*1
logical bq65 logical bq65
logical candec(MAX_CANDIDATES) logical candec(MAX_CANDIDATES)
character blank*22
type(candidate) :: cand(MAX_CANDIDATES) type(candidate) :: cand(MAX_CANDIDATES)
character*60 result character*60 result
common/decodes/ndecodes,ncand,result(50) common/decodes/ndecodes,ncand,result(50)
common/testcom/ifreq common/testcom/ifreq
data blank/' '/,cm/'#'/
data shmsg0/'ATT','RO ','RRR','73 '/
data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/,mousefqso0/-999/
save save
nagain=0 !### TEMPORARY ### ! write(*,3001) newdat,ntol,nfa,nfb,mousedf,mousefqso,nagain,nfshift,max_drift
!3001 format(9i6)
nagain=0 !### TEMPORARY ? ###
rewind 12 rewind 12
nkhz_center=nint(1000.0*(fcenter-int(fcenter))) nkhz_center=nint(1000.0*(fcenter-int(fcenter)))
@ -45,20 +41,12 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
nwrite_q65=0 nwrite_q65=0
bq65=mode_q65.gt.0 bq65=mode_q65.gt.0
mousefqso0=mousefqso
nsum=0
df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz
if(nfsample.eq.95238) df=95238.1/NFFT if(nfsample.eq.95238) df=95238.1/NFFT
ftol=0.010 !Frequency tolerance (kHz) ftol=0.010 !Frequency tolerance (kHz)
foffset=0.001*(1270 + nfcal) !Offset from sync tone, plus CAL foffset=0.001*(1270 + nfcal) !Offset from sync tone, plus CAL
fqso=mousefqso + foffset - 0.5*(nfa+nfb) + nfshift !fqso at baseband (khz) fqso=mousefqso + foffset - 0.5*(nfa+nfb) + nfshift !fqso at baseband (khz)
iloop=0 iloop=0
if(nutc.ne.nutc0) nfile=nfile+1
nutc0=nutc
nqd=0 nqd=0
call timer('filbig ',0) call timer('filbig ',0)
@ -67,14 +55,11 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
! Do the wideband Q65 decode ! Do the wideband Q65 decode
do icand=1,ncand do icand=1,ncand
f0=cand(icand)%f
if(cand(icand)%iflip.ne.0) cycle !Do only Q65 candidates here if(cand(icand)%iflip.ne.0) cycle !Do only Q65 candidates here
if(candec(icand)) cycle !Skip if already decoded if(candec(icand)) cycle !Skip if already decoded
freq=cand(icand)%f+nkhz_center-48.0-1.27046 freq=cand(icand)%f+nkhz_center-48.0-1.27046
ikhz=nint(freq) ikhz=nint(freq)
f0=cand(icand)%f
! write(*,3301) nqd,ikhz,mousedf,ntol,newdat,nagain,max_drift,f0,fqso
!3301 format('DDD',7i5,2f8.3)
call timer('q65b ',0) call timer('q65b ',0)
call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, & call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &