diff --git a/ccf65.f b/ccf65.f index 88d599d73..6c09c58ec 100644 --- a/ccf65.f +++ b/ccf65.f @@ -3,7 +3,7 @@ parameter (NFFT=512,NH=NFFT/2) real ss(4,322) -!Input: half-symbol powers, 4 pol'ns + !Input: half-symbol powers, 4 pol'ns real s(NFFT) !CCF = ss*pr complex cs(0:NH) !Complex FT of s real s2(NFFT) !CCF = ss*pr2 diff --git a/decode1a.f b/decode1a.f index b8b363e7a..05ab6916a 100644 --- a/decode1a.f +++ b/decode1a.f @@ -27,7 +27,6 @@ C Mix sync tone to baseband, low-pass filter, and decimate by 64 dt00=dt C If freq=125.0 kHz, f0=48000 Hz. f0=1000*(freq-77.0) !Freq of sync tone (0-96000 Hz) - if(nfilt.eq.1) then call filbig(id,NMAX,f0,newdat,cx,cy,n5) joff=0 diff --git a/ftn_init.F90 b/ftn_init.F90 index e6b2a3c66..7614dc93c 100644 --- a/ftn_init.F90 +++ b/ftn_init.F90 @@ -77,7 +77,6 @@ subroutine ftn_init err=911) #endif endfile 19 - rewind 19 #ifdef Win32 open(20,file=appdir(:iz)//'/bandmap2.txt',status='unknown', & @@ -87,7 +86,6 @@ subroutine ftn_init err=912) #endif endfile 20 - rewind 20 #ifdef Win32 open(21,file=appdir(:iz)//'/ALL.TXT',status='unknown', & @@ -122,8 +120,6 @@ subroutine ftn_init #else open(26,file=appdir(:iz)//'/tmp26.txt',status='unknown') #endif - end file 26 - rewind 26 return diff --git a/map65.py b/map65.py index 1df5b93f7..f99388997 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#--------------------------------------------------------------------- MAP65 +#-------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * @@ -1871,6 +1871,9 @@ lsync.configure(text=slabel+str(isync)) lclip.configure(text='Clip '+str(iclip)) Audio.gcom2.appdir=(appdir+' ')[:80] Audio.gcom2.ndepth=ndepth.get() +f=open(appdir+'/tmp26.txt','w') +f.truncate(0) +f.close Audio.ftn_init() GenStdMsgs() Audio.gcom4.addpfx=(options.addpfx.get().lstrip()+' ')[:8] diff --git a/recvpkt.F90 b/recvpkt.F90 index 6c7c3c47f..d7786b629 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -8,7 +8,7 @@ subroutine recvpkt(iarg) use dflib #endif - parameter (NSZ=60*96000) + parameter (NSZ=2*60*96000) real*8 d8(NSZ) integer*1 userx_no,iusb integer*2 nblock,nblock0 @@ -27,7 +27,6 @@ subroutine recvpkt(iarg) call setup_rsocket nreset=-1 k=0 - npkt=0 nsec0=-999 10 call recv_pkt(center_freq) @@ -51,10 +50,13 @@ subroutine recvpkt(iarg) nreset=0 kb=3-kb k=0 - if(kb.eq.2) k=NSZ + if(kb.eq.2) k=NSMAX nlost=0 endif + if(kb.eq.1 .and. (k+174).gt.NSMAX) go to 20 + if(kb.eq.2 .and. (k+174).gt.2*NSMAX) go to 20 + if(transmitting.eq.0) then do i=1,174 k=k+1 @@ -66,9 +68,12 @@ subroutine recvpkt(iarg) d8(k)=0.d0 enddo endif + if(k.lt.1 .or. k.gt.NSZ) then + print*,'Error in recvpkt: ',k,NSZ,NSMAX + stop + endif - npkt=npkt+1 - if(nsec.ne.nsec0) then +20 if(nsec.ne.nsec0) then mutch=nsec/3600 mutcm=mod(nsec/60,60) mutc=100*mutch + mutcm diff --git a/ssort.f b/ssort.f index be249f5ea..cea0c2d42 100644 --- a/ssort.f +++ b/ssort.f @@ -28,8 +28,8 @@ c = -2 means sort x in decreasing order and carry y along. nn = n if (nn .lt. 1) then - print*,'ssort: The number of sort elements is not positive.' - print*,'ssort: n = ',nn,' kflag = ',kflag +! print*,'ssort: The number of sort elements is not positive.' +! print*,'ssort: n = ',nn,' kflag = ',kflag return endif c