From a5f3750988323e5762139dc683857bf5754b180f Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Tue, 31 Jan 2023 22:08:27 -0800
Subject: [PATCH] Cleaned up repeater-related debug code.

---
 repeatersetup.cpp |  2 --
 rigcommander.cpp  | 20 --------------------
 rigcommander.h    |  5 -----
 wfmain.cpp        |  9 +++++----
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/repeatersetup.cpp b/repeatersetup.cpp
index 572b19e..354f8b4 100644
--- a/repeatersetup.cpp
+++ b/repeatersetup.cpp
@@ -316,7 +316,6 @@ void repeaterSetup::handleRptAccessMode(rptAccessTxRx tmode)
     // ratrXY
     // X = Transmit (T)one or (N)one or (D)CS
     // Y = Receive (T)sql or (N)one or (D)CS
-    qDebug() << "In repeater setup, have received mode: " << tmode;
     switch(tmode)
     {
     case ratrNN:
@@ -350,7 +349,6 @@ void repeaterSetup::handleRptAccessMode(rptAccessTxRx tmode)
     if( !ui->toneTSQL->isChecked() && !ui->toneTone->isChecked() && !ui->toneDTCS->isChecked())
     {
         ui->toneNone->setChecked(true);
-        qDebug() << "Assuming tone None is correct";
     }
 }
 
diff --git a/rigcommander.cpp b/rigcommander.cpp
index 031b05e..d095d0a 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -1228,11 +1228,6 @@ void rigCommander::setRptAccessMode(rptrAccessData_t rd)
         {
         case ratrNN:
             // No tone at all
-            qDebug(logRig()) << "Tone off requested. state_TONE_enabled: " << state_TONE_Main_Enabled << ", state_TSQL_enabled: " << state_TSQL_Main_Enabled;
-            qDebug(logRig()) << "state.getBool(TONEFUNC): " << state.getBool(TONEFUNC);
-            qDebug(logRig()) << "state.getBool(TSQLFUNC): " << state.getBool(TSQLFUNC);
-            qDebug(logRig()) << "turn off tone: " << rd.turnOffTone << ", turn off tsql: " << rd.turnOffTSQL;
-            qDebug(logRig()) << "Using sequence? " << rd.usingSequence << ", sequence number: " << rd.sequence;
             if(rd.turnOffTone)
             {
                 payload.append("\x16\x42\x00", 3); // TONE off
@@ -1240,19 +1235,6 @@ void rigCommander::setRptAccessMode(rptrAccessData_t rd)
             {
                 payload.append("\x16\x43\x00", 3);  // TSQL off
             }
-
-            /*
-            if(state.getBool(TONEFUNC))
-            {
-                payload.append("\x16\x42\x00", 3); // TONE off
-            } else if (state.getBool(TSQLFUNC)) {
-                payload.append("\x16\x43\x00", 3);  // TSQL off
-            } else {
-                // ?? turn off TSQL ??
-                payload.append("\x16\x43\x00", 3);  // TSQL off
-            }
-            */
-
             break;
         case ratrTN:
             // TONE on transmit only
@@ -2975,7 +2957,6 @@ void rigCommander::parseRegister16()
             break;
         case '\x42':
             state.set(TONEFUNC, payloadIn.at(2) != 0, false);
-            state_TONE_Main_Enabled = (bool)payloadIn.at(2);
             if(payloadIn.at(2)==1)
             {
                 ra = ratrTONEon;
@@ -2986,7 +2967,6 @@ void rigCommander::parseRegister16()
             break;
         case '\x43':
             state.set(TSQLFUNC, payloadIn.at(2) != 0, false);
-            state_TSQL_Main_Enabled = (bool)payloadIn.at(2);
             if(payloadIn.at(2)==1)
             {
                 ra = ratrTSQLon;
diff --git a/rigcommander.h b/rigcommander.h
index 9ff88c1..b55c7ae 100644
--- a/rigcommander.h
+++ b/rigcommander.h
@@ -451,11 +451,6 @@ private:
     struct rigCapabilities rigCaps;
     
     rigstate state;
-    // These are temporary measurements for debugging:
-    bool state_TONE_Main_Enabled = false;
-    bool state_TSQL_Main_Enabled = false;
-    bool state_TONE_Sub_Enabled = false;
-    bool state_TSQL_Sub_Enabled = false;
 
     bool haveRigCaps;
     model_kind model;
diff --git a/wfmain.cpp b/wfmain.cpp
index a7c9a09..154fc02 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -3476,10 +3476,11 @@ void wfmain:: getInitialRigState()
     {
         issueDelayedCommand(cmdGetDTCS);
     }
-    // TODO: decide which one!
-    issueDelayedCommand(cmdGetRptAccessMode);
-    issueDelayedCommand(cmdGetToneEnabled);
-    issueDelayedCommand(cmdGetTSQLEnabled);
+
+    if(rigCaps.hasCTCSS || rigCaps.hasDTCS)
+    {
+        issueDelayedCommand(cmdGetRptAccessMode);
+    }
 
     if(rigCaps.hasAntennaSel)
     {