Fixed missing bits in API. Fixes #1247

f4exb · May 16, 2022 · 7a8cab7 · 7a8cab7
1 parent cddfc00
commit 7a8cab7
Show file tree

Hide file tree

Showing 21 changed files with 106 additions and 1,326 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,31 +1,37 @@
-sdrangel (7.0.0-beta.3) unstable; urgency=medium
+sdrangel (7.0.0beta4-1) unstable; urgency=medium
+
+  * Fixed missing bits in API. Fixes #1247
+
+  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Mon, 16 May 2022 18:43:31 +0200
+
+sdrangel (7.0.0beta3-1) unstable; urgency=medium
 
   * MainServer: fix adding unique featureset
   * Fix typing errors in readme's. PR #1245
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 15 May 2022 21:34:30 +0200
 
-sdrangel (7.0.0-beta.2) unstable; urgency=medium
+sdrangel (7.0.0beta2-1) unstable; urgency=medium
 
   * Fixed remaining v7 branch references
   * SSB and NFM demod: do not process samples if channel sample rate is not set yet (==0)
   * Added changelog for Debian
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 15 May 2022 09:33:12 +0200
 
-sdrangel (7.0.0-beta.1) unstable; urgency=medium
+sdrangel (7.0.0beta1-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-beta.1
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sat, 14 May 2022 18:33:12 +0200
 
-sdrangel (7.0.0-alpha.4) unstable; urgency=medium
+sdrangel (7.0.0alpha4-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.4
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sat, 14 May 2022 11:33:12 +0200
 
-sdrangel (7.0.0-alpha.3) unstable; urgency=medium
+sdrangel (7.0.0alpha3-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.3
 
@@ -40,13 +46,13 @@ sdrangel (6.20.3-1) unstable; urgency=medium
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Wed, 29 Apr 2022 11:33:12 +0200
 
-sdrangel (7.0.0-alpha.2) unstable; urgency=medium
+sdrangel (7.0.0alpha2-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.2
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Thu, 28 Apr 2022 11:33:12 +0200
 
-sdrangel (7.0.0-alpha.1) unstable; urgency=medium
+sdrangel (7.0.0alpha1-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.1
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(sdrangel_VERSION_MAJOR "7")
 set(sdrangel_VERSION_MINOR "0")
 set(sdrangel_VERSION_PATCH "0")
-set(sdrangel_VERSION_SUFFIX "beta.3")
+set(sdrangel_VERSION_SUFFIX "beta.4")
 
 # SDRAngel cmake options
 option(DEBUG_OUTPUT "Print debug messages" OFF)

diff --git a/debian/changelog b/debian/changelog
@@ -1,31 +1,37 @@
-sdrangel (7.0.0-beta.3) unstable; urgency=medium
+sdrangel (7.0.0beta4-1) unstable; urgency=medium
+
+  * Fixed missing bits in API. Fixes #1247
+
+  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Mon, 16 May 2022 18:43:31 +0200
+
+sdrangel (7.0.0beta3-1) unstable; urgency=medium
 
   * MainServer: fix adding unique featureset
   * Fix typing errors in readme's. PR #1245
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 15 May 2022 21:34:30 +0200
 
-sdrangel (7.0.0-beta.2) unstable; urgency=medium
+sdrangel (7.0.0beta2-1) unstable; urgency=medium
 
   * Fixed remaining v7 branch references
   * SSB and NFM demod: do not process samples if channel sample rate is not set yet (==0)
   * Added changelog for Debian
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 15 May 2022 09:33:12 +0200
 
-sdrangel (7.0.0-beta.1) unstable; urgency=medium
+sdrangel (7.0.0beta1-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-beta.1
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sat, 14 May 2022 18:33:12 +0200
 
-sdrangel (7.0.0-alpha.4) unstable; urgency=medium
+sdrangel (7.0.0alpha4-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.4
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sat, 14 May 2022 11:33:12 +0200
 
-sdrangel (7.0.0-alpha.3) unstable; urgency=medium
+sdrangel (7.0.0alpha3-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.3
 
@@ -40,13 +46,13 @@ sdrangel (6.20.3-1) unstable; urgency=medium
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Wed, 29 Apr 2022 11:33:12 +0200
 
-sdrangel (7.0.0-alpha.2) unstable; urgency=medium
+sdrangel (7.0.0alpha2-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.2
 
   -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Thu, 28 Apr 2022 11:33:12 +0200
 
-sdrangel (7.0.0-alpha.1) unstable; urgency=medium
+sdrangel (7.0.0alpha1-1) unstable; urgency=medium
 
   * See: https://github.com/f4exb/sdrangel/releases/tag/v7.0.0-alpha.1
 

diff --git a/plugins/feature/simpleptt/simplepttworker.cpp b/plugins/feature/simpleptt/simplepttworker.cpp
@@ -226,20 +226,7 @@ void SimplePTTWorker::updateHardware()
     SWGSDRangel::SWGErrorResponse error;
     m_updateTimer.stop();
     m_mutex.unlock();
-
-    if (turnDevice(true))
-    {
-        m_webAPIAdapterInterface->devicesetFocusPatch(
-            m_tx ? m_settings.m_txDeviceSetIndex : m_settings.m_rxDeviceSetIndex, response, error);
-
-        if (m_msgQueueToGUI)
-        {
-            SimplePTTReport::MsgRadioState *msg = SimplePTTReport::MsgRadioState::create(
-                m_tx ? SimplePTTReport::RadioTx : SimplePTTReport::RadioRx
-            );
-            m_msgQueueToGUI->push(msg);
-        }
-    }
+    turnDevice(true);
 }
 
 bool SimplePTTWorker::turnDevice(bool on)

diff --git a/sdrbase/maincore.cpp b/sdrbase/maincore.cpp
@@ -29,7 +29,6 @@
 
 #include "maincore.h"
 
-MESSAGE_CLASS_DEFINITION(MainCore::MsgDeviceSetFocus, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgDVSerial, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgDeleteInstance, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgLoadPreset, Message)
@@ -45,8 +44,6 @@ MESSAGE_CLASS_DEFINITION(MainCore::MsgSaveFeatureSetPreset, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgDeleteFeatureSetPreset, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgAddDeviceSet, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgRemoveLastDeviceSet, Message)
-MESSAGE_CLASS_DEFINITION(MainCore::MsgAddFeatureSet, Message)
-MESSAGE_CLASS_DEFINITION(MainCore::MsgRemoveLastFeatureSet, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgSetDevice, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgAddChannel, Message)
 MESSAGE_CLASS_DEFINITION(MainCore::MsgDeleteChannel, Message)
@@ -164,6 +161,13 @@ Feature *MainCore::getFeature(unsigned int featureSetIndex, int featureIndex)
 void MainCore::appendFeatureSet()
 {
     int newIndex = m_featureSets.size();
+
+    if (newIndex != 0)
+    {
+        qWarning("MainCore::appendFeatureSet: attempt to add more than one feature set (%d)", newIndex);
+        return;
+    }
+
     FeatureSet *featureSet = new FeatureSet(newIndex);
     m_featureSets.push_back(featureSet);
     m_featureSetsMap.insert(featureSet, newIndex);

diff --git a/sdrbase/maincore.h b/sdrbase/maincore.h
@@ -58,26 +58,6 @@ class SDRBASE_API MainCore : public QObject
 {
     Q_OBJECT
 public:
-	class SDRBASE_API MsgDeviceSetFocus : public Message {
-        MESSAGE_CLASS_DECLARATION
-
-    public:
-        int getDeviceSetIndex() const { return m_deviceSetIndex; }
-
-        static MsgDeviceSetFocus* create(int deviceSetIndex)
-        {
-            return new MsgDeviceSetFocus(deviceSetIndex);
-        }
-
-    private:
-        int m_deviceSetIndex;
-
-        MsgDeviceSetFocus(int deviceSetIndex) :
-            Message(),
-            m_deviceSetIndex(deviceSetIndex)
-        { }
-    };
-
 	class SDRBASE_API MsgDVSerial : public Message {
         MESSAGE_CLASS_DECLARATION
 
@@ -376,34 +356,6 @@ class SDRBASE_API MainCore : public QObject
         { }
     };
 
-    class SDRBASE_API MsgAddFeatureSet : public Message {
-        MESSAGE_CLASS_DECLARATION
-
-    public:
-        static MsgAddFeatureSet* create() {
-            return new MsgAddFeatureSet();
-        }
-
-    private:
-        MsgAddFeatureSet() :
-            Message()
-        { }
-    };
-
-    class SDRBASE_API MsgRemoveLastFeatureSet : public Message {
-        MESSAGE_CLASS_DECLARATION
-
-    public:
-        static MsgRemoveLastFeatureSet* create() {
-            return new MsgRemoveLastFeatureSet();
-        }
-
-    private:
-        MsgRemoveLastFeatureSet() :
-            Message()
-        { }
-    };
-
     class SDRBASE_API MsgSetDevice : public Message {
         MESSAGE_CLASS_DECLARATION