From 80ad721524be3e91554ecba06b926d1074a6f390 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Tue, 27 Jun 2017 20:50:17 +0000
Subject: [PATCH] Code cleanup.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7742 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/decoder.f90    | 4 ++--
 lib/ft8_decode.f90 | 5 ++---
 lib/jt9a.f90       | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index e83dd5eab..ea817d346 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -192,8 +192,8 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
 !$omp end parallel sections
 
 ! JT65 is not yet producing info for nsynced, ndecoded.
-  ndecoded = my_jt4%decoded + my_jt65%decoded + my_jt9%decoded
-800 write(*,1010) nsynced,ndecoded
+800 ndecoded = my_jt4%decoded + my_jt65%decoded + my_jt9%decoded + my_ft8%decoded
+  write(*,1010) nsynced,ndecoded
 1010 format('<DecodeFinished>',2i4)
   call flush(6)
   close(13) 
diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90
index 35aae4320..e201a5354 100644
--- a/lib/ft8_decode.f90
+++ b/lib/ft8_decode.f90
@@ -38,7 +38,6 @@ contains
     character datetime*13,message*22
 
     this%callback => callback
-
     write(datetime,1001) nutc        !### TEMPORARY ###
 1001 format("000000_",i6.6)
 
@@ -46,7 +45,7 @@ contains
     call sync8(iwave,s,candidate,ncand)
     call timer('sync8   ',1)
 
-    rewind 51
+!    rewind 51
     do icand=1,ncand
        f1=candidate(1,icand)
        xdt=candidate(2,icand)
@@ -56,7 +55,7 @@ contains
        call ft8b(s,f1,xdt,nharderrors,dmin,nbadcrc,message)
        call timer('ft8b    ',1)
        if (associated(this%callback)) call this%callback(sync,nsnr,xdt,   &
-            freq,nbadcrc,message)
+            f1,nbadcrc,message)
 !       write(13,1110) datetime,0,nsnr,xdt,f1,nharderrors,dmin,message
 !1110   format(a13,2i4,f6.2,f7.1,i4,' ~ ',f6.2,2x,a22,'  FT8')
        write(51,3051) xdt,f1,sync,dmin,nsnr,nharderrors,nbadcrc,message
diff --git a/lib/jt9a.f90 b/lib/jt9a.f90
index 1482ec0d9..9729e0804 100644
--- a/lib/jt9a.f90
+++ b/lib/jt9a.f90
@@ -35,12 +35,12 @@ subroutine jt9a()
   mykey=trim(repeat(shm_key,1))
   i0 = len(mykey)
   i0=setkey_jt9(trim(mykey))
-
   i1=attach_jt9()
+  msdelay=10
 
 10 inquire(file=trim(temp_dir)//'/.lock',exist=fileExists)
   if(fileExists) then
-     call sleep_msec(100)
+     call sleep_msec(msdelay)
      go to 10
   endif
 
@@ -66,7 +66,7 @@ subroutine jt9a()
 
 100 inquire(file=trim(temp_dir)//'/.lock',exist=fileExists)
   if(fileExists) go to 10
-  call sleep_msec(100)
+  call sleep_msec(msdelay)
   go to 100
 
 999 call timer('decoder ',101)