From 5d3f2b762ec6e69a1976e5ae38ba16c901ba8dac Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Sat, 30 Jun 2007 18:39:18 +0000
Subject: [PATCH] Good working version 0.7.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@449 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 decode1.F90 | 3 ++-
 map65.py    | 9 +++++++--
 map65a.f90  | 6 +++---
 recvpkt.F90 | 4 ++--
 symspec.f90 | 4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/decode1.F90 b/decode1.F90
index 950e47a57..4ce925dbe 100644
--- a/decode1.F90
+++ b/decode1.F90
@@ -32,7 +32,8 @@ subroutine decode1(iarg)
      newdat=1
   endif
 
-  if((kk-kkdone).gt.32768) call symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
+  if(ndecoding.eq.0 .and. ((kk-kkdone).gt.32768))           &
+       call symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
 
   if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then
      ndecdone=0
diff --git a/map65.py b/map65.py
index d96667fcb..0d0db64a6 100644
--- a/map65.py
+++ b/map65.py
@@ -1002,8 +1002,11 @@ def update():
     t="QSO Freq:%4d" % (int(Audio.gcom2.mousefqso),)
     msg3.configure(text=t)    
     t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),)
-    msg4.configure(text=t)    
-    if mode.get()[:4]=='JT65' and Audio.gcom2.ndecoding:
+    msg4.configure(text=t)
+
+    if mode.get()[:4]=='JT65' and \
+        (Audio.gcom2.ndecoding or (isec>45 and  Audio.gcom2.monitoring==1)):
+
 #Set button bg while decoding
         bc='#66FFFF'
 #        if g.ndecphase==1: bc='orange'
@@ -1233,6 +1236,8 @@ setupmenu.add_checkbutton(label = 'F4 sets Tx6',variable=kb8rq)
 setupmenu.add_checkbutton(label = 'Double-click on callsign sets TxFirst',
                           variable=setseq)
 setupmenu.add_checkbutton(label = 'GenStdMsgs sets Tx1',variable=k2txb)
+setupmenu.add_separator()
+setupmenu.add_checkbutton(label = 'Enable diagnostics',variable=ndebug)
 
 #------------------------------------------------------ View menu
 viewbutton=Menubutton(mbar,text='View')
diff --git a/map65a.f90 b/map65a.f90
index 2bec122f8..0aad81453 100644
--- a/map65a.f90
+++ b/map65a.f90
@@ -24,7 +24,7 @@ subroutine map65a(newdat)
 
 !  if(nlost.ne.0) then
      pctlost=nlost/331.03
-     write(*,3001) nutc,mod(mid_sec(),60),nlost,pctlost
+     if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60),nlost,pctlost
 3001 format('mod65a  1:',i5.4,i3.2,i8,f6.1,' %')
 !  endif
 
@@ -226,7 +226,7 @@ subroutine map65a(newdat)
    
         write(11,*) '$EOF'
         call flushqqq(11)
-        write(*,3002) mod(mid_sec(),60)
+        if(ndebug.gt.0) write(*,3002) mod(mid_sec(),60)
 3002 format('mod65a  2:'i8.2)
         ndecdone=1
      endif
@@ -309,7 +309,7 @@ subroutine map65a(newdat)
   if(kbuf.eq.1) kkdone=60*96000
   if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0
   kk=kkdone
-  write(*,3003) mod(mid_sec(),60)
+  if(ndebug.gt.0) write(*,3003) mod(mid_sec(),60)
 3003 format('mod65a  3:'i8.2)
   return
 end subroutine map65a
diff --git a/recvpkt.F90 b/recvpkt.F90
index 745f119c3..70d7f1ea9 100644
--- a/recvpkt.F90
+++ b/recvpkt.F90
@@ -108,12 +108,12 @@ subroutine recvpkt(iarg)
         kbuf=kb
         kk=k
         ndiskdat=0
-        write(*,3001) nutc,mod(mid_sec(),60),ns    !,kk,kbuf,kkdone
+        if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60),ns
 3001    format('recvpkt 1:',i5.4,2i3.2)
      endif
      if(ns.eq.52) then
         kk=k
-        write(*,3002) nutc,mod(mid_sec(),60),ns    !,kk,kbuf,kkdone
+        if(ndebug.gt.0) write(*,3002) nutc,mod(mid_sec(),60),ns
 3002    format('recvpkt 2:',i5.4,2i3.2)
      endif
   endif
diff --git a/symspec.f90 b/symspec.f90
index 7349a8983..ae15cbd5e 100644
--- a/symspec.f90
+++ b/symspec.f90
@@ -12,7 +12,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
   data kbuf0/-999/
   save
 
-  write(*,3001) nutc,mod(mid_sec(),60)    !,kk,kbuf,kkdone
+  if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60)
 3001 format('symspec 1:',i5.4,i3.2)
   fac=0.0002 * 10.0**(0.05*(-rxnoise))
   hsym=2048.d0*96000.d0/11025.d0          !Samples per half symbol
@@ -110,7 +110,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
 
 998 kkdone=i1-1
 999 continue
-  write(*,3002) mod(mid_sec(),60),n    !,kk,kbuf,kkdone
+  if(ndebug.gt.0) write(*,3002) mod(mid_sec(),60),n
 3002 format('symspec 2:',i8.2,i5)
   return
 end subroutine symspec