From a1d3f93dad7141a54a4ffd5585eaad0ee7774591 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Tue, 24 Jan 2023 20:12:23 +0000
Subject: [PATCH 01/11] PBT should now display correctly in ALL modes!

---
 wfmain.cpp | 42 +++++++++++++++++++++++++++++++++---------
 wfmain.h   |  1 +
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 83a1ff2..3757535 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4718,7 +4718,16 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
             passbandIndicator->topLeft->setCoords(pbStart, 0);
             passbandIndicator->bottomRight->setCoords(pbEnd, rigCaps.spectAmpMax);
 
-            if (TPBFInner || TPBFOuter) {
+            double pbtDefault = 0.0; // This will be the default PBT for the selected mode.
+
+            if ((currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) && passbandWidth > 0.0006)
+            {
+                pbtDefault = passbandWidth - (passbandCenterFrequency * 2);
+            }
+
+            if ((int(TPBFInner*1000000) - int(pbtDefault*1000000) || int(TPBFOuter*1000000) - int(pbtDefault*1000000)) 
+                && passbandAction != passbandResizing && currentModeInfo.mk != modeFM)
+            {
                 pbtIndicator->setVisible(true);
             }
             else
@@ -4729,10 +4738,10 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
             /*
                 pbtIndicator displays the intersection between TPBFInner and TPBFOuter
             */
-            pbtIndicator->topLeft->setCoords(qMax(pbStart + (TPBFInner / 2), pbStart + (TPBFOuter / 2)), 0);
+            pbtIndicator->topLeft->setCoords(qMax(pbStart + (TPBFInner / 2) - (pbtDefault /2), pbStart + (TPBFOuter / 2) - (pbtDefault /2)), 0);
 
-            pbtIndicator->bottomRight->setCoords(qMin(pbStart + (TPBFInner / 2) + passbandWidth, 
-                pbStart + (TPBFOuter / 2) + passbandWidth), rigCaps.spectAmpMax);
+            pbtIndicator->bottomRight->setCoords(qMin(pbStart + (TPBFInner / 2) - (pbtDefault /2) + passbandWidth,
+                pbStart + (TPBFOuter / 2) - (pbtDefault/2) + passbandWidth), rigCaps.spectAmpMax);
         }
 
         if (underlayMode == underlayPeakHold)
@@ -6547,22 +6556,37 @@ void wfmain::receivePassband(quint16 pass)
 
 void wfmain::receiveCwPitch(unsigned char pitch) {
     if (currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) {
-        passbandCenterFrequency = (double)((((600 / 256) * pitch) + 300) / 1000000.0)/2.0;
+        cwPitch = ((600.0 / 256.0) * pitch) + 300;
+        passbandCenterFrequency = cwPitch / 2000000.0;
     }
 }
 
 void wfmain::receiveTPBFInner(unsigned char level) {
 
+    /*
+    * This is written like this as although PBT is supposed to be sent in 50Hz steps,
+    * sometimes it sends the 'nearest' value. This results in math errors.
+    * By multiplying the MHz value by 20000 with rounding, then dividing this value
+    * by 20000, we are guaranteed to get a frequency value that matches the step size.
+    */
     qint16 shift = (qint16)(level - 128);
-    TPBFInner = (double)(shift / 127.0) * (passbandWidth);
-    //qDebug() << "Inner" << level;
+    //TPBFInner = (double)(shift / 127.0) * (passbandWidth);
+    TPBFInner = ceil((shift / 127.0) * (passbandWidth) * 20000.0) / 20000.0;
+    qDebug() << "Inner" << level << "TPBFInner" << TPBFInner;
 }
 
 void wfmain::receiveTPBFOuter(unsigned char level) {
     
+    /*
+    * This is written like this as although PBT is supposed to be sent in 50Hz steps,
+    * sometimes it sends the 'nearest' value. This results in math errors.
+    * By multiplying the MHz value by 20000 with rounding, then dividing this value
+    * by 20000, we are guaranteed to get a frequency value that matches the step size.
+    */
     qint16 shift = (qint16)(level - 128);
-    TPBFOuter = (double)(shift / 127.0) * (passbandWidth);
-   /// qDebug() << "Outer" << level;
+    TPBFOuter = ceil((shift / 127.0) * (passbandWidth) * 20000.0) / 20000.0;
+    //TPBFOuter = (double)(shift / 127.0) * (passbandWidth);
+    qDebug() << "Outer" << level << "TPBFOuter" << TPBFOuter;
 }
 
 
diff --git a/wfmain.h b/wfmain.h
index 45048c6..c90ad0e 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -1111,6 +1111,7 @@ private:
     double TPBFInner = 0.0;
     double TPBFOuter = 0.0;
     double passbandCenterFrequency = 0.0;
+    quint16 cwPitch = 600;
     SERVERCONFIG serverConfig;
     void serverAddUserLine(const QString& user, const QString& pass, const int& type);
 

From 8b8668a6deacb528cf9e0bf7311465966abc1614 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Wed, 25 Jan 2023 11:41:50 +0000
Subject: [PATCH 02/11] Finally PBT works in all modes/filter widths/cw pitch
 settings.

---
 wfmain.cpp | 58 +++++++++++++++++++++++++++++++++---------------------
 wfmain.h   |  2 ++
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 3757535..9e93996 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4718,15 +4718,16 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
             passbandIndicator->topLeft->setCoords(pbStart, 0);
             passbandIndicator->bottomRight->setCoords(pbEnd, rigCaps.spectAmpMax);
 
-            double pbtDefault = 0.0; // This will be the default PBT for the selected mode.
-
             if ((currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) && passbandWidth > 0.0006)
             {
-                pbtDefault = passbandWidth - (passbandCenterFrequency * 2);
+                pbtDefault = round((passbandWidth - (cwPitch / 1000000.0)) * 200000.0) / 200000.0;
+            }
+            else 
+            {
+                pbtDefault = 0.0;
             }
 
-            if ((int(TPBFInner*1000000) - int(pbtDefault*1000000) || int(TPBFOuter*1000000) - int(pbtDefault*1000000)) 
-                && passbandAction != passbandResizing && currentModeInfo.mk != modeFM)
+            if ((TPBFInner - pbtDefault || TPBFOuter - pbtDefault) && passbandAction != passbandResizing && currentModeInfo.mk != modeFM)
             {
                 pbtIndicator->setVisible(true);
             }
@@ -4742,6 +4743,8 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
 
             pbtIndicator->bottomRight->setCoords(qMin(pbStart + (TPBFInner / 2) - (pbtDefault /2) + passbandWidth,
                 pbStart + (TPBFOuter / 2) - (pbtDefault/2) + passbandWidth), rigCaps.spectAmpMax);
+
+            //qDebug() << "Default" << pbtDefault << "Inner" << TPBFInner << "Outer" << TPBFOuter << "Pass" << passbandWidth << "Center" << passbandCenterFrequency << "CW" << cwPitch;
         }
 
         if (underlayMode == underlayPeakHold)
@@ -4891,8 +4894,10 @@ void wfmain::handlePlotDoubleClick(QMouseEvent *me)
         QCPAbstractItem* item = plot->itemAt(me->pos(), true);
         QCPItemRect* rectItem = dynamic_cast<QCPItemRect*> (item);
         if (rectItem != nullptr) {
-            issueCmdUniquePriority(cmdSetTPBFInner, (unsigned char)128);
-            issueCmdUniquePriority(cmdSetTPBFOuter, (unsigned char)128);
+            double pbFreq = (pbtDefault / passbandWidth) * 127.0;
+            qint16 newFreq = pbFreq + 128;
+            issueCmdUniquePriority(cmdSetTPBFInner, (unsigned char)newFreq);
+            issueCmdUniquePriority(cmdSetTPBFOuter, (unsigned char)newFreq);
         }
     }
 }
@@ -6556,37 +6561,46 @@ void wfmain::receivePassband(quint16 pass)
 
 void wfmain::receiveCwPitch(unsigned char pitch) {
     if (currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) {
-        cwPitch = ((600.0 / 256.0) * pitch) + 300;
+        cwPitch = round((((600.0 / 255.0) * pitch) + 300)/5.0)*5.0;
         passbandCenterFrequency = cwPitch / 2000000.0;
     }
+    qDebug() << "CW" << pitch << "Pitch" << cwPitch;
 }
 
 void wfmain::receiveTPBFInner(unsigned char level) {
-
     /*
-    * This is written like this as although PBT is supposed to be sent in 50Hz steps,
+    * This is written like this as although PBT is supposed to be sent in 25Hz steps,
     * sometimes it sends the 'nearest' value. This results in math errors.
-    * By multiplying the MHz value by 20000 with rounding, then dividing this value
-    * by 20000, we are guaranteed to get a frequency value that matches the step size.
+    * In CW mode, the value is also dependant on the CW Pitch setting
     */
     qint16 shift = (qint16)(level - 128);
-    //TPBFInner = (double)(shift / 127.0) * (passbandWidth);
-    TPBFInner = ceil((shift / 127.0) * (passbandWidth) * 20000.0) / 20000.0;
-    qDebug() << "Inner" << level << "TPBFInner" << TPBFInner;
+    double tempVar = ceil((shift / 127.0) * passbandWidth * 20000.0) / 20000.0;
+    // tempVar now contains value to the nearest 50Hz If CW mode, add/remove the cwPitch.
+    double pitch = 0.0;
+    if ((currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) && passbandWidth > 0.0006)
+    {
+        pitch = (600.0 - cwPitch) / 1000000.0;
+    }
+    TPBFInner = round((tempVar + pitch) * 200000.0) / 200000.0; // Nearest 5Hz.
+    //qDebug() << "Inner" << level << "TPBFInner" << TPBFInner;
 }
 
 void wfmain::receiveTPBFOuter(unsigned char level) {
-    
     /*
-    * This is written like this as although PBT is supposed to be sent in 50Hz steps,
+    * This is written like this as although PBT is supposed to be sent in 25Hz steps,
     * sometimes it sends the 'nearest' value. This results in math errors.
-    * By multiplying the MHz value by 20000 with rounding, then dividing this value
-    * by 20000, we are guaranteed to get a frequency value that matches the step size.
+    * In CW mode, the value is also dependant on the CW Pitch setting
     */
     qint16 shift = (qint16)(level - 128);
-    TPBFOuter = ceil((shift / 127.0) * (passbandWidth) * 20000.0) / 20000.0;
-    //TPBFOuter = (double)(shift / 127.0) * (passbandWidth);
-    qDebug() << "Outer" << level << "TPBFOuter" << TPBFOuter;
+    double tempVar = ceil((shift / 127.0) * passbandWidth * 20000.0) / 20000.0;
+    // tempVar now contains value to the nearest 50Hz If CW mode, add/remove the cwPitch.
+    double pitch = 0.0;
+    if ((currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) && passbandWidth > 0.0006)
+    {
+        pitch = (600.0 - cwPitch) / 1000000.0;
+    }
+    TPBFOuter = round((tempVar + pitch) * 200000.0) / 200000.0; // Nearest 5Hz.
+    //qDebug() << "Outer" << level << "TPBFOuter" << TPBFOuter;
 }
 
 
diff --git a/wfmain.h b/wfmain.h
index c90ad0e..1506d01 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -1111,7 +1111,9 @@ private:
     double TPBFInner = 0.0;
     double TPBFOuter = 0.0;
     double passbandCenterFrequency = 0.0;
+    double pbtDefault = 0.0;
     quint16 cwPitch = 600;
+
     SERVERCONFIG serverConfig;
     void serverAddUserLine(const QString& user, const QString& pass, const int& type);
 

From 4b40e20d9825e66c7b7cd77371d3f1e8801f06ae Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Wed, 25 Jan 2023 15:39:01 +0000
Subject: [PATCH 03/11] Remove some debugging

---
 wfmain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index e224e66..cb6f5d9 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -6597,7 +6597,7 @@ void wfmain::receiveCwPitch(unsigned char pitch) {
         cwPitch = round((((600.0 / 255.0) * pitch) + 300)/5.0)*5.0;
         passbandCenterFrequency = cwPitch / 2000000.0;
     }
-    qDebug() << "CW" << pitch << "Pitch" << cwPitch;
+    //qDebug() << "CW" << pitch << "Pitch" << cwPitch;
 }
 
 void wfmain::receiveTPBFInner(unsigned char level) {

From ded6bd1adeba5790b1457fa1afcae651f322f045 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Wed, 25 Jan 2023 18:01:24 +0000
Subject: [PATCH 04/11] Add CW Speed spinbox to CW sender

---
 cwsender.cpp     |  16 ++++
 cwsender.h       |   4 +
 cwsender.ui      | 220 ++++++++++++++++++++++++++++++-----------------
 rigcommander.cpp |  24 ++++++
 rigcommander.h   |   3 +
 wfmain.cpp       |  17 +++-
 wfmain.h         |   1 +
 7 files changed, 202 insertions(+), 83 deletions(-)

diff --git a/cwsender.cpp b/cwsender.cpp
index 7d64554..60fd89b 100644
--- a/cwsender.cpp
+++ b/cwsender.cpp
@@ -41,6 +41,13 @@ void cwSender::handleKeySpeed(unsigned char wpm)
     }
 }
 
+void cwSender::handlePitch(unsigned char pitch) {
+    quint16 cwPitch = round((((600.0 / 255.0) * pitch) + 300) / 5.0) * 5.0;
+    ui->pitchSpin->blockSignals(true);
+    ui->pitchSpin->setValue(cwPitch);
+    ui->pitchSpin->blockSignals(false);
+}
+
 void cwSender::handleBreakInMode(unsigned char b)
 {
     if(b < 3)
@@ -107,6 +114,15 @@ void cwSender::on_wpmSpin_valueChanged(int wpm)
     emit setKeySpeed((unsigned char)wpm);
 }
 
+void cwSender::on_pitchSpin_valueChanged(int arg1)
+{
+    //    quint16 cwPitch = round((((600.0 / 255.0) * pitch) + 300) / 5.0) * 5.0;
+    unsigned char pitch = 0;
+    pitch = ceil((arg1 - 300) * (255.0 / 600.0));
+    qDebug() << "Setting pitch" << pitch;
+    emit setPitch(pitch);
+}
+
 void cwSender::on_macro1btn_clicked()
 {
     processMacroButton(1, ui->macro1btn);
diff --git a/cwsender.h b/cwsender.h
index 2f77f9d..237b4f9 100644
--- a/cwsender.h
+++ b/cwsender.h
@@ -27,11 +27,13 @@ signals:
     void sendCW(QString cwMessage);
     void stopCW();
     void setKeySpeed(unsigned char wpm);
+    void setPitch(unsigned char pitch);
     void setBreakInMode(unsigned char b);
     void getCWSettings();
 
 public slots:
     void handleKeySpeed(unsigned char wpm);
+    void handlePitch(unsigned char pitch);
     void handleBreakInMode(unsigned char b);
     void handleCurrentModeUpdate(mode_kind mode);
 
@@ -47,6 +49,8 @@ private slots:
 
     void on_wpmSpin_valueChanged(int arg1);
 
+    void on_pitchSpin_valueChanged(int arg1);
+
     void on_macro1btn_clicked();
 
     void on_macro2btn_clicked();
diff --git a/cwsender.ui b/cwsender.ui
index 29093bc..900684f 100644
--- a/cwsender.ui
+++ b/cwsender.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>681</width>
+    <width>636</width>
     <height>451</height>
    </rect>
   </property>
@@ -18,23 +18,7 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0" colspan="8">
-     <widget class="QPlainTextEdit" name="transcriptText">
-      <property name="focusPolicy">
-       <enum>Qt::NoFocus</enum>
-      </property>
-      <property name="toolTip">
-       <string>CW Transmission Transcript</string>
-      </property>
-      <property name="undoRedoEnabled">
-       <bool>false</bool>
-      </property>
-      <property name="readOnly">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0" colspan="8">
+    <item row="3" column="0" colspan="12">
      <widget class="QGroupBox" name="groupBox">
       <property name="title">
        <string>Macros</string>
@@ -177,45 +161,6 @@
       </layout>
      </widget>
     </item>
-    <item row="1" column="3">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Break In</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QPushButton" name="stopBtn">
-      <property name="toolTip">
-       <string>Stop sending CW</string>
-      </property>
-      <property name="text">
-       <string>Stop</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="4">
-     <widget class="QComboBox" name="breakinCombo">
-      <property name="toolTip">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the desired break-in mode:&lt;/p&gt;&lt;p&gt;1. None: You must manually key and unkey the radio.&lt;/p&gt;&lt;p&gt;2. Semi: Transmit is automatic and switches to receive at the end of the text.&lt;/p&gt;&lt;p&gt;3. Full: Same as semi, but with breaks between characters when possible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <item>
-       <property name="text">
-        <string>Off</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Semi</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Full</string>
-       </property>
-      </item>
-     </widget>
-    </item>
     <item row="1" column="2">
      <widget class="QComboBox" name="textToSendEdit">
       <property name="sizePolicy">
@@ -238,29 +183,6 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="5">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>WPM:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="6">
-     <widget class="QSpinBox" name="wpmSpin">
-      <property name="toolTip">
-       <string>Set the Words Per Minute</string>
-      </property>
-      <property name="minimum">
-       <number>6</number>
-      </property>
-      <property name="maximum">
-       <number>48</number>
-      </property>
-      <property name="value">
-       <number>20</number>
-      </property>
-     </widget>
-    </item>
     <item row="1" column="0">
      <widget class="QPushButton" name="sendBtn">
       <property name="text">
@@ -274,6 +196,144 @@
       </property>
      </widget>
     </item>
+    <item row="0" column="0" colspan="12">
+     <widget class="QPlainTextEdit" name="transcriptText">
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="toolTip">
+       <string>CW Transmission Transcript</string>
+      </property>
+      <property name="undoRedoEnabled">
+       <bool>false</bool>
+      </property>
+      <property name="readOnly">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QPushButton" name="stopBtn">
+      <property name="toolTip">
+       <string>Stop sending CW</string>
+      </property>
+      <property name="text">
+       <string>Stop</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="3" colspan="2">
+     <layout class="QGridLayout" name="gridLayout_3">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetMinimumSize</enum>
+      </property>
+      <item row="3" column="0">
+       <widget class="QComboBox" name="breakinCombo">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the desired break-in mode:&lt;/p&gt;&lt;p&gt;1. None: You must manually key and unkey the radio.&lt;/p&gt;&lt;p&gt;2. Semi: Transmit is automatic and switches to receive at the end of the text.&lt;/p&gt;&lt;p&gt;3. Full: Same as semi, but with breaks between characters when possible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>Off</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Semi</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Full</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>WPM:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="wpmSpin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Set the Words Per Minute</string>
+        </property>
+        <property name="minimum">
+         <number>6</number>
+        </property>
+        <property name="maximum">
+         <number>48</number>
+        </property>
+        <property name="value">
+         <number>20</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Break In</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QSpinBox" name="pitchSpin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>300</number>
+        </property>
+        <property name="maximum">
+         <number>900</number>
+        </property>
+        <property name="singleStep">
+         <number>5</number>
+        </property>
+        <property name="stepType">
+         <enum>QAbstractSpinBox::DefaultStepType</enum>
+        </property>
+        <property name="value">
+         <number>600</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>PITCH  (Hz):</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
    </layout>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
diff --git a/rigcommander.cpp b/rigcommander.cpp
index 0f441e0..5d3a8ef 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -936,6 +936,14 @@ void rigCommander::getCwPitch()
     prepDataAndSend(payload);
 }
 
+void rigCommander::setCwPitch(unsigned char pitch)
+{
+    QByteArray payload;
+    payload.setRawData("\x14\x09", 2);
+    payload.append(bcdEncodeInt(pitch));
+    prepDataAndSend(payload);
+}
+
 void rigCommander::getPskTone()
 {
     QByteArray payload;
@@ -943,6 +951,14 @@ void rigCommander::getPskTone()
     prepDataAndSend(payload);
 }
 
+void rigCommander::setPskTone(unsigned char tone)
+{
+    QByteArray payload;
+    payload.setRawData("\x1a\x05\x00\x44", 4);
+    payload.append(bcdEncodeInt(tone));
+    prepDataAndSend(payload);
+}
+
 void rigCommander::getRttyMark()
 {
     QByteArray payload;
@@ -950,6 +966,14 @@ void rigCommander::getRttyMark()
     prepDataAndSend(payload);
 }
 
+void rigCommander::setRttyMark(unsigned char mark)
+{
+    QByteArray payload;
+    payload.setRawData("\x1a\x05\x00\x41", 4);
+    payload.append(bcdEncodeInt(mark));
+    prepDataAndSend(payload);
+}
+
 void rigCommander::getTransmitFrequency()
 {
     QByteArray payload;
diff --git a/rigcommander.h b/rigcommander.h
index 47d563a..7ca3ff2 100644
--- a/rigcommander.h
+++ b/rigcommander.h
@@ -122,8 +122,11 @@ public slots:
 
     void getPassband();
     void getCwPitch();
+    void setCwPitch(unsigned char pitch);
     void getPskTone();
+    void setPskTone(unsigned char tone);
     void getRttyMark();
+    void setRttyMark(unsigned char mark);
 
     // Repeater:
     void setDuplexMode(duplexMode dm);
diff --git a/wfmain.cpp b/wfmain.cpp
index cb6f5d9..fe04ed2 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -347,10 +347,13 @@ void wfmain::rigConnections()
     connect(this, SIGNAL(stopCW()), rig, SLOT(sendStopCW()));
     connect(this, SIGNAL(setKeySpeed(unsigned char)), rig, SLOT(setKeySpeed(unsigned char)));
     connect(this, SIGNAL(getKeySpeed()), rig, SLOT(getKeySpeed()));
+    connect(this, SIGNAL(setCwPitch(unsigned char)), rig, SLOT(setCwPitch(unsigned char)));
     connect(this, SIGNAL(setCWBreakMode(unsigned char)), rig, SLOT(setBreakIn(unsigned char)));
     connect(this, SIGNAL(getCWBreakMode()), rig, SLOT(getBreakIn()));
     connect(this->rig, &rigCommander::haveKeySpeed,
-            [=](const unsigned char &wpm) { cw->handleKeySpeed(wpm);});
+        [=](const unsigned char& wpm) { cw->handleKeySpeed(wpm); });
+    connect(this->rig, &rigCommander::haveCwPitch,
+        [=](const unsigned char& speed) { cw->handlePitch(speed); });
     connect(this->rig, &rigCommander::haveCWBreakMode,
             [=](const unsigned char &bm) { cw->handleBreakInMode(bm);});
 
@@ -1079,7 +1082,9 @@ void wfmain::setupMainUI()
     connect(this->cw, &cwSender::setBreakInMode,
             [=](const unsigned char &bmode) { issueCmd(cmdSetBreakMode, bmode);});
     connect(this->cw, &cwSender::setKeySpeed,
-            [=](const unsigned char &wpm) { issueCmd(cmdSetKeySpeed, wpm);});
+        [=](const unsigned char& wpm) { issueCmd(cmdSetKeySpeed, wpm); });
+    connect(this->cw, &cwSender::setPitch,
+        [=](const unsigned char& pitch) { issueCmd(cmdSetCwPitch, pitch); });
     connect(this->cw, &cwSender::getCWSettings,
             [=]() { issueDelayedCommand(cmdGetKeySpeed);
                     issueDelayedCommand(cmdGetBreakMode);});
@@ -3708,6 +3713,12 @@ void wfmain::doCmd(commandtype cmddata)
             emit setKeySpeed(wpm);
             break;
         }
+        case cmdSetCwPitch:
+        {
+            unsigned char pitch = (*std::static_pointer_cast<unsigned char>(data));
+            emit setCwPitch(pitch);
+            break;
+        }
         case cmdSetATU:
         {
             bool atuOn = (*std::static_pointer_cast<bool>(data));
@@ -6594,7 +6605,7 @@ void wfmain::receivePassband(quint16 pass)
 
 void wfmain::receiveCwPitch(unsigned char pitch) {
     if (currentModeInfo.mk == modeCW || currentModeInfo.mk == modeCW_R) {
-        cwPitch = round((((600.0 / 255.0) * pitch) + 300)/5.0)*5.0;
+        cwPitch = round((((600.0 / 255.0) * pitch) + 300) / 5.0) * 5.0;
         passbandCenterFrequency = cwPitch / 2000000.0;
     }
     //qDebug() << "CW" << pitch << "Pitch" << cwPitch;
diff --git a/wfmain.h b/wfmain.h
index 264fbbb..00c1063 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -175,6 +175,7 @@ signals:
     void stopCW();
     void getKeySpeed();
     void setKeySpeed(unsigned char wpm);
+    void setCwPitch(unsigned char pitch);
     void setCWBreakMode(unsigned char breakMode);
     void getCWBreakMode();
 

From ea46d6c625e02c4869bd5fcd42c191f111a590f7 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Wed, 25 Jan 2023 21:22:06 +0000
Subject: [PATCH 05/11] Add math.h for cwsender

---
 cwsender.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cwsender.h b/cwsender.h
index 237b4f9..e35875f 100644
--- a/cwsender.h
+++ b/cwsender.h
@@ -6,10 +6,12 @@
 #include <QFont>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <math.h>
 #include "wfviewtypes.h"
 #include "logcategories.h"
 
 
+
 namespace Ui {
 class cwSender;
 }

From 49501273d02e02df7b2b1ca58be7a576daa1a19f Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Wed, 25 Jan 2023 21:37:12 +0000
Subject: [PATCH 06/11] Fix for shuttle resource files

---
 controllersetup.cpp     |  4 ++--
 resources/resources.qrc | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/controllersetup.cpp b/controllersetup.cpp
index fdb359c..5bef058 100644
--- a/controllersetup.cpp
+++ b/controllersetup.cpp
@@ -116,11 +116,11 @@ void controllerSetup::newDevice(unsigned char devType, QVector<BUTTON>* but, QVe
 
     switch (devType) {
         case shuttleXpress:
-            image.load(":/resources/controllerxpress.png");
+            image.load(":/resources/shuttlexpress.png");
             deviceName = "shuttleXpress";
             break;
         case shuttlePro2:
-            image.load(":/resources/controllerpro.png");
+            image.load(":/resources/shuttlepro.png");
             deviceName = "shuttlePro2";
             break;
         case RC28:
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 8f87d19..21f331f 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -1,9 +1,9 @@
 <RCC>
-  <qresource prefix="resources">
-    <file>wfview.png</file>
-    <file>shuttlexpress.png</file>
-    <file>shuttlepro.png</file>
-    <file>rc28.png</file>
-    <file>xbox.png</file>
-  </qresource>
+    <qresource prefix="/resources">
+        <file>wfview.png</file>
+        <file>shuttlexpress.png</file>
+        <file>shuttlepro.png</file>
+        <file>rc28.png</file>
+        <file>xbox.png</file>
+    </qresource>
 </RCC>

From 5db5f40ed4ac8c7682e28c39c629f08509809f9b Mon Sep 17 00:00:00 2001
From: Roeland Jansen <roeland.jansen69@gmail.com>
Date: Thu, 26 Jan 2023 07:35:23 +0100
Subject: [PATCH 07/11] small compiling fixes and magic pbt/cw calculations

---
 CHANGELOG | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c915abf..91161d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,107 @@
+commit fe36ff1ac73dee5b14df534b50454587c95fe4bd
+Merge: 13f06e1 4950127
+Author: Roeland Jansen <roeland.jansen69@gmail.com>
+Date:   Thu Jan 26 07:33:00 2023 +0100
+
+    Merge branch 'pbt-fixes'
+
+commit 49501273d02e02df7b2b1ca58be7a576daa1a19f
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Wed Jan 25 21:37:12 2023 +0000
+
+    Fix for shuttle resource files
+
+commit ea46d6c625e02c4869bd5fcd42c191f111a590f7
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Wed Jan 25 21:22:06 2023 +0000
+
+    Add math.h for cwsender
+
+commit 13f06e1dd7596a83f1686be7e632f62121574036
+Merge: 6df7099 ded6bd1
+Author: Roeland Jansen <roeland.jansen69@gmail.com>
+Date:   Wed Jan 25 22:17:23 2023 +0100
+
+    Merge branch 'pbt-fixes'
+
+commit ded6bd1adeba5790b1457fa1afcae651f322f045
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Wed Jan 25 18:01:24 2023 +0000
+
+    Add CW Speed spinbox to CW sender
+
+commit 4b40e20d9825e66c7b7cd77371d3f1e8801f06ae
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Wed Jan 25 15:39:01 2023 +0000
+
+    Remove some debugging
+
+commit 6df7099cb3ac8d48fdbff501cc0c1a7e2b236341
+Merge: bc0f9f0 5483732
+Author: Roeland Jansen <roeland.jansen69@gmail.com>
+Date:   Wed Jan 25 13:17:03 2023 +0100
+
+    Merge branch 'pbt-fixes'
+
+commit 54837327663bbb1b0aff5bb8cde45e1ebc4d63ee
+Merge: 8b8668a 7f97625
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Wed Jan 25 11:42:13 2023 +0000
+
+    Merge branch 'master' into pbt-fixes
+
+commit 8b8668a6deacb528cf9e0bf7311465966abc1614
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Wed Jan 25 11:41:50 2023 +0000
+
+    Finally PBT works in all modes/filter widths/cw pitch settings.
+
+commit bc0f9f01c7333285214d3b847517625de2a63899
+Merge: 85e38d9 be0aee6
+Author: Roeland Jansen <roeland.jansen69@gmail.com>
+Date:   Wed Jan 25 09:16:36 2023 +0100
+
+    Merge branch 'morecontrols'
+
+commit be0aee6183286a73604f5eba7c4b2d57b530d383
+Author: Elliott Liggett <kilocharlie8@gmail.com>
+Date:   Wed Jan 25 00:15:20 2023 -0800
+
+    Split mode is working, can also live-sync frequency and mode.
+
+commit 85e38d940f2874bbcbdcbbb619203732b0f1c146
+Merge: 7f97625 a1d3f93
+Author: Roeland Jansen <roeland.jansen69@gmail.com>
+Date:   Wed Jan 25 07:47:41 2023 +0100
+
+    Merge branch 'pbt-fixes'
+
+commit 4fea16c356189b06caad2adb2e5399dbbcc01945
+Author: Elliott Liggett <kilocharlie8@gmail.com>
+Date:   Tue Jan 24 16:35:46 2023 -0800
+
+    Refined split interface controls. Offset is KHz, automatic tracking mode
+    added.
+
+commit ae64677c4213c0e0f2789a4388f5f2120c1574ff
+Merge: 0a7f6b0 7f97625
+Author: Elliott Liggett <kilocharlie8@gmail.com>
+Date:   Tue Jan 24 15:17:17 2023 -0800
+
+    Merge branch 'master' into morecontrols
+
+commit a1d3f93dad7141a54a4ffd5585eaad0ee7774591
+Author: Phil Taylor <phil@m0vse.uk>
+Date:   Tue Jan 24 20:12:23 2023 +0000
+
+    PBT should now display correctly in ALL modes!
+
+commit 7f97625e38eec48affcb4abe174802636a7b07ad
+Author: Roeland Jansen <roeland.jansen69@gmail.com>
+Date:   Tue Jan 24 19:49:43 2023 +0100
+
+    modified CHANGELOG
+
 commit d53c9b028e1e962b80334bbeaac794d4572d9939
 Author: Elliott Liggett <kilocharlie8@gmail.com>
 Date:   Tue Jan 24 10:37:26 2023 -0800
@@ -5,6 +109,12 @@ Date:   Tue Jan 24 10:37:26 2023 -0800
     Added a rapidPollCmdQueue for things we need to poll rapidly on not-s-
     meter-intervals. Moved command types to wfviewtypes.h.
 
+commit 0a7f6b0b6547087841bd0f5da1f962250cdda49c
+Author: Elliott Liggett <kilocharlie8@gmail.com>
+Date:   Tue Jan 24 09:21:09 2023 -0800
+
+    Started work on the UI for a split control interface.
+
 commit 2df82d4f922fcebd256816d41839977840d08e5b
 Author: Roeland Jansen <roeland.jansen69@gmail.com>
 Date:   Tue Jan 24 17:22:34 2023 +0100

From 5128ea0e69e4764342720b9df90cdd0bea0ee4f8 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 27 Jan 2023 01:41:35 +0000
Subject: [PATCH 08/11] Lots of fixes for PBT and command handling -
 experimental

---
 udpbase.h  |   1 +
 wfmain.cpp | 310 ++++++++++++++++++++++++++++++-----------------------
 wfmain.h   |   2 +
 wfmain.ui  | 136 +++++++++++++----------
 4 files changed, 257 insertions(+), 192 deletions(-)

diff --git a/udpbase.h b/udpbase.h
index e5c67cf..24ce4be 100644
--- a/udpbase.h
+++ b/udpbase.h
@@ -35,6 +35,7 @@ struct udpPreferences {
 	QString password;
 	QString clientName;
 	quint8 waterfallFormat;
+	bool halfDuplex;
 };
 
 struct networkAudioLevels {
diff --git a/wfmain.cpp b/wfmain.cpp
index fe04ed2..ae94410 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -2040,6 +2040,8 @@ void wfmain::loadSettings()
 
     udpPrefs.clientName = settings->value("ClientName", udpDefPrefs.clientName).toString();
 
+    udpPrefs.halfDuplex = settings->value("HalfDuplex", udpDefPrefs.halfDuplex).toBool();
+
     settings->endGroup();
 
     settings->beginGroup("Server");
@@ -2700,6 +2702,7 @@ void wfmain::saveSettings()
     settings->setValue("ResampleQuality", rxSetup.resampleQuality);
     settings->setValue("ClientName", udpPrefs.clientName);
     settings->setValue("WaterfallFormat", prefs.waterfallFormat);
+    settings->setValue("HalfDuplex", udpPrefs.halfDuplex);
 
     settings->endGroup();
 
@@ -4055,9 +4058,15 @@ void wfmain::issueDelayedCommandUnique(cmds cmd)
     cmddata.cmd = cmd;
     cmddata.data = NULL;
 
+    delayedCmdQue.push_front(cmddata);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) {  return (c.cmd == cmd); }), delayedCmdQue.end());
+
     // The following is both expensive and not that great,
-    // since it does not check if the arguments are the same.
-    bool found = false;
+    // since it does not check if the arguments are the same.    
+/*    bool found = false;
+
+
+
     for(unsigned int i=0; i < delayedCmdQue.size(); i++)
     {
         if(delayedCmdQue.at(i).cmd == cmd)
@@ -4076,7 +4085,9 @@ void wfmain::issueDelayedCommandUnique(cmds cmd)
 //    {
 //        delayedCmdQue.push_front(cmddata);
 //    }
+*/
 
+//    delayedCmdQue.push_front(cmddata);
 }
 
 void wfmain::issueCmd(cmds cmd, mode_info m)
@@ -4175,7 +4186,9 @@ void wfmain::issueCmdUniquePriority(cmds cmd, bool b)
     cmddata.cmd = cmd;
     cmddata.data = std::shared_ptr<bool>(new bool(b));
     delayedCmdQue.push_front(cmddata);
-    removeSimilarCommand(cmd);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) { return (c.cmd == cmd); }), delayedCmdQue.end());
+
+    //removeSimilarCommand(cmd);
 }
 
 void wfmain::issueCmdUniquePriority(cmds cmd, unsigned char c)
@@ -4184,7 +4197,9 @@ void wfmain::issueCmdUniquePriority(cmds cmd, unsigned char c)
     cmddata.cmd = cmd;
     cmddata.data = std::shared_ptr<unsigned char>(new unsigned char(c));
     delayedCmdQue.push_front(cmddata);
-    removeSimilarCommand(cmd);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) { return (c.cmd == cmd); }), delayedCmdQue.end());
+
+    //removeSimilarCommand(cmd);
 }
 
 void wfmain::issueCmdUniquePriority(cmds cmd, char c)
@@ -4193,7 +4208,8 @@ void wfmain::issueCmdUniquePriority(cmds cmd, char c)
     cmddata.cmd = cmd;
     cmddata.data = std::shared_ptr<char>(new char(c));
     delayedCmdQue.push_front(cmddata);
-    removeSimilarCommand(cmd);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) { return (c.cmd == cmd); }), delayedCmdQue.end());
+    //removeSimilarCommand(cmd);
 }
 
 void wfmain::issueCmdUniquePriority(cmds cmd, freqt f)
@@ -4202,7 +4218,8 @@ void wfmain::issueCmdUniquePriority(cmds cmd, freqt f)
     cmddata.cmd = cmd;
     cmddata.data = std::shared_ptr<freqt>(new freqt(f));
     delayedCmdQue.push_front(cmddata);
-    removeSimilarCommand(cmd);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) { return (c.cmd == cmd); }), delayedCmdQue.end());
+    //removeSimilarCommand(cmd);
 }
 
 void wfmain::issueCmdUniquePriority(cmds cmd, quint16 c)
@@ -4211,7 +4228,8 @@ void wfmain::issueCmdUniquePriority(cmds cmd, quint16 c)
     cmddata.cmd = cmd;
     cmddata.data = std::shared_ptr<quint16>(new quint16(c));
     delayedCmdQue.push_front(cmddata);
-    removeSimilarCommand(cmd);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) { return (c.cmd == cmd); }), delayedCmdQue.end());
+    //removeSimilarCommand(cmd);
 }
 
 void wfmain::issueCmdUniquePriority(cmds cmd, qint16 c)
@@ -4220,7 +4238,8 @@ void wfmain::issueCmdUniquePriority(cmds cmd, qint16 c)
     cmddata.cmd = cmd;
     cmddata.data = std::shared_ptr<qint16>(new qint16(c));
     delayedCmdQue.push_front(cmddata);
-    removeSimilarCommand(cmd);
+    delayedCmdQue.erase(std::remove_if(delayedCmdQue.begin() + 1, delayedCmdQue.end(), [cmd](const commandtype& c) { return (c.cmd == cmd); }), delayedCmdQue.end());
+    //removeSimilarCommand(cmd);
 }
 
 void wfmain::removeSimilarCommand(cmds cmd)
@@ -4507,9 +4526,13 @@ void wfmain::initPeriodicCommands()
     rapidPollCmdQueue.clear();
     if (rigCaps.hasSpectrum) {
         // Get passband
-        insertPeriodicRapidCmd(cmdGetPassband);
-        insertPeriodicRapidCmd(cmdGetTPBFInner);
-        insertPeriodicRapidCmd(cmdGetTPBFOuter);
+        //insertPeriodicRapidCmd(cmdGetPassband);
+        //insertPeriodicRapidCmd(cmdGetTPBFInner);
+        //insertPeriodicRapidCmd(cmdGetTPBFOuter);
+        insertSlowPeriodicCommand(cmdGetPassband, 128);
+        insertSlowPeriodicCommand(cmdGetTPBFInner, 128);
+        insertSlowPeriodicCommand(cmdGetTPBFOuter, 128);
+
     }
     rapidPollCmdQueueEnabled = true;
 }
@@ -5110,31 +5133,36 @@ void wfmain::handlePlotMouseMove(QMouseEvent* me)
     }
     else if (passbandAction == passbandResizing)
     {
-        // We are currently resizing the passband.
-        double pb = 0.0;
-        double origin = 0.0;
-        switch (currentModeInfo.mk)
-        {
-        case modeCW:
-        case modeCW_R:
-            origin = 0.0;
-            break;
-        case modeLSB:
-            origin = -passbandCenterFrequency;
-            break;
-        default:
-            origin = passbandCenterFrequency;
-            break;
-        }
+        static double lastFreq = movedFrequency;
+        if (lastFreq - movedFrequency > 0.000049 || movedFrequency - lastFreq > 0.000049) {
 
-        if (plot->xAxis->pixelToCoord(cursor) >= freq.MHzDouble + origin) {
-            pb = plot->xAxis->pixelToCoord(cursor) - passbandIndicator->topLeft->coords().x();
-        }
-        else {
-            pb = passbandIndicator->bottomRight->coords().x() - plot->xAxis->pixelToCoord(cursor);
-        }
+            // We are currently resizing the passband.
+            double pb = 0.0;
+            double origin = 0.0;
+            switch (currentModeInfo.mk)
+            {
+            case modeCW:
+            case modeCW_R:
+                origin = 0.0;
+                break;
+            case modeLSB:
+                origin = -passbandCenterFrequency;
+                break;
+            default:
+                origin = passbandCenterFrequency;
+                break;
+            }
 
-        issueCmdUniquePriority(cmdSetPassband, (quint16)(pb * 1000000));
+            if (plot->xAxis->pixelToCoord(cursor) >= freq.MHzDouble + origin) {
+                pb = plot->xAxis->pixelToCoord(cursor) - passbandIndicator->topLeft->coords().x();
+            }
+            else {
+                pb = passbandIndicator->bottomRight->coords().x() - plot->xAxis->pixelToCoord(cursor);
+            }
+            issueCmdUniquePriority(cmdSetPassband, (quint16)(pb * 1000000));
+            issueDelayedCommandUnique(cmdGetPassband);
+            lastFreq = movedFrequency;
+        }
     }
     else if (passbandAction == pbtMoving) {
 
@@ -5154,25 +5182,36 @@ void wfmain::handlePlotMouseMove(QMouseEvent* me)
                 qDebug() << QString("Moving passband by %1 Hz (Inner %2) (Outer %3) Mode:%4").arg((qint16)(movedFrequency * 1000000))
                     .arg(newInFreq).arg(newOutFreq).arg(currentModeInfo.mk);
 
-                issueCmd(cmdSetTPBFInner, (unsigned char)newInFreq);
-                issueCmd(cmdSetTPBFOuter, (unsigned char)newOutFreq);
-
+                issueCmdUniquePriority(cmdSetTPBFInner, (unsigned char)newInFreq);
+                issueCmdUniquePriority(cmdSetTPBFOuter, (unsigned char)newOutFreq);
+                issueDelayedCommandUnique(cmdGetTPBFInner);
+                issueDelayedCommandUnique(cmdGetTPBFOuter);
             }
             lastFreq = movedFrequency;
         }
     }
     else if (passbandAction == pbtInnerMove) {
-        double pbFreq = ((double)(TPBFInner + movedFrequency) / passbandWidth) * 127.0;
-        qint16 newFreq = pbFreq + 128;
-        if (newFreq >= 0 && newFreq <= 255) {
-            issueCmdUniquePriority(cmdSetTPBFInner, (unsigned char)newFreq);
+        static double lastFreq = movedFrequency;
+        if (lastFreq - movedFrequency > 0.000049 || movedFrequency - lastFreq > 0.000049) {
+            double pbFreq = ((double)(TPBFInner + movedFrequency) / passbandWidth) * 127.0;
+            qint16 newFreq = pbFreq + 128;
+            if (newFreq >= 0 && newFreq <= 255) {
+                issueCmdUniquePriority(cmdSetTPBFInner, (unsigned char)newFreq);
+                issueDelayedCommandUnique(cmdGetTPBFInner);
+            }
+            lastFreq = movedFrequency;
         }
     }
     else if (passbandAction == pbtOuterMove) {
-        double pbFreq = ((double)(TPBFOuter + movedFrequency) / passbandWidth) * 127.0;
-        qint16 newFreq = pbFreq + 128;
-        if (newFreq >= 0 && newFreq <= 255) {
-            issueCmdUniquePriority(cmdSetTPBFOuter, (unsigned char)newFreq);
+        static double lastFreq = movedFrequency;
+        if (lastFreq - movedFrequency > 0.000049 || movedFrequency - lastFreq > 0.000049) {
+            double pbFreq = ((double)(TPBFOuter + movedFrequency) / passbandWidth) * 127.0;
+            qint16 newFreq = pbFreq + 128;
+            if (newFreq >= 0 && newFreq <= 255) {
+                issueCmdUniquePriority(cmdSetTPBFOuter, (unsigned char)newFreq);
+                issueDelayedCommandUnique(cmdGetTPBFOuter);
+            }
+            lastFreq = movedFrequency;
         }
     }
     else  if (passbandAction == passbandStatic && me->buttons() == Qt::LeftButton && textItem == nullptr && prefs.clickDragTuningEnable)
@@ -5266,106 +5305,101 @@ void wfmain::receiveMode(unsigned char mode, unsigned char filter)
     if(mode < 0x23)
     {
 
-        for(int i=0; i < ui->modeSelectCombo->count(); i++)
+        // Update mode information if mode/filter has changed
+        if (currentModeInfo.mk != (mode_kind)mode || currentModeInfo.filter != filter)
         {
-            if(ui->modeSelectCombo->itemData(i).toInt() == mode)
-            {
-                ui->modeSelectCombo->blockSignals(true);
-                ui->modeSelectCombo->setCurrentIndex(i);
-                ui->modeSelectCombo->blockSignals(false);
-                found = true;
+
+            removePeriodicRapidCmd(cmdGetCwPitch);
+            quint16 maxPassbandHz = 0;
+            switch ((mode_kind)mode) {
+            case modeFM:
+                if (filter == 1)
+                    passbandWidth = 0.015;
+                else if (filter == 2)
+                    passbandWidth = 0.010;
+                else
+                    passbandWidth = 0.007;
+                passbandCenterFrequency = 0.0;
+                maxPassbandHz = 10E3;
+                break;
+            case modeCW:
+            case modeCW_R:
+                insertPeriodicRapidCmdUnique(cmdGetCwPitch);
+                maxPassbandHz = 3600;
+                break;
+            case modeAM:
+                passbandCenterFrequency = 0.0;
+                maxPassbandHz = 10E3;
+                break;
+            case modeLSB:
+            case modeUSB:
+                passbandCenterFrequency = 0.0015;
+                maxPassbandHz = 3600;
+                break;
+            default:
+                passbandCenterFrequency = 0.0;
+                maxPassbandHz = 3600;
+                break;
             }
-        }
-        currentModeIndex = mode;
-        currentModeInfo.mk = (mode_kind)mode;
-        cw->handleCurrentModeUpdate((mode_kind)mode);
-        currentModeInfo.filter = filter;
 
-        switch (currentModeInfo.mk) {
-        case modeFM:
-            if (currentModeInfo.filter == 1)
-                passbandWidth = 0.015;
-            else if (currentModeInfo.filter == 2)
-                passbandWidth = 0.010;
-            else
-                passbandWidth = 0.007;
-            passbandCenterFrequency = 0.0;
-            break;
-        case modeLSB:
-        case modeUSB:
-            removePeriodicCommand(cmdGetCwPitch);
-            removePeriodicCommand(cmdGetPskTone);
-            removePeriodicCommand(cmdGetRttyMark);
-            passbandCenterFrequency = 0.0015;
-            break;
-        case modeCW:
-        case modeCW_R:
-            insertPeriodicCommandUnique(cmdGetCwPitch);
-            removePeriodicCommand(cmdGetPskTone);
-            removePeriodicCommand(cmdGetRttyMark);
-            break;
-        default:
-            removePeriodicCommand(cmdGetCwPitch);
-            removePeriodicCommand(cmdGetPskTone);
-            removePeriodicCommand(cmdGetRttyMark);
-            passbandCenterFrequency = 0.0;
-            break;
-        }
+            for (int i = 0; i < ui->modeSelectCombo->count(); i++)
+            {
+                if (ui->modeSelectCombo->itemData(i).toInt() == mode)
+                {
+                    ui->modeSelectCombo->blockSignals(true);
+                    ui->modeSelectCombo->setCurrentIndex(i);
+                    ui->modeSelectCombo->blockSignals(false);
+                    found = true;
+                }
+            }
 
-    } else {
-        qCritical(logSystem()) << __func__ << "Invalid mode " << mode << " received. ";
-    }
+            if ((filter) && (filter < 4)) {
+                ui->modeFilterCombo->blockSignals(true);
+                ui->modeFilterCombo->setCurrentIndex(filter - 1);
+                ui->modeFilterCombo->blockSignals(false);
+            }
 
-    if(!found)
-    {
-        qWarning(logSystem()) << __func__ << "Received mode " << mode << " but could not match to any index within the modeSelectCombo. ";
-        return;
-    }
+            currentModeIndex = mode;
+            currentModeInfo.mk = (mode_kind)mode;
+            currentMode = (mode_kind)mode;
+            currentModeInfo.filter = filter;
+            currentModeInfo.reg = mode;
+            rpt->handleUpdateCurrentMainMode(currentModeInfo);
 
+<<<<<<< Updated upstream
     currentModeIndex = mode;
     currentModeInfo.mk = (mode_kind)mode;
     currentMode = (mode_kind)mode;
     currentModeInfo.filter = filter;
+=======
+            if (!found)
+            {
+                qWarning(logSystem()) << __func__ << "Received mode " << mode << " but could not match to any index within the modeSelectCombo. ";
+                return;
+            }
+>>>>>>> Stashed changes
 
-    if( (filter) && (filter < 4)){
-        ui->modeFilterCombo->blockSignals(true);
-        ui->modeFilterCombo->setCurrentIndex(filter-1);
-        ui->modeFilterCombo->blockSignals(false);
-    }
+            if (maxPassbandHz != 0)
+            {
+                trxadj->setMaxPassband(maxPassbandHz);
+            }
 
-    quint16 maxPassbandHz = 0;
-    switch(currentMode)
-    {
-    case modeUSB:
-    case modeLSB:
-    case modeCW:
-    case modeCW_R:
-    case modePSK:
-    case modePSK_R:
-        maxPassbandHz = 3600;
-        break;
-    case modeRTTY:
-    case modeRTTY_R:
-        maxPassbandHz = 2700;
-        break;
-    case modeAM:
-        maxPassbandHz = 10E3;
-        break;
-    case modeFM:
-        maxPassbandHz = 10E3;
-        break;
-    default:
-        break;
-    }
-    if(maxPassbandHz != 0)
-    {
-        trxadj->setMaxPassband(maxPassbandHz);
-    }
-    // Note: we need to know if the DATA mode is active to reach mode-D
-    // some kind of queued query:
-    if (rigCaps.hasDataModes && rigCaps.hasTransmit)
-    {
-        issueDelayedCommand(cmdGetDataMode);
+            issueDelayedCommandUnique(cmdGetPassband);
+            issueDelayedCommandUnique(cmdGetCwPitch);
+            issueDelayedCommandUnique(cmdGetTPBFInner);
+            issueDelayedCommandUnique(cmdGetTPBFOuter);
+
+            // Note: we need to know if the DATA mode is active to reach mode-D
+            // some kind of queued query:
+            if (rigCaps.hasDataModes && rigCaps.hasTransmit)
+            {
+                issueDelayedCommand(cmdGetDataMode);
+            }
+
+        }
+
+    } else {
+        qCritical(logSystem()) << __func__ << "Invalid mode " << mode << " received. ";
     }
 }
 
@@ -5649,7 +5683,9 @@ void wfmain::on_modeSelectCombo_activated(int index)
         }
 
         issueCmd(cmdSetMode, mode);
-        currentModeInfo = mode;
+        issueDelayedCommand(cmdGetMode);
+
+        //currentModeInfo = mode;
     }
 }
 
@@ -6191,6 +6227,11 @@ void wfmain::on_passwordTxt_textChanged(QString text)
     udpPrefs.password = text;
 }
 
+void wfmain::on_audioDuplexCombo_currentIndexChanged(int value)
+{
+    udpPrefs.halfDuplex = (bool)value;
+}
+
 void wfmain::on_audioOutputCombo_currentIndexChanged(int value)
 {
 
@@ -6344,6 +6385,7 @@ void wfmain::on_modeFilterCombo_activated(int index)
             m.mk = (mode_kind)newMode;
             m.reg = newMode;
             issueCmd(cmdSetMode, m);
+
             //emit setMode(newMode, (unsigned char)filterSelection);
         }
     }
diff --git a/wfmain.h b/wfmain.h
index 00c1063..d5c27c7 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -451,6 +451,8 @@ private slots:
 
     void on_passwordTxt_textChanged(QString text);
 
+    void on_audioDuplexCombo_currentIndexChanged(int value);
+
     void on_audioOutputCombo_currentIndexChanged(int value);
 
     void on_audioInputCombo_currentIndexChanged(int value);
diff --git a/wfmain.ui b/wfmain.ui
index cb896a4..21ff7aa 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1082</width>
+    <width>1063</width>
     <height>660</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>0</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="mainTab">
        <attribute name="title">
@@ -1808,7 +1808,6 @@
              <font>
               <family>DejaVu Sans Mono</family>
               <pointsize>14</pointsize>
-              <weight>75</weight>
               <bold>true</bold>
              </font>
             </property>
@@ -2233,7 +2232,7 @@
           <item>
            <widget class="QStackedWidget" name="settingsStack">
             <property name="currentIndex">
-             <number>1</number>
+             <number>0</number>
             </property>
             <widget class="QWidget" name="radioAccess">
              <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -2775,61 +2774,26 @@
                       </widget>
                      </item>
                      <item>
-                      <widget class="QLabel" name="label_15">
+                      <widget class="QLabel" name="label_51">
                        <property name="text">
-                        <string>Audio Output </string>
+                        <string>Duplex</string>
                        </property>
                       </widget>
                      </item>
                      <item>
-                      <widget class="QComboBox" name="audioOutputCombo">
-                       <property name="maximumSize">
-                        <size>
-                         <width>120</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="accessibleName">
-                        <string>Audio Output Selector</string>
-                       </property>
+                      <widget class="QComboBox" name="audioDuplexCombo">
+                       <item>
+                        <property name="text">
+                         <string>Full Duplex</string>
+                        </property>
+                       </item>
+                       <item>
+                        <property name="text">
+                         <string>Half Duplex</string>
+                        </property>
+                       </item>
                       </widget>
                      </item>
-                     <item>
-                      <widget class="QLabel" name="label_18">
-                       <property name="text">
-                        <string>Audio Input</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item>
-                      <widget class="QComboBox" name="audioInputCombo">
-                       <property name="maximumSize">
-                        <size>
-                         <width>120</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="accessibleName">
-                        <string>Audio Input Selector</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item>
-                      <spacer name="horizontalSpacer_8">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeType">
-                        <enum>QSizePolicy::Fixed</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>15</width>
-                         <height>20</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
                      <item>
                       <widget class="QLabel" name="label_40">
                        <property name="text">
@@ -2871,6 +2835,63 @@
                      </item>
                     </layout>
                    </item>
+                   <item>
+                    <layout class="QHBoxLayout" name="horizontalLayout_47">
+                     <item>
+                      <widget class="QLabel" name="label_15">
+                       <property name="text">
+                        <string>Audio Output </string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <widget class="QComboBox" name="audioOutputCombo">
+                       <property name="maximumSize">
+                        <size>
+                         <width>200</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="accessibleName">
+                        <string>Audio Output Selector</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <widget class="QLabel" name="label_18">
+                       <property name="text">
+                        <string>Audio Input</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <widget class="QComboBox" name="audioInputCombo">
+                       <property name="maximumSize">
+                        <size>
+                         <width>200</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="accessibleName">
+                        <string>Audio Input Selector</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <spacer name="horizontalSpacer_37">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                    </layout>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -3409,8 +3430,8 @@
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>858</width>
-                      <height>287</height>
+                      <width>579</width>
+                      <height>224</height>
                      </rect>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_2">
@@ -5359,7 +5380,6 @@
        <widget class="QPushButton" name="exitBtn">
         <property name="font">
          <font>
-          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>
@@ -5378,8 +5398,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1082</width>
-     <height>21</height>
+     <width>1063</width>
+     <height>22</height>
     </rect>
    </property>
   </widget>
@@ -5407,7 +5427,7 @@
  <connections/>
  <buttongroups>
   <buttongroup name="pollingButtonGroup"/>
-  <buttongroup name="underlayButtonGroup"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="underlayButtonGroup"/>
  </buttongroups>
 </ui>

From 5d0a95cd00541320ecbf17f570da8457f69f359b Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 27 Jan 2023 02:00:11 +0000
Subject: [PATCH 09/11] Use remove_if() for command queue removal

---
 wfmain.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 1c681af..37d45db 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4578,6 +4578,10 @@ void wfmain::insertPeriodicCommandUnique(cmds cmd)
 
 void wfmain::removePeriodicRapidCmd(cmds cmd)
 {
+
+    rapidPollCmdQueue.erase(std::remove_if(rapidPollCmdQueue.begin() + 1, rapidPollCmdQueue.end(), [cmd](const commandtype& c) {  return (c.cmd == cmd); }), rapidPollCmdQueue.end());
+
+    /*
     while(true)
     {
         auto it = std::find(this->rapidPollCmdQueue.begin(), this->rapidPollCmdQueue.end(), cmd);
@@ -4588,11 +4592,15 @@ void wfmain::removePeriodicRapidCmd(cmds cmd)
             break;
         }
     }
+    */
 }
 
 void wfmain::removePeriodicCommand(cmds cmd)
 {
-    while(true)
+
+    periodicCmdQueue.erase(std::remove_if(periodicCmdQueue.begin() + 1, periodicCmdQueue.end(), [cmd](const commandtype& c) {  return (c.cmd == cmd); }), periodicCmdQueue.end());
+
+/*    while (true)
     {
         auto it = std::find(this->periodicCmdQueue.begin(), this->periodicCmdQueue.end(), cmd);
         if(it != periodicCmdQueue.end())
@@ -4602,6 +4610,7 @@ void wfmain::removePeriodicCommand(cmds cmd)
             break;
         }
     }
+    */
 }
 
 

From fa41571eca60fd0e1d584d3b59e1e120a5ba07f3 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 27 Jan 2023 02:04:51 +0000
Subject: [PATCH 10/11] Fix for remove_if

---
 wfmain.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 37d45db..ca94437 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4579,7 +4579,7 @@ void wfmain::insertPeriodicCommandUnique(cmds cmd)
 void wfmain::removePeriodicRapidCmd(cmds cmd)
 {
 
-    rapidPollCmdQueue.erase(std::remove_if(rapidPollCmdQueue.begin() + 1, rapidPollCmdQueue.end(), [cmd](const commandtype& c) {  return (c.cmd == cmd); }), rapidPollCmdQueue.end());
+    rapidPollCmdQueue.erase(std::remove_if(rapidPollCmdQueue.begin(), rapidPollCmdQueue.end(), [cmd](const cmds& c) {  return (c == cmd); }), rapidPollCmdQueue.end());
 
     /*
     while(true)
@@ -4598,7 +4598,7 @@ void wfmain::removePeriodicRapidCmd(cmds cmd)
 void wfmain::removePeriodicCommand(cmds cmd)
 {
 
-    periodicCmdQueue.erase(std::remove_if(periodicCmdQueue.begin() + 1, periodicCmdQueue.end(), [cmd](const commandtype& c) {  return (c.cmd == cmd); }), periodicCmdQueue.end());
+    periodicCmdQueue.erase(std::remove_if(periodicCmdQueue.begin(), periodicCmdQueue.end(), [cmd](const cmds& c) {  return (c == cmd); }), periodicCmdQueue.end());
 
 /*    while (true)
     {

From eb782da0108a885bb3e98dd00759ff8f52769b86 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 27 Jan 2023 10:36:28 +0000
Subject: [PATCH 11/11] Query PBT status after reset

---
 wfmain.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wfmain.cpp b/wfmain.cpp
index ca94437..7f26121 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4981,6 +4981,9 @@ void wfmain::handlePlotDoubleClick(QMouseEvent *me)
             qint16 newFreq = pbFreq + 128;
             issueCmdUniquePriority(cmdSetTPBFInner, (unsigned char)newFreq);
             issueCmdUniquePriority(cmdSetTPBFOuter, (unsigned char)newFreq);
+            issueDelayedCommandUnique(cmdGetTPBFInner);
+            issueDelayedCommandUnique(cmdGetTPBFOuter);
+
         }
     }
 }