From 3aaa24a06f11a5d2fb36889ca239d9af614fb33a Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 25 Jul 2019 08:42:32 +0200
Subject: [PATCH] PlutoSDR input: added new buttons for hardware corrections

---
 .../plutosdrinput/plutosdrinputgui.ui         | 110 ++++++++++++++----
 .../plutosdrinput/plutosdrinputplugin.cpp     |   2 +-
 2 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
index 89b1a5cbc..b3ea3d085 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
@@ -204,7 +204,7 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="loppmLayout">
      <property name="topMargin">
       <number>2</number>
      </property>
@@ -253,26 +253,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="ButtonSwitch" name="dcOffset">
-       <property name="toolTip">
-        <string>Automatic DC offset removal</string>
-       </property>
-       <property name="text">
-        <string>DC</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="ButtonSwitch" name="iqImbalance">
-       <property name="toolTip">
-        <string>Automatic IQ imbalance correction</string>
-       </property>
-       <property name="text">
-        <string>IQ</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="TransverterButton" name="transverter">
        <property name="maximumSize">
@@ -291,6 +271,94 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="correctionsLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>SW</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="dcOffset">
+       <property name="toolTip">
+        <string>Software DC offset removal</string>
+       </property>
+       <property name="text">
+        <string>DC</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="iqImbalance">
+       <property name="toolTip">
+        <string>Software automatic IQ imbalance correction</string>
+       </property>
+       <property name="text">
+        <string>IQ</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>HW</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="rfDCOffset">
+       <property name="toolTip">
+        <string>Hardware RF DC removal</string>
+       </property>
+       <property name="text">
+        <string>RFDC</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="bbDCOffset">
+       <property name="toolTip">
+        <string>Hardware baseband DC removal</string>
+       </property>
+       <property name="text">
+        <string>BBDC</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="hwIQImbalance">
+       <property name="toolTip">
+        <string>Hardware IQ imbalance correction</string>
+       </property>
+       <property name="text">
+        <string>IQ</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <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>
    <item>
     <widget class="Line" name="line_lna">
      <property name="orientation">
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
index 2b4deabca..c3eb17a78 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
@@ -31,7 +31,7 @@ class DeviceAPI;
 
 const PluginDescriptor PlutoSDRInputPlugin::m_pluginDescriptor = {
 	QString("PlutoSDR Input"),
-	QString("4.5.4"),
+	QString("4.11.3"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,