Seems to work, including Auto Mode. Try it on the air!

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@447 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

decode1.F90

@@ -28,7 +28,7 @@ subroutine decode1(iarg)
      newdat2=0
      kbuf=1
      kk=NSMAX
-     kkdone=-1
+     kkdone=0
      newdat=1
   endif
 

map65a.f90

@@ -38,6 +38,7 @@ subroutine map65a(newdat)
 
   df=96000.0/NFFT                    !df = 96000/NFFT = 2.930 Hz
   ftol=0.020                          !Frequency tolerance (kHz)
+  fselect=mousefqso + 1.6
   nfilt=1
   dphi=310/57.2957795
 
@@ -306,8 +307,8 @@ subroutine map65a(newdat)
 999 nagain=0
   close(23)
   if(kbuf.eq.1) kkdone=60*96000
-  if(kbuf.eq.2) kkdone=0
+  if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0
   kk=kkdone
-  print*,'E ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym
+  print*,'E ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,ndiskdat
   return
 end subroutine map65a

recvpkt.F90

@@ -12,6 +12,7 @@ subroutine recvpkt(iarg)
   real*8 d8(NSZ)
   integer*1 userx_no,iusb
   integer*2 nblock,nblock0
+  integer txnow
   logical first
   real*8 center_freq,buf8
   common/plrscom/center_freq,msec,fqso,iptr,nblock,userx_no,iusb,buf8(174)
@@ -23,14 +24,20 @@ subroutine recvpkt(iarg)
   data sqave/0.0/,u/0.001/,rxnoise/0.0/,kbuf/1/
   save
 
-! Open a socket to receive multicast data from Linrad
+  call setup_rsocket            ! Open socket to receive multicast data
-  call setup_rsocket
   nreset=-1
   k=0
   nsec0=-999
 
 10 call recv_pkt(center_freq)
-  if(monitoring.eq.1) then
+
+  isec=mid_sec()
+  imin=isec/60
+  if((monitoring.eq.0) .or. (lauto.eq.1 .and. mod(imin,2).eq.(1-TxFirst))) then
+     first=.true.
+     go to 10
+  endif
+
   lost=nblock-nblock0-1
   nblock0=nblock
 
@@ -58,7 +65,6 @@ subroutine recvpkt(iarg)
   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
   sq=0.
   do i=1,174
      k=k+1
@@ -84,13 +90,6 @@ subroutine recvpkt(iarg)
      nw=0
   endif
 
-     else
-!  We're transmitting, zero out this packet.
-        do i=1,174
-           k=k+1
-           d8(k)=0.d0
-        enddo
-     endif
   if(k.lt.1 .or. k.gt.NSZ) then
      print*,'Error in recvpkt: ',k,NSZ,NSMAX
      stop
@@ -103,10 +102,8 @@ subroutine recvpkt(iarg)
      ns=mod(nsec,60)
      nsec0=nsec
      ntx=ntx+transmitting
-!###
+     print*,ns,kb,kbuf,k,kk,kkdone
-!        kk=k
+
-!        kbuf=kb
-!###
      if(ns.eq.48) then
         nutc=mutc
         kbuf=kb
@@ -117,11 +114,10 @@ subroutine recvpkt(iarg)
         nutc=mutc
         kbuf=kb
         kk=k
+        ndiskdat=0
         print*,'A2',mod(mid_sec(),60),nutc,kk,kbuf,kkdone
      endif
   endif
-
-  endif
   go to 10
 
 end subroutine recvpkt

specjt.py

@@ -300,7 +300,7 @@ def update():
         df_mark()
         nmark0=nmark.get()
 
-    if newspec: Audio.gcom2.ndiskdat=0
+#    if newspec: Audio.gcom2.ndiskdat=0
     Audio.gcom2.nlines=0
     Audio.gcom2.nflat=nflat.get()
     frange=nfr.get()*2000

symspec.f90

@@ -19,7 +19,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
   ntot=322                               !Half symbols per transmission
 !  ntot=279                                !Half symbols in 51.8 sec
 
-  if(kbuf.ne.kbuf0 .or. kkdone.eq.-1) then
+  if(kbuf.ne.kbuf0 .or. ndiskdat.eq.1) then
      kkdone=0
      kbuf0=kbuf
      ts=1.d0 - hsym