diff --git a/decode1.F90 b/decode1.F90 index 6944d7faf..c0fe69488 100644 --- a/decode1.F90 +++ b/decode1.F90 @@ -28,10 +28,12 @@ subroutine decode1(iarg) newdat=1 endif - if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,rxnoise,newspec) + if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,rxnoise, & + newspec,newdat,ndecoding) if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then ndecdone=0 + print*,'C',nutc,newdat,kbuf,kk,kkdone call map65a(newdat) if(mousebutton.eq.0) ndecoding0=ndecoding ndecoding=0 diff --git a/recvpkt.F90 b/recvpkt.F90 index 1583bdb0d..a223ae976 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -46,6 +46,11 @@ subroutine recvpkt(iarg) endif first=.false. +!### +! kbuf=kb +! kk=k +!### + nsec=msec/1000 if(mod(nsec,60).eq.1) nreset=1 if(mod(nsec,60).eq.0 .and. nreset.eq.1) then @@ -108,13 +113,14 @@ subroutine recvpkt(iarg) nsec0=nsec ntx=ntx+transmitting if(mod(nsec,60).eq.52) then + kk=k kbuf=kb nutc=mutc klost=nlost - if(ntx.lt.20) then - newdat=1 - ndecoding=1 - endif +! if(ntx.lt.20) then +! newdat=1 +! ndecoding=1 +! endif ntx=0 endif endif diff --git a/specjt.py b/specjt.py index 1db81aa27..c76cdbebb 100644 --- a/specjt.py +++ b/specjt.py @@ -257,9 +257,13 @@ def update(): draw2.line((0,0,749,0),fill=128) #Draw the minute separator t=g.ftnstr(Audio.gcom2.utcdata) - draw.text((4,1),t[0:5],fill=253) #Insert time label - draw2.text((4,1),t[0:5],fill=253) #Insert time label +# This test shouldn.t be needed, but ... + try: + draw.text((4,1),t[0:5],fill=253) #Insert time label + draw2.text((4,1),t[0:5],fill=253) #Insert time label + except: + pass pim=ImageTk.PhotoImage(im) #Convert Image to PhotoImage graph1.delete(ALL) diff --git a/symspec.f b/symspec.f index 1e4acaa53..bf63ca0b7 100644 --- a/symspec.f +++ b/symspec.f @@ -1,4 +1,5 @@ - subroutine symspec(id,kbuf,kk,kkdone,rxnoise,newspec) + subroutine symspec(id,kbuf,kk,kkdone,rxnoise,newspec,newdat, + + ndecoding) C Compute spectra at four polarizations, using half-symbol steps. @@ -28,8 +29,9 @@ C Compute spectra at four polarizations, using half-symbol steps. endif do nn=1,ntot - i0=ts+hsym !Starting sample pointer + i0=ts+hsym !Starting sample pointer if((i0+npts-1).gt.kk) go to 999 !See if we have enough points + i1=ts+2*hsym !Next starting sample pointer ts=ts+hsym !OK, update the exact sample pointer do i=1,npts !Copy data to FFT arrays xr=fac*id(1,i0+i) @@ -49,6 +51,7 @@ C Compute spectra at four polarizations, using half-symbol steps. call four2a(cy,NFFT,1,1,1) n=n+1 + print*,'B',n,kbuf,kkdone,kk,i0,npts do i=1,NFFT !Save and accumulate power spectra sx=real(cx(i))**2 + aimag(cx(i))**2 ss(1,n,i)=sx ! Pol = 0 @@ -84,11 +87,15 @@ C Compute spectra at four polarizations, using half-symbol steps. ss5(n,i)=0.707*sqrt(q*q + u*u) enddo - if(n.eq.ntot) then +! if(n.eq.ntot) then + if(n.ge.279) then newspec=1 + newdat=1 + ndecoding=1 go to 999 endif enddo - 999 return + 999 kkdone=i1-1 + return end