From 815f8965f0ffe792714238647384ce5e7afce6dd Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Thu, 20 Dec 2018 11:22:52 -0800
Subject: [PATCH] Additional ATU status fix, now queries on start.

---
 rigcommander.cpp |  4 ++--
 wfmain.cpp       | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/rigcommander.cpp b/rigcommander.cpp
index 82851e2..9122a0c 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -660,8 +660,8 @@ void rigCommander::parseRegisters1C()
             parsePTT();
             break;
         case '\x01':
+            // ATU status (on/off/tuning)
             parseATU();
-            // ATU status
             break;
         default:
             break;
@@ -1040,7 +1040,7 @@ void rigCommander::setATU(bool enabled)
 
 void rigCommander::getATUStatus()
 {
-    qDebug() << "Sending out for ATU status in RC.";
+    //qDebug() << "Sending out for ATU status in RC.";
     QByteArray payload("\x1C\x01");
     prepDataAndSend(payload);
 }
diff --git a/wfmain.cpp b/wfmain.cpp
index d2b1e06..f8b99c6 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -466,7 +466,8 @@ void wfmain::getInitialRigState()
 
     cmdOutQue.append(cmdGetRxGain);
     cmdOutQue.append(cmdGetAfGain);
-    cmdOutQue.append(cmdGetSql);
+    // cmdOutQue.append(cmdGetSql); // implimented but not used
+    // TODO:
     // get TX level
     // get Scope reference Level
 
@@ -476,6 +477,10 @@ void wfmain::getInitialRigState()
     // get spectrum mode (center or edge)
     // get spectrum span or edge limit number [1,2,3], update UI
 
+    cmdOutQue.append(cmdNone);
+
+    cmdOutQue.append(cmdGetATUStatus);
+
     cmdOut = cmdNone;
     delayedCommand->start();
 }
@@ -1448,8 +1453,7 @@ void wfmain::on_drawTracerChk_toggled(bool checked)
 void wfmain::on_tuneNowBtn_clicked()
 {
     emit startATU();
-    showStatusBarText("Starting ATU cycle...");
-    // TODO: place commands in a timer queue to check for completion and success
+    showStatusBarText("Starting ATU tuning cycle...");
     cmdOutQue.append(cmdGetATUStatus);
     delayedCommand->start();
 }
@@ -1496,7 +1500,7 @@ void wfmain::on_saveSettingsBtn_clicked()
 
 void wfmain::receiveATUStatus(unsigned char atustatus)
 {
-    qDebug() << "Received ATU status update: " << (unsigned int) atustatus;
+    // qDebug() << "Received ATU status update: " << (unsigned int) atustatus;
     switch(atustatus)
     {
         case 0x00:
@@ -1516,13 +1520,15 @@ void wfmain::receiveATUStatus(unsigned char atustatus)
         case 0x02:
             // ATU tuning in-progress.
             // Add command queue to check again and update status bar
-            qDebug() << "Received ATU status update that *tuning* is taking place";
-            showStatusBarText("Tuning...");
+            // qDebug() << "Received ATU status update that *tuning* is taking place";
+            showStatusBarText("ATU is Tuning...");
+            cmdOutQue.append(cmdGetATUStatus); // Sometimes the first hit seems to be missed.
             cmdOutQue.append(cmdGetATUStatus);
             delayedCommand->start();
             break;
         default:
             qDebug() << "Did not understand ATU status: " << (unsigned int) atustatus;
+            break;
     }
 }