From 3023f7e5c6f8e8100d27a011991fd40223f2f6e9 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 16 Jan 2019 13:58:56 -0500
Subject: [PATCH] Minor tweaks in formatting, etc.

---
 lib/ft2/ft2.f90        | 8 +++++++-
 lib/ft2/ft2_decode.f90 | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/ft2/ft2.f90 b/lib/ft2/ft2.f90
index 056e5fef7..cacd538a9 100644
--- a/lib/ft2/ft2.f90
+++ b/lib/ft2/ft2.f90
@@ -174,6 +174,8 @@ subroutine update(total_time,ic1,ic2)
               if(nrx.eq.3) then
                  call transmit(4,ftx,iptt)
                  QSO_in_progress=.false.
+                 write(*,1032)
+1032             format('QSO complete: S+P side')
               else
                  call transmit(2,ftx,iptt)
               endif
@@ -181,6 +183,8 @@ subroutine update(total_time,ic1,ic2)
            if(ntxed.eq.3) then
               if(nrx.eq.4) then
                  QSO_in_progress=.false.
+                 write(*,1034)
+1034             format('QSO complete: CQ side')
               else
                  call transmit(3,ftx,iptt)
               endif
@@ -205,6 +209,8 @@ subroutine transmit(nfunc,ftx,iptt)
   character*17 cdatetime
   integer ptt
 
+  if(nTxOK.eq.1) return
+  
   if(nfunc.eq.1) txmsg='CQ '//trim(mycall)//' '//mygrid
   if(nfunc.eq.2) txmsg=trim(hiscall)//' '//trim(mycall)//     &
        ' 559 '//trim(exch)
@@ -218,7 +224,7 @@ subroutine transmit(nfunc,ftx,iptt)
   n=len(trim(txmsg))
   write(*,1010) cdatetime(),0,0.0,nint(ftx),(txmsg(i:i),i=1,n)
   write(12,1010) cdatetime(),0,0.0,nint(ftx),(txmsg(i:i),i=1,n)
-1010 format(a17,' Tx',i4,f6.2,i6,2x,37a1)
+1010 format(a17,i4,f6.2,i5,' Tx ',37a1)
   if(nfunc.ge.1 .and. nfunc.le.4) ntxed=nfunc
   if(nfunc.ge.1 .and. nfunc.le.5) ltx(nfunc)=.true.
   if(nfunc.eq.2 .or. nfunc.eq.3) QSO_in_progress=.true.
diff --git a/lib/ft2/ft2_decode.f90 b/lib/ft2/ft2_decode.f90
index c7497f74d..96f728354 100644
--- a/lib/ft2/ft2_decode.f90
+++ b/lib/ft2/ft2_decode.f90
@@ -195,7 +195,7 @@ subroutine ft2_decode(cdatetime,nfqso,iwave,ndecodes,mycall,hiscall,nrx)
                 nseq,nharderror,nhardmin
            write(12,1000) cdatetime,nsnr,ibest/750.0,nint(freq),message,    &
                 nseq,nharderror,nhardmin
-1000       format(a17,' Rx',i4,f6.2,i6,3x,a37,3i5)
+1000       format(a17,i4,f6.2,i5,' Rx  ',a37,3i5)
 
 !### Temporary: assume most recent decoded message conveys "hiscall".
            i0=index(message,' ')