From fd1dc860c176b5a705643d81fce53d990124186e Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Sat, 21 Jan 2023 09:18:15 -0800
Subject: [PATCH] Added CW logging category and additional (and needed) debug
 info for the CW features.

---
 cwsender.cpp      | 3 +++
 cwsender.h        | 1 +
 logcategories.cpp | 3 ++-
 logcategories.h   | 3 ++-
 rigcommander.cpp  | 4 ++++
 wfmain.cpp        | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/cwsender.cpp b/cwsender.cpp
index e5c5a0b..43bc641 100644
--- a/cwsender.cpp
+++ b/cwsender.cpp
@@ -16,6 +16,7 @@ cwSender::cwSender(QWidget *parent) :
 
 cwSender::~cwSender()
 {
+    qInfo(logCW()) << "Running CW Sender destructor.";
     delete ui;
 }
 
@@ -27,8 +28,10 @@ void cwSender::showEvent(QShowEvent *event)
 
 void cwSender::handleKeySpeed(unsigned char wpm)
 {
+    qInfo(logCW()) << "Told that current WPM is" << wpm;
     if((wpm >= 6) && (wpm <=48))
     {
+        qInfo(logCW()) << "Setting WPM UI control to" << wpm;
         ui->wpmSpin->blockSignals(true);
         ui->wpmSpin->setValue(wpm);
         ui->wpmSpin->blockSignals(false);
diff --git a/cwsender.h b/cwsender.h
index a9a9dff..73a0c11 100644
--- a/cwsender.h
+++ b/cwsender.h
@@ -6,6 +6,7 @@
 #include <QFont>
 #include <QInputDialog>
 #include "wfviewtypes.h"
+#include "logcategories.h"
 
 
 namespace Ui {
diff --git a/logcategories.cpp b/logcategories.cpp
index 360d81e..8ba2677 100644
--- a/logcategories.cpp
+++ b/logcategories.cpp
@@ -6,7 +6,8 @@ Q_LOGGING_CATEGORY(logGui, "gui")
 Q_LOGGING_CATEGORY(logLogger, "log")
 Q_LOGGING_CATEGORY(logUser, "user")
 Q_LOGGING_CATEGORY(logRig, "rig")
-Q_LOGGING_CATEGORY(logRigcommands, "rigCommands")
+Q_LOGGING_CATEGORY(logRigTraffic, "rigTraffic")
+Q_LOGGING_CATEGORY(logCW, "cw")
 Q_LOGGING_CATEGORY(logAudio, "audio")
 Q_LOGGING_CATEGORY(logUdp, "udp")
 Q_LOGGING_CATEGORY(logUdpServer, "udp.server")
diff --git a/logcategories.h b/logcategories.h
index eac8d9d..36da605 100644
--- a/logcategories.h
+++ b/logcategories.h
@@ -9,7 +9,8 @@ Q_DECLARE_LOGGING_CATEGORY(logGui)
 Q_DECLARE_LOGGING_CATEGORY(logLogger)
 Q_DECLARE_LOGGING_CATEGORY(logUser)
 Q_DECLARE_LOGGING_CATEGORY(logRig)
-Q_DECLARE_LOGGING_CATEGORY(rigCommands)
+Q_DECLARE_LOGGING_CATEGORY(logRigTraffic)
+Q_DECLARE_LOGGING_CATEGORY(logCW)
 Q_DECLARE_LOGGING_CATEGORY(logAudio)
 Q_DECLARE_LOGGING_CATEGORY(logUdp)
 Q_DECLARE_LOGGING_CATEGORY(logUdpServer)
diff --git a/rigcommander.cpp b/rigcommander.cpp
index a817f8e..ef21c05 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -1586,6 +1586,7 @@ void rigCommander::parseLevels()
                 break;
             case '\x0C':
                 state.set(KEYSPD, level, false);
+                qInfo(logRig()) << "Have received key speed in RC, raw level: " << level << ", WPM: " << (level/6.071)+6;
                 emit haveKeySpeed((level/6.071)+6);
                 break;
             case '\x0D':
@@ -4612,6 +4613,8 @@ void rigCommander::setKeySpeed(unsigned char wpm)
 
     unsigned char wpmRadioSend = (wpm-6) * (6.071);
 
+    qInfo(logRig()) << "Setting keyspeed to " << wpm << "WPM, via command value" << wpmRadioSend;
+
     QByteArray payload;
     payload.setRawData("\x14\x0C", 2);
     payload.append(wpmRadioSend);
@@ -4620,6 +4623,7 @@ void rigCommander::setKeySpeed(unsigned char wpm)
 
 void rigCommander::getKeySpeed()
 {
+    qInfo(logRig()) << "Getting key speed from radio...";
     QByteArray payload;
     payload.setRawData("\x14\x0C", 2);
     prepDataAndSend(payload);
diff --git a/wfmain.cpp b/wfmain.cpp
index 3f06d51..5a763a8 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -8171,7 +8171,7 @@ void wfmain::messageHandler(QtMsgType type, const QMessageLogContext& context, c
     out << context.category << ": " << msg << "\n";
     out.flush();    // Clear the buffered data
 
-    if(QString(context.category) != QString("rigCommands"))
+    if(QString(context.category) != QString("rigTraffic"))
     {
         text.append(context.category);
         text.append(": ");