Some tweaks to diagnostic messages.

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

Makefile.win

@@ -19,7 +19,7 @@ SRCS2F90 = a2d.f90 astro0.f90 audio_init.f90 azdist0.f90 \
 	runqqq.f90 fivehz.f90 flushqqq.f90 map65a0.f90 \
 	rfile.f90 rfile3a.f90 spec.f90 map65a.f90 display.F90 \
 	getfile.f90 getfile2.f90 recvpkt.f90 savetf2.F90 \
-	symspec.f90
+	symspec.f90 sec_midn.F90
 
 SRCSCOM = datcom.f90 gcom1.f90 gcom2.f90 gcom3.f90 gcom4.f90 spcom.f90
 

decode1.F90

@@ -72,30 +72,3 @@ subroutine decode1(iarg)
   go to 10
 
 end subroutine decode1
-
-subroutine sleep_msec(n)
-
-#ifdef Win32
-  use dflib
-#endif
-
-#ifdef Win32
-  call sleepqq(n)
-#else
-  call usleep(1000*n)
-#endif
-
-  return
-end subroutine sleep_msec
-
-integer function mid_sec()
-  integer time
-
-#ifdef Win32
-  mid_sec=int(secnds(0.0))
-#else
-  mid_sec=mod(time(),86400)
-#endif
-
-  return
-end function mid_sec

map65.py

@@ -73,7 +73,9 @@ ncall=0
 ndmiles=0
 ndkm=0
 ndebug=IntVar()
+ndebug2=IntVar()
 ndebug.set(0)
+ndebug2.set(0)
 neme=IntVar()
 nfreeze=IntVar()
 nopen=0
@@ -1168,7 +1170,9 @@ def update():
     Audio.gcom2.mode=(mode.get()+'      ')[:6]
     Audio.gcom2.nsave=nsave.get()
     Audio.gcom2.nzap=nzap.get()
-    Audio.gcom2.ndebug=ndebug.get()
+    n=ndebug.get()
+    if ndebug2.get(): n=2
+    Audio.gcom2.ndebug=n
     Audio.gcom2.minsigdb=isync
     Audio.gcom2.nclip=iclip
     Audio.gcom2.nblank=nblank.get()
@@ -1236,6 +1240,7 @@ setupmenu.add_checkbutton(label = 'Double-click on callsign sets TxFirst',
 setupmenu.add_checkbutton(label = 'GenStdMsgs sets Tx1',variable=k2txb)
 setupmenu.add_separator()
 setupmenu.add_checkbutton(label = 'Enable diagnostics',variable=ndebug)
+setupmenu.add_checkbutton(label = 'Verbose diagnostics',variable=ndebug2)
 
 #------------------------------------------------------ View menu
 viewbutton=Menubutton(mbar,text='View')
@@ -1695,6 +1700,7 @@ try:
         elif key == 'NEME': neme.set(value)
         elif key == 'NDepth': ndepth.set(value)
         elif key == 'Debug': ndebug.set(value)
+        elif key == 'Debug2': ndebug2.set(value)
         elif key == 'HisCall':
             Audio.gcom2.hiscall=(value+'            ')[:12]
             ToRadio.delete(0,99)
@@ -1776,6 +1782,7 @@ f.write("NoShJT65 " + str(noshjt65.get()) + "\n")
 f.write("NEME " + str(neme.get()) + "\n")
 f.write("NDepth " + str(ndepth.get()) + "\n")
 f.write("Debug " + str(ndebug.get()) + "\n")
+f.write("Debug2 " + str(ndebug2.get()) + "\n")
 mrudir2=mrudir.replace(" ","#")
 f.write("MRUDir " + mrudir2 + "\n")
 if g.astro_geom[:7]=="200x200": g.astro_geom="316x373" + g.astro_geom[7:]

map65a.f90

@@ -24,7 +24,7 @@ subroutine map65a(newdat)
 
 !  if(nlost.ne.0) then
      pctlost=nlost/331.03
-     if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60),nlost,pctlost
+     if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60),nlost,pctlost
 3001 format('mod65a  1:',i5.4,i3.2,i8,f6.1,' %')
 !  endif
 
@@ -226,7 +226,8 @@ subroutine map65a(newdat)
    
         write(11,*) '$EOF'
         call flushqqq(11)
-        if(ndebug.gt.0) write(*,3002) mod(mid_sec(),60)
+        t2=sec_midn()
+        if(ndebug.eq.2) write(*,3002) mod(int(t2),60)
 3002 format('mod65a  2:'i8.2)
         ndecdone=1
      endif
@@ -309,7 +310,10 @@ subroutine map65a(newdat)
   if(kbuf.eq.1) kkdone=60*96000
   if(kbuf.eq.2 .or. ndiskdat.eq.1) kkdone=0
   kk=kkdone
-  if(ndebug.gt.0) write(*,3003) mod(mid_sec(),60)
+  t3=sec_midn()
+  if(ndebug.eq.2) write(*,3003) mod(int(t3),60)
 3003 format('mod65a  3:'i8.2)
+  if(ndebug.eq.1) write(*,3004) mod(t2,60.0),mod(t3,60.0)
+3004 format('mod65a:',2f6.1)
   return
 end subroutine map65a

recvpkt.F90

@@ -31,7 +31,7 @@ subroutine recvpkt(iarg)
 
 10 call recv_pkt(center_freq)
 
-  isec=mid_sec()
+  isec=sec_midn()
   imin=isec/60
   if((monitoring.eq.0) .or. (lauto.eq.1 .and. mod(imin,2).eq.(1-TxFirst))) then
      first=.true.
@@ -108,12 +108,12 @@ subroutine recvpkt(iarg)
         kbuf=kb
         kk=k
         ndiskdat=0
-        if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60),ns
+        if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60),ns
 3001    format('recvpkt 1:',i5.4,2i3.2)
      endif
      if(ns.eq.52) then
         kk=k
-        if(ndebug.gt.0) write(*,3002) nutc,mod(mid_sec(),60),ns
+        if(ndebug.eq.2) write(*,3002) nutc,mod(int(sec_midn()),60),ns
 3002    format('recvpkt 2:',i5.4,2i3.2)
      endif
   endif

symspec.f90

@@ -12,7 +12,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
   data kbuf0/-999/
   save
 
-  if(ndebug.gt.0) write(*,3001) nutc,mod(mid_sec(),60)
+  if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),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
-  if(ndebug.gt.0) write(*,3002) mod(mid_sec(),60),n
+  if(ndebug.eq.2) write(*,3002) mod(int(sec_midn()),60),n
 3002 format('symspec 2:',i8.2,i5)
   return
 end subroutine symspec