From 5d1df3238762f7a97d075769cb7e75615d52bdb7 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Tue, 30 Jan 2018 16:57:14 +0000
Subject: [PATCH] Replace some temporarily removed code in ft8b, and some
 general cleanup.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8443 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/ft8/ft8b.f90   |  8 +++++++-
 lib/ft8/ft8sim.f90 | 10 ++++++----
 mainwindow.cpp     |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/ft8/ft8b.f90 b/lib/ft8/ft8b.f90
index 504c547af..7d3453160 100644
--- a/lib/ft8/ft8b.f90
+++ b/lib/ft8/ft8b.f90
@@ -401,6 +401,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
            do i=1,12
               i1hiscall(i)=ichar(hiscall12(i:i))
            enddo
+           icrc10=crc10(c_loc(i1hiscall),12)
            write(cbits,1001) decoded
 1001       format(87i1)
            read(cbits,1002) ncrc10,nrpt
@@ -410,7 +411,12 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
            i2=index(message(i1+1:),' ') + i1
            c1=message(1:i1)//'   '
            c2=message(i1+1:i2)//'   '
-           msg37=c1//' RR73; '//c2//' <...>    '
+
+           if(ncrc10.eq.icrc10) msg37=c1//' RR73; '//c2//' <'//      &
+                trim(hiscall12)//'>    '
+           if(ncrc10.ne.icrc10) msg37=c1//' RR73; '//c2//' <...>    '
+           
+!           msg37=c1//' RR73; '//c2//' <...>    '
            write(msg37(35:37),1010) irpt
 1010       format(i3.2)
            if(msg37(35:35).ne.'-') msg37(35:35)='+'
diff --git a/lib/ft8/ft8sim.f90 b/lib/ft8/ft8sim.f90
index f5c008b72..a8bd49658 100644
--- a/lib/ft8/ft8sim.f90
+++ b/lib/ft8/ft8sim.f90
@@ -80,10 +80,12 @@ program ft8sim
           '  BW:',f4.1,2x,a40)
   endif
 
-  write(*,'(28i1,1x,28i1)') msgbits(1:56)
-  write(*,'(16i1)') msgbits(57:72)
-  write(*,'(3i1)') msgbits(73:75)
-  write(*,'(12i1)') msgbits(76:87)
+  write(*,1030) msgbits(1:56)
+1030 format(/'Call1: ',28i1,'    Call2: ',28i1)
+  write(*,1032) msgbits(57:72),msgbits(73:75),msgbits(76:87)
+1032 format('Grid:  ',16i1,'   3Bit: ',3i1,'    CRC12: ',12i1)
+  write(*,1034) itone
+1034 format(/'Channel symbols:'/79i1/)
 
   msg0=msg
   do ifile=1,nfiles
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 88cf43c3b..ef13ef6e4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4967,8 +4967,8 @@ void MainWindow::on_actionFT8_triggered()
   if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnSplit) {
     QString errorMsg;
     MessageBox::critical_message (this,
-       "Operation in FT8 DXpedition strongly recommends use\n"
-       "of Split mode. Use either ""Rig"" or ""Fake It""\n"
+       "We strongly recommend use of *Split* when using\n"
+       "FT8 DXpedition mode. Use either *Rig* or *Fake It*\n"
        "on the *Settings | Radio* tab.", errorMsg);
     m_bWarnSplit=true;
   }