From 3540efc696230ff3800511743ed059ef4e664c17 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 1 Oct 2015 04:23:22 +0200
Subject: [PATCH] FCD Pro+: normalized plugin device Id definition

---
 Readme.md                                     |  2 ++
 .../samplesource/fcdproplus/fcdproplusgui.ui  | 26 +++++++++----------
 .../fcdproplus/fcdproplusplugin.cpp           |  2 ++
 .../fcdproplus/fcdproplusplugin.h             |  4 +++
 plugins/samplesource/rtlsdr/rtlsdrgui.ui      |  5 ++++
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Readme.md b/Readme.md
index 60f53a2c9..f8972936d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -69,6 +69,8 @@ Both Pro and Pro+ are supported with the plugins in fcdpro and fcdproplus respec
 
 The control interface is based on qthid and has been built in the software in the fcdhid library. You don't need anything else than libusb support. Library fcdlib is used to store the constants for each dongle type.
 
+The Pro+ has trouble starting. The sound card interface is not recognized when you just plug it in and start SDRAngel. The workaround is to start qthid then a recording program like Audacity and start recording in Audacity. Then just quit Audacity without saving and quit qthid. After this operation the Pro+ should be recognized by SDRAngel until you unplug it.
+
 <h2>HackRF</h2>
 
 HackRF is supported through the libhackrf library that should be installed in your system for proper build of the software and operation support. Add `libhackrf-dev` to the list of dependencies to install. Please note that you will need a recent version (2015.07.2 or 2015.07.1 at least) of libhackrf that supports the sequential listing of devices so you might need to build and install the Github version: `https://github.com/mossmann/hackrf.git`. Note also that the firmware must be updated to match the library version as per instructions found in the HackRF wiki.
diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.ui b/plugins/samplesource/fcdproplus/fcdproplusgui.ui
index 4fc330c0a..60b26b347 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusgui.ui
+++ b/plugins/samplesource/fcdproplus/fcdproplusgui.ui
@@ -249,6 +249,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_filt">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QLabel" name="filterIFLabel">
        <property name="text">
@@ -263,19 +276,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_filt">
-       <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>
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
index 5a85da525..307240a89 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
@@ -31,6 +31,8 @@ const PluginDescriptor FCDProPlusPlugin::m_pluginDescriptor = {
 	QString("https://github.com/f4exb/sdrangel")
 };
 
+const QString FCDProPlusPlugin::m_deviceTypeID = FCDPROPLUS_DEVICE_TYPE_ID;
+
 FCDProPlusPlugin::FCDProPlusPlugin(QObject* parent) :
 	QObject(parent)
 {
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h
index 5ba26eea8..5ba28b7da 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h
@@ -4,6 +4,8 @@
 #include <QObject>
 #include "plugin/plugininterface.h"
 
+#define FCDPROPLUS_DEVICE_TYPE_ID "sdrangel.samplesource.fcdproplus"
+
 class FCDProPlusPlugin : public QObject, public PluginInterface {
 	Q_OBJECT
 	Q_INTERFACES(PluginInterface)
@@ -18,6 +20,8 @@ public:
 	virtual SampleSourceDevices enumSampleSources();
 	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
 
+	static const QString m_deviceTypeID;
+
 private:
 	static const PluginDescriptor m_pluginDescriptor;
 
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.ui b/plugins/samplesource/rtlsdr/rtlsdrgui.ui
index 248ed653f..536be0eca 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.ui
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.ui
@@ -360,6 +360,11 @@
    <header>gui/valuedial.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>  
  </customwidgets>
  <resources/>
  <connections/>