From d98253f3c89bdbb037adacefe00b91b3be9507e6 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Sun, 18 Dec 2016 18:31:48 +0000
Subject: [PATCH] Enable Sh (for Tx4 and Tx5 only) in MSK144 Contest Mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7397 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index f14573915..7f00b33d2 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3537,29 +3537,32 @@ void MainWindow::genStdMsgs(QString rpt)
 
     if(m_mode=="MSK144") {
       if(m_config.contestMode()) {
-        rpt=m_config.my_grid().mid(0,4);
+        t=t0 + m_config.my_grid().mid(0,4);
+        msgtype(t, ui->tx2);
+        t=t0 + "R " + m_config.my_grid().mid(0,4);
+        msgtype(t, ui->tx3);
       }
       if(m_bShMsgs) {
         int i=t0.length()-1;
         t0="<" + t0.mid(0,i) + "> ";
-        if(n<=-2) n=-3;
-        if(n>=-1 and n<=1) n=0;
-        if(n>=2 and n<=4) n=3;
-        if(n>=5 and n<=7) n=6;
-        if(n>=8 and n<=11) n=10;
-        if(n>=12 and n<=14) n=13;
-        if(n>=15) n=16;
-        rpt.sprintf("%+2.2d",n);
+        if(!m_config.contestMode()) {
+          if(n<=-2) n=-3;
+          if(n>=-1 and n<=1) n=0;
+          if(n>=2 and n<=4) n=3;
+          if(n>=5 and n<=7) n=6;
+          if(n>=8 and n<=11) n=10;
+          if(n>=12 and n<=14) n=13;
+          if(n>=15) n=16;
+          rpt.sprintf("%+2.2d",n);
+        }
       }
     }
-    t=t00 + rpt;
-    msgtype(t, ui->tx2);
-    if(m_mode=="MSK144" and m_config.contestMode()) {
-      t=t0 + "R " + rpt;
-    } else {
+    if(m_mode!="MSK144" or !m_config.contestMode()) {
+      t=t00 + rpt;
+      msgtype(t, ui->tx2);
       t=t0 + "R" + rpt;
+      msgtype(t, ui->tx3);
     }
-    msgtype(t, ui->tx3);
     t=t0 + "RRR";
     if(m_mode=="JT4" and m_bShMsgs) t="@1500  (RRR)";
     msgtype(t, ui->tx4);