diff --git a/lib/genjt9.f90 b/lib/genjt9.f90 index 1f1099d0f..fadd1824e 100644 --- a/lib/genjt9.f90 +++ b/lib/genjt9.f90 @@ -1,4 +1,4 @@ -subroutine genjt9(message,minutes,msgsent,d6) +subroutine genjt9(message,msgsent,d6) ! Encodes a JT9 message and returns msgsent, the message as it will ! be decoded, and an integer array d6(85) of 9-FSK tone values diff --git a/lib/getpfx1.f b/lib/getpfx1.f index 21489f522..8f5985e97 100644 --- a/lib/getpfx1.f +++ b/lib/getpfx1.f @@ -69,7 +69,7 @@ k=-1 else if(ispfx) then - tpfx=lof + tpfx=lof(1:4) k=nchar(tpfx(1:1)) k=37*k + nchar(tpfx(2:2)) k=37*k + nchar(tpfx(3:3)) @@ -80,7 +80,7 @@ callsign=callsign0(i+1:) endif if(issfx) then - tsfx=rof + tsfx=rof(1:3) k=nchar(tsfx(1:1)) k=37*k + nchar(tsfx(2:2)) k=37*k + nchar(tsfx(3:3)) diff --git a/lib/jt9.f90 b/lib/jt9.f90 index acda16884..d821a282a 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -31,8 +31,6 @@ program jt9 endif call getarg(1,arg) if(arg(1:2).eq.'-s') then -! call jt9a -! call ftnquit go to 999 endif read(arg,*) ntrperiod @@ -42,14 +40,11 @@ program jt9 nfa=1000 nfb=2000 ntol=500 - mousedf=0 - mousefqso=1500 + nfqso=1500 newdat=1 nb=0 nbslider=100 -! call ftninit('.') - do ifile=ifile1,nargs call getarg(ifile,infile) open(10,file=infile,access='stream',status='old',err=998) @@ -83,7 +78,7 @@ program jt9 if(nhsym.ge.1 .and. nhsym.ne.nhsym0) then ! Emit signal readyForFFT call symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb, & - s,red,f0a,df3,ihsym,nzap,slimit,lstrong) + s,red,df3,ihsym,nzap,slimit,lstrong) nhsym0=nhsym if(ihsym.ge.184) go to 10 endif @@ -93,21 +88,17 @@ program jt9 ! Now do the decoding nutc=nutc0 - nstandalone=1 - - ntol=500 - nfqso=1500 ! Get sync, approx freq call sync9(ss,tstep,f0a,df3,ntol,nfqso,sync,fpk,red) fpk0=fpk - iz=1000.0/df3 - do i=1,iz - freq=1000.0 + (i-1)*df3 - write(72,3001) freq,red(i),db(red(i)) -3001 format(3f10.3) - enddo - flush(72) +! iz=1000.0/df3 +! do i=1,iz +! freq=1000.0 + (i-1)*df3 +! write(72,3001) freq,red(i),db(red(i)) +!3001 format(3f10.3) +! enddo +! flush(72) call spec9(c0,npts8,nsps,f0a,fpk,xdt,i1SoftSymbols) call decode9(i1SoftSymbols,msg) diff --git a/lib/packmsg.f b/lib/packmsg.f index 76eb5f845..1a1b488d2 100644 --- a/lib/packmsg.f +++ b/lib/packmsg.f @@ -4,7 +4,7 @@ parameter (NBASE2=262178562) character*22 msg integer dat(12) - character*12 c1,c2,c2z + character*12 c1,c2 character*4 c3 character*6 grid6 c character*3 dxcc !Where is DXCC implemented? @@ -52,7 +52,6 @@ C ... and if so, does it have a reply frequency? if(c3.eq.'OOO ') c3=' ' !Strip out the OOO flag call getpfx1(c1,k1,junk) call packcall(c1,nc1,text1) - c2z=c2 call getpfx1(c2,k2,nv2) call packcall(c2,nc2,text2) if(nv2.eq.0) then diff --git a/lib/symspec.f90 b/lib/symspec.f90 index 3c6de69dc..4e6cab445 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -1,5 +1,5 @@ subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,red, & - f0a,df3,ihsym,nzap,slimit,lstrong) + df3,ihsym,nzap,slimit,lstrong) ! Input: ! k pointer to the most recent new data @@ -71,7 +71,6 @@ subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,red, & nzap=0 sigmas=1.0*(10.0**(0.01*nbslider)) + 0.7 peaklimit=sigmas*max(10.0,rms) - faclim=3.0 px=0. nwindow=2 @@ -85,7 +84,7 @@ subroutine symspec(k,ntrperiod,nsps,ndiskdat,nb,nbslider,pxdb,s,red, & do i=1,NFFT1 x0(i)=id2(k1+i) enddo - call timf2(x0,k,NFFT1,nwindow,nb,peaklimit,faclim,x1, & + call timf2(x0,k,NFFT1,nwindow,nb,peaklimit,x1, & slimit,lstrong,px,nzap) ! Mix at 1500 Hz, lowpass at +/-750 Hz, and downsample to 1500 Hz complex. diff --git a/lib/sync9.f90 b/lib/sync9.f90 index 42eda783e..94a73ab5b 100644 --- a/lib/sync9.f90 +++ b/lib/sync9.f90 @@ -14,6 +14,8 @@ subroutine sync9(ss,tstep,f0a,df3,ntol,nfqso,sync,fpk,ccfred) 0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0, & 1,0,0,0,1/ + ipk=0 + ipkbest=0 ia=1 ib=min(1000,nint(1000.0/df3)) @@ -46,7 +48,7 @@ subroutine sync9(ss,tstep,f0a,df3,ntol,nfqso,sync,fpk,ccfred) if(smax.gt.sbest) then sbest=smax ipkbest=ipk - lagpkbest=lagpk +! lagpkbest=lagpk endif ccfred(i)=smax enddo diff --git a/lib/timf2.f90 b/lib/timf2.f90 index bd39824bd..ee627b14d 100644 --- a/lib/timf2.f90 +++ b/lib/timf2.f90 @@ -1,4 +1,4 @@ -subroutine timf2(x0,k,nfft,nwindow,nb,peaklimit,faclim,x1, & +subroutine timf2(x0,k,nfft,nwindow,nb,peaklimit,x1, & slimit,lstrong,px,nzap) ! Sequential processing of time-domain I/Q data, using Linrad-like @@ -28,7 +28,7 @@ subroutine timf2(x0,k,nfft,nwindow,nb,peaklimit,faclim,x1, & complex cxs(0:MAXFFT-1) !Strong signals complex cxw(0:MAXFFT-1) !Weak signals real*4 w(0:MAXFFT-1) - real*4 s(0:MAXNH),stmp(0:MAXNH) + real*4 s(0:MAXNH) logical*1 lstrong(0:MAXNH),lprev integer ia(MAXSIGS),ib(MAXSIGS) logical first