Allow serial PTT to be enabled along with OmniRig.

drowe67 · Dec 10, 2023 · 6c07825 · 6c07825
1 parent 87588d0
commit 6c07825
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/dlg_ptt.cpp b/src/dlg_ptt.cpp
@@ -796,12 +796,11 @@ void ComPortsDlg::OnTest(wxCommandEvent& event) {
 
 #if defined(WIN32)
 //-------------------------------------------------------------------------
-// PTTUseSerialClicked()
+// PTTUseOmniRigClicked()
 //-------------------------------------------------------------------------
 void ComPortsDlg::PTTUseOmniRigClicked(wxCommandEvent& event)
 {
     m_ckUseHamlibPTT->SetValue(false);
-    m_ckUseSerialPTT->SetValue(false);
     updateControlState();
 }
 #endif // defined(WIN32)
@@ -811,11 +810,7 @@ void ComPortsDlg::PTTUseOmniRigClicked(wxCommandEvent& event)
 //-------------------------------------------------------------------------
 void ComPortsDlg::PTTUseSerialClicked(wxCommandEvent& event)
 {
-    m_ckUseHamlibPTT->SetValue(false);
-#if defined(WIN32)
-    m_ckUseOmniRig->SetValue(false);
-#endif // defined(WIN32)
-
+    m_ckUseHamlibPTT->SetValue(false);    
     updateControlState();
 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -2000,9 +2000,17 @@ void MainFrame::performFreeDVOn_()
             {
                 OpenSerialPort();
             }
+            else
+            {
+                wxGetApp().rigPttController = nullptr;
+            }
+
 #if defined(WIN32)
-            else if (wxGetApp().appConfiguration.rigControlConfiguration.useOmniRig)
+            if (wxGetApp().appConfiguration.rigControlConfiguration.useOmniRig)
             {
+                // OmniRig can be anbled along with serial port PTT.
+                // The logic below will ensure we don't overwrite the serial PTT
+                // handler.
                 OpenOmniRig();
             }
 #endif // defined(WIN32)

diff --git a/src/ongui.cpp b/src/ongui.cpp
@@ -461,8 +461,11 @@ void MainFrame::OpenOmniRig()
 
     // OmniRig also controls PTT.
     wxGetApp().rigFrequencyController = tmp;
-    wxGetApp().rigPttController = tmp;
-
+    if (!wxGetApp().rigPttController)
+    {
+        wxGetApp().rigPttController = tmp;
+    }
+
     wxGetApp().rigFrequencyController->onRigError += [this](IRigController*, std::string err)
     {
         std::string fullErr = "Couldn't connect to Radio with OmniRig: " + err;