diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 3ecdb336d..75de2ce60 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -6,6 +6,8 @@
 
 TEMPLATE = subdirs
 
+CONFIG += ordered
+
 SUBDIRS = serialdv
 SUBDIRS += httpserver
 SUBDIRS += logging
@@ -59,5 +61,4 @@ SUBDIRS += plugins/channeltx/modwfm
 SUBDIRS += plugins/channeltx/udpsink
 
 # Main app must be last
-CONFIG += ordered
 SUBDIRS += app
diff --git a/sdrbase/audio/audiodeviceinfo.cpp b/sdrbase/audio/audiodeviceinfo.cpp
index 477e80f20..0a37a17fb 100644
--- a/sdrbase/audio/audiodeviceinfo.cpp
+++ b/sdrbase/audio/audiodeviceinfo.cpp
@@ -1,67 +1,84 @@
-///////////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 2017 F4EXB                                                      //
-// written by Edouard Griffiths                                                  //
-//                                                                               //
-// This program is free software; you can redistribute it and/or modify          //
-// it under the terms of the GNU General Public License as published by          //
-// the Free Software Foundation as version 3 of the License, or                  //
-//                                                                               //
-// This program is distributed in the hope that it will be useful,               //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
-// GNU General Public License V3 for more details.                               //
-//                                                                               //
-// You should have received a copy of the GNU General Public License             //
-// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
-///////////////////////////////////////////////////////////////////////////////////
-
-#include "audio/audiodeviceinfo.h"
-#include "util/simpleserializer.h"
-
-AudioDeviceInfo::AudioDeviceInfo() :
-    m_inputDeviceIndex(-1),  // default device
-    m_outputDeviceIndex(-1), // default device
-    m_inputVolume(1.0f)
-{
-    m_inputDevicesInfo = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
-    m_outputDevicesInfo = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
-}
-
-void AudioDeviceInfo::resetToDefaults()
-{
-    m_inputDeviceIndex = -1;
-    m_outputDeviceIndex = -1;
-    m_inputVolume = 1.0f;
-}
-
-QByteArray AudioDeviceInfo::serialize() const
-{
-    SimpleSerializer s(1);
-    s.writeS32(1, m_inputDeviceIndex);
-    s.writeS32(2, m_outputDeviceIndex);
-    s.writeFloat(3, m_inputVolume);
-    return s.final();
-}
-
-bool AudioDeviceInfo::deserialize(const QByteArray& data)
-{
-    SimpleDeserializer d(data);
-
-    if(!d.isValid()) {
-        resetToDefaults();
-        return false;
-    }
-
-    if(d.getVersion() == 1)
-    {
-        d.readS32(1, &m_inputDeviceIndex, -1);
-        d.readS32(2, &m_outputDeviceIndex, -1);
-        d.readFloat(3, &m_inputVolume, 1.0f);
-        return true;
-    }
-    else
-    {
-        resetToDefaults();
-        return false;
-    }
-}
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2017 F4EXB                                                      //
+// written by Edouard Griffiths                                                  //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include "audio/audiodeviceinfo.h"
+#include "util/simpleserializer.h"
+
+AudioDeviceInfo::AudioDeviceInfo() :
+    m_inputDeviceIndex(-1),  // default device
+    m_outputDeviceIndex(-1), // default device
+    m_inputVolume(1.0f)
+{
+    m_inputDevicesInfo = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
+    m_outputDevicesInfo = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
+}
+
+void AudioDeviceInfo::resetToDefaults()
+{
+    m_inputDeviceIndex = -1;
+    m_outputDeviceIndex = -1;
+    m_inputVolume = 1.0f;
+}
+
+QByteArray AudioDeviceInfo::serialize() const
+{
+    SimpleSerializer s(1);
+    s.writeS32(1, m_inputDeviceIndex);
+    s.writeS32(2, m_outputDeviceIndex);
+    s.writeFloat(3, m_inputVolume);
+    return s.final();
+}
+
+bool AudioDeviceInfo::deserialize(const QByteArray& data)
+{
+    SimpleDeserializer d(data);
+
+    if(!d.isValid()) {
+        resetToDefaults();
+        return false;
+    }
+
+    if(d.getVersion() == 1)
+    {
+        d.readS32(1, &m_inputDeviceIndex, -1);
+        d.readS32(2, &m_outputDeviceIndex, -1);
+        d.readFloat(3, &m_inputVolume, 1.0f);
+        return true;
+    }
+    else
+    {
+        resetToDefaults();
+        return false;
+    }
+}
+
+void AudioDeviceInfo::setInputDeviceIndex(int inputDeviceIndex)
+{
+    int nbDevices = m_inputDevicesInfo.size();
+    m_inputDeviceIndex = inputDeviceIndex < -1 ? -1 : inputDeviceIndex >= nbDevices ? nbDevices-1 : inputDeviceIndex;
+}
+
+void AudioDeviceInfo::setOutputDeviceIndex(int outputDeviceIndex)
+{
+    int nbDevices = m_outputDevicesInfo.size();
+    m_outputDeviceIndex = outputDeviceIndex < -1 ? -1 : outputDeviceIndex >= nbDevices ? nbDevices-1 : outputDeviceIndex;
+}
+
+void AudioDeviceInfo::setInputVolume(float inputVolume)
+{
+    m_inputVolume = inputVolume < 0.0 ? 0.0 : inputVolume > 1.0 ? 1.0 : inputVolume;
+}
diff --git a/sdrbase/audio/audiodeviceinfo.h b/sdrbase/audio/audiodeviceinfo.h
index b0d713ade..38bce5596 100644
--- a/sdrbase/audio/audiodeviceinfo.h
+++ b/sdrbase/audio/audiodeviceinfo.h
@@ -1,52 +1,55 @@
-///////////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 2017 F4EXB                                                      //
-// written by Edouard Griffiths                                                  //
-//                                                                               //
-// This program is free software; you can redistribute it and/or modify          //
-// it under the terms of the GNU General Public License as published by          //
-// the Free Software Foundation as version 3 of the License, or                  //
-//                                                                               //
-// This program is distributed in the hope that it will be useful,               //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
-// GNU General Public License V3 for more details.                               //
-//                                                                               //
-// You should have received a copy of the GNU General Public License             //
-// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
-///////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDE_AUDIODEVICEINFO_H
-#define INCLUDE_AUDIODEVICEINFO_H
-
-#include <QStringList>
-#include <QList>
-#include <QAudioDeviceInfo>
-
-#include "util/export.h"
-
-class SDRANGEL_API AudioDeviceInfo {
-public:
-	AudioDeviceInfo();
-
-	const QList<QAudioDeviceInfo>& getInputDevices() const { return m_inputDevicesInfo; }
-    const QList<QAudioDeviceInfo>& getOutputDevices() const { return m_outputDevicesInfo; }
-    int getInputDeviceIndex() const { return m_inputDeviceIndex; }
-    int getOutputDeviceIndex() const { return m_outputDeviceIndex; }
-    float getInputVolume() const { return m_inputVolume; }
-
-private:
-	QList<QAudioDeviceInfo> m_inputDevicesInfo;
-    QList<QAudioDeviceInfo> m_outputDevicesInfo;
-    int m_inputDeviceIndex;
-    int m_outputDeviceIndex;
-    float m_inputVolume;
-
-    void resetToDefaults();
-    QByteArray serialize() const;
-    bool deserialize(const QByteArray& data);
-
-	friend class AudioDialog;
-	friend class MainSettings;
-};
-
-#endif // INCLUDE_AUDIODEVICEINFO_H
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2017 F4EXB                                                      //
+// written by Edouard Griffiths                                                  //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDE_AUDIODEVICEINFO_H
+#define INCLUDE_AUDIODEVICEINFO_H
+
+#include <QStringList>
+#include <QList>
+#include <QAudioDeviceInfo>
+
+#include "util/export.h"
+
+class SDRANGEL_API AudioDeviceInfo {
+public:
+	AudioDeviceInfo();
+
+	const QList<QAudioDeviceInfo>& getInputDevices() const { return m_inputDevicesInfo; }
+    const QList<QAudioDeviceInfo>& getOutputDevices() const { return m_outputDevicesInfo; }
+    int getInputDeviceIndex() const { return m_inputDeviceIndex; }
+    int getOutputDeviceIndex() const { return m_outputDeviceIndex; }
+    float getInputVolume() const { return m_inputVolume; }
+    void setInputDeviceIndex(int inputDeviceIndex);
+    void setOutputDeviceIndex(int inputDeviceIndex);
+    void setInputVolume(float inputVolume);
+
+private:
+	QList<QAudioDeviceInfo> m_inputDevicesInfo;
+    QList<QAudioDeviceInfo> m_outputDevicesInfo;
+    int m_inputDeviceIndex;
+    int m_outputDeviceIndex;
+    float m_inputVolume;
+
+    void resetToDefaults();
+    QByteArray serialize() const;
+    bool deserialize(const QByteArray& data);
+
+	friend class AudioDialog;
+	friend class MainSettings;
+};
+
+#endif // INCLUDE_AUDIODEVICEINFO_H
diff --git a/sdrbase/resources/index.html b/sdrbase/resources/index.html
index e9c527b75..2acf9644e 100644
--- a/sdrbase/resources/index.html
+++ b/sdrbase/resources/index.html
@@ -695,451 +695,471 @@ margin-bottom: 20px;
   <script>
     // Script section to load models into a JS Var
     var defs = {}
-            defs.AudioDevices = {
-  "required" : [ "inputDeviceSelectedIndex", "nbInputDevices", "nbOutputDevices", "outputDeviceSelectedIndex" ],
-  "properties" : {
-    "nbInputDevices" : {
-      "type" : "integer",
-      "description" : "Number of input audio devices"
-    },
-    "inputDeviceSelectedIndex" : {
-      "type" : "integer",
-      "description" : "Index of selected input audio devices (-1 if default)"
-    },
-    "inputDevices" : {
-      "type" : "array",
-      "description" : "Names of input devices",
-      "items" : {
-        "type" : "string"
-      }
-    },
-    "nbOutputDevices" : {
-      "type" : "integer",
-      "description" : "Number of output audio devices"
-    },
-    "outputDeviceSelectedIndex" : {
-      "type" : "integer",
-      "description" : "Index of selected output audio devices (-1 if default)"
-    },
-    "outputDevices" : {
-      "type" : "array",
-      "description" : "Names of output devices",
-      "items" : {
-        "type" : "string"
-      }
-    }
-  },
-  "description" : "List of audio devices available in the system"
+            defs.AudioDevice = {
+  "properties" : {
+    "name" : {
+      "type" : "string",
+      "description" : "Displayable name of the device"
+    }
+  },
+  "description" : "Audio device"
 };
-            defs.AudioDevicesSelect = {
-  "properties" : {
-    "input" : {
-      "type" : "integer",
-      "description" : "Index of the audio input device (-1 for default)"
-    },
-    "output" : {
-      "type" : "integer",
-      "description" : "Index of the audio output device (-1 for default)"
-    }
-  },
-  "description" : "Audio devices selected"
+            defs.AudioDevices = {
+  "required" : [ "inputDeviceSelectedIndex", "inputVolume", "nbInputDevices", "nbOutputDevices", "outputDeviceSelectedIndex" ],
+  "properties" : {
+    "inputVolume" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Audio input volume [0.0..1.0]"
+    },
+    "nbInputDevices" : {
+      "type" : "integer",
+      "description" : "Number of input audio devices"
+    },
+    "inputDeviceSelectedIndex" : {
+      "type" : "integer",
+      "description" : "Index of selected input audio devices (-1 if default)"
+    },
+    "inputDevices" : {
+      "type" : "array",
+      "description" : "List of input devices",
+      "items" : {
+        "$ref" : "#/definitions/AudioDevice"
+      }
+    },
+    "nbOutputDevices" : {
+      "type" : "integer",
+      "description" : "Number of output audio devices"
+    },
+    "outputDeviceSelectedIndex" : {
+      "type" : "integer",
+      "description" : "Index of selected output audio devices (-1 if default)"
+    },
+    "outputDevices" : {
+      "type" : "array",
+      "description" : "List of output devices",
+      "items" : {
+        "$ref" : "#/definitions/AudioDevice"
+      }
+    }
+  },
+  "description" : "List of audio devices available in the system"
 };
-            defs.Channel = {
-  "required" : [ "deltaFrequency", "id", "index", "title", "uid" ],
-  "properties" : {
-    "index" : {
-      "type" : "integer",
-      "description" : "Index in the list of channels"
-    },
-    "id" : {
-      "type" : "string",
-      "description" : "Key to identify the type of channel"
-    },
-    "uid" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Channel instance unique id"
-    },
-    "title" : {
-      "type" : "string",
-      "description" : "Freeform title of the channel"
-    },
-    "deltaFrequency" : {
-      "type" : "integer",
-      "description" : "Channel shift frequency in Hz from the center of baseband"
-    }
-  },
-  "description" : "Channel summarized information"
+            defs.AudioDevicesSelect = {
+  "required" : [ "inputIndex", "inputVolume", "outputIndex" ],
+  "properties" : {
+    "inputVolume" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Audio input volume [0.0..1.0]"
+    },
+    "inputIndex" : {
+      "type" : "integer",
+      "description" : "Index of the audio input device (-1 for default)"
+    },
+    "outputIndex" : {
+      "type" : "integer",
+      "description" : "Index of the audio output device (-1 for default)"
+    }
+  },
+  "description" : "Audio devices selected"
 };
-            defs.ChannelListItem = {
-  "required" : [ "id", "name" ],
-  "properties" : {
-    "name" : {
-      "type" : "string",
-      "description" : "Displayable name of the channel plugin"
-    },
-    "idURI" : {
-      "type" : "string",
-      "description" : "Key to identify the channel plugin type in URI form"
-    },
-    "id" : {
-      "type" : "string",
-      "description" : "Key to identify the channel plugin type as short object name"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Not zero (true) if this is a Tx channel"
-    },
-    "version" : {
-      "type" : "string",
-      "description" : "Channel plugin version number"
-    },
-    "index" : {
-      "type" : "integer",
-      "description" : "Index of the channel in the list of registered channels"
-    }
-  },
-  "description" : "Summarized information about channel plugin"
+            defs.Channel = {
+  "required" : [ "deltaFrequency", "id", "index", "title", "uid" ],
+  "properties" : {
+    "index" : {
+      "type" : "integer",
+      "description" : "Index in the list of channels"
+    },
+    "id" : {
+      "type" : "string",
+      "description" : "Key to identify the type of channel"
+    },
+    "uid" : {
+      "type" : "integer",
+      "format" : "int64",
+      "description" : "Channel instance unique id"
+    },
+    "title" : {
+      "type" : "string",
+      "description" : "Freeform title of the channel"
+    },
+    "deltaFrequency" : {
+      "type" : "integer",
+      "description" : "Channel shift frequency in Hz from the center of baseband"
+    }
+  },
+  "description" : "Channel summarized information"
 };
-            defs.DVSeralDevices = {
-  "required" : [ "nbDevices" ],
-  "properties" : {
-    "nbDevices" : {
-      "type" : "integer",
-      "description" : "Number of DV serial devices"
-    },
-    "dvSerialDevices" : {
-      "type" : "array",
-      "description" : "Device names of DV serial devices",
-      "items" : {
-        "type" : "string"
-      }
-    }
-  },
-  "description" : "List of DV serial devices available in the system"
+            defs.ChannelListItem = {
+  "required" : [ "id", "name" ],
+  "properties" : {
+    "name" : {
+      "type" : "string",
+      "description" : "Displayable name of the channel plugin"
+    },
+    "idURI" : {
+      "type" : "string",
+      "description" : "Key to identify the channel plugin type in URI form"
+    },
+    "id" : {
+      "type" : "string",
+      "description" : "Key to identify the channel plugin type as short object name"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Not zero (true) if this is a Tx channel"
+    },
+    "version" : {
+      "type" : "string",
+      "description" : "Channel plugin version number"
+    },
+    "index" : {
+      "type" : "integer",
+      "description" : "Index of the channel in the list of registered channels"
+    }
+  },
+  "description" : "Summarized information about channel plugin"
 };
-            defs.DeviceListItem = {
-  "required" : [ "hwType" ],
-  "properties" : {
-    "displayedName" : {
-      "type" : "string",
-      "description" : "Displayable name that uniquely identifies this device instance"
-    },
-    "hwType" : {
-      "type" : "string",
-      "description" : "Key to identify the type of hardware device"
-    },
-    "serial" : {
-      "type" : "string",
-      "description" : "Serial number of the hardware device"
-    },
-    "sequence" : {
-      "type" : "integer",
-      "description" : "Sequence in the enumeration of same device types"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Set to not zero (true) if this is a Tx device"
-    },
-    "nbStreams" : {
-      "type" : "integer",
-      "description" : "Number of channels or streams in the device"
-    },
-    "streamIndex" : {
-      "type" : "integer",
-      "description" : "Index of the channel in the device"
-    },
-    "deviceSetIndex" : {
-      "type" : "integer",
-      "description" : "Index of the device set that claimed this device (-1 if not claimed)"
-    },
-    "index" : {
-      "type" : "integer",
-      "description" : "Index of the device in the list of registered devices"
-    }
-  },
-  "description" : "Summarized information about attached hardware device"
+            defs.DVSeralDevices = {
+  "required" : [ "nbDevices" ],
+  "properties" : {
+    "nbDevices" : {
+      "type" : "integer",
+      "description" : "Number of DV serial devices"
+    },
+    "dvSerialDevices" : {
+      "type" : "array",
+      "description" : "Device names of DV serial devices",
+      "items" : {
+        "type" : "string"
+      }
+    }
+  },
+  "description" : "List of DV serial devices available in the system"
 };
-            defs.DeviceSet = {
-  "required" : [ "channelcount", "samplingDevice" ],
-  "properties" : {
-    "samplingDevice" : {
-      "$ref" : "#/definitions/SamplingDevice"
-    },
-    "channelcount" : {
-      "type" : "integer",
-      "description" : "Number of channels in the set"
-    },
-    "channels" : {
-      "type" : "array",
-      "description" : "Channels list",
-      "items" : {
-        "$ref" : "#/definitions/Channel"
-      }
-    }
-  },
-  "description" : "Sampling device and its associated channels"
+            defs.DeviceListItem = {
+  "required" : [ "hwType" ],
+  "properties" : {
+    "displayedName" : {
+      "type" : "string",
+      "description" : "Displayable name that uniquely identifies this device instance"
+    },
+    "hwType" : {
+      "type" : "string",
+      "description" : "Key to identify the type of hardware device"
+    },
+    "serial" : {
+      "type" : "string",
+      "description" : "Serial number of the hardware device"
+    },
+    "sequence" : {
+      "type" : "integer",
+      "description" : "Sequence in the enumeration of same device types"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Set to not zero (true) if this is a Tx device"
+    },
+    "nbStreams" : {
+      "type" : "integer",
+      "description" : "Number of channels or streams in the device"
+    },
+    "streamIndex" : {
+      "type" : "integer",
+      "description" : "Index of the channel in the device"
+    },
+    "deviceSetIndex" : {
+      "type" : "integer",
+      "description" : "Index of the device set that claimed this device (-1 if not claimed)"
+    },
+    "index" : {
+      "type" : "integer",
+      "description" : "Index of the device in the list of registered devices"
+    }
+  },
+  "description" : "Summarized information about attached hardware device"
 };
-            defs.DeviceSetList = {
-  "required" : [ "devicesetcount" ],
-  "properties" : {
-    "devicesetcount" : {
-      "type" : "integer",
-      "description" : "Number of device sets opened in this instance"
-    },
-    "deviceSets" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/DeviceSet"
-      }
-    }
-  },
-  "description" : "List of device sets opened in this instance"
+            defs.DeviceSet = {
+  "required" : [ "channelcount", "samplingDevice" ],
+  "properties" : {
+    "samplingDevice" : {
+      "$ref" : "#/definitions/SamplingDevice"
+    },
+    "channelcount" : {
+      "type" : "integer",
+      "description" : "Number of channels in the set"
+    },
+    "channels" : {
+      "type" : "array",
+      "description" : "Channels list",
+      "items" : {
+        "$ref" : "#/definitions/Channel"
+      }
+    }
+  },
+  "description" : "Sampling device and its associated channels"
 };
-            defs.ErrorResponse = {
-  "required" : [ "message" ],
-  "properties" : {
-    "message" : {
-      "type" : "string"
-    }
-  }
+            defs.DeviceSetList = {
+  "required" : [ "devicesetcount" ],
+  "properties" : {
+    "devicesetcount" : {
+      "type" : "integer",
+      "description" : "Number of device sets opened in this instance"
+    },
+    "deviceSets" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/DeviceSet"
+      }
+    }
+  },
+  "description" : "List of device sets opened in this instance"
 };
-            defs.InstanceChannelsResponse = {
-  "required" : [ "channelcount" ],
-  "properties" : {
-    "channelcount" : {
-      "type" : "integer",
-      "description" : "Number of plugins available"
-    },
-    "channels" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/ChannelListItem"
-      }
-    }
-  },
-  "description" : "Summarized information about channel plugins available in this SDRangel instance"
+            defs.ErrorResponse = {
+  "required" : [ "message" ],
+  "properties" : {
+    "message" : {
+      "type" : "string"
+    }
+  }
 };
-            defs.InstanceDevicesResponse = {
-  "required" : [ "devicecount" ],
-  "properties" : {
-    "devicecount" : {
-      "type" : "integer",
-      "description" : "Number of devices attached"
-    },
-    "devices" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/DeviceListItem"
-      }
-    }
-  },
-  "description" : "Summarized information about logical devices from hardware devices attached to this SDRangel instance"
+            defs.InstanceChannelsResponse = {
+  "required" : [ "channelcount" ],
+  "properties" : {
+    "channelcount" : {
+      "type" : "integer",
+      "description" : "Number of plugins available"
+    },
+    "channels" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/ChannelListItem"
+      }
+    }
+  },
+  "description" : "Summarized information about channel plugins available in this SDRangel instance"
 };
-            defs.InstanceSummaryResponse = {
-  "required" : [ "devicesetlist", "version" ],
-  "properties" : {
-    "version" : {
-      "type" : "string",
-      "description" : "Current software version"
-    },
-    "logging" : {
-      "$ref" : "#/definitions/LoggingInfo"
-    },
-    "devicesetlist" : {
-      "$ref" : "#/definitions/DeviceSetList"
-    },
-    "user" : {
-      "$ref" : "#/definitions/User"
-    }
-  },
-  "description" : "Summarized information about this SDRangel instance"
+            defs.InstanceDevicesResponse = {
+  "required" : [ "devicecount" ],
+  "properties" : {
+    "devicecount" : {
+      "type" : "integer",
+      "description" : "Number of devices attached"
+    },
+    "devices" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/DeviceListItem"
+      }
+    }
+  },
+  "description" : "Summarized information about logical devices from hardware devices attached to this SDRangel instance"
 };
-            defs.LocationInformation = {
-  "required" : [ "latitude", "longitude" ],
-  "properties" : {
-    "latitude" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Lautitude in decimal degrees positive to the north"
-    },
-    "longitude" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Longitude in decimal degrees positive to the east"
-    }
-  },
-  "description" : "Instance geolocation information"
+            defs.InstanceSummaryResponse = {
+  "required" : [ "devicesetlist", "version" ],
+  "properties" : {
+    "version" : {
+      "type" : "string",
+      "description" : "Current software version"
+    },
+    "logging" : {
+      "$ref" : "#/definitions/LoggingInfo"
+    },
+    "devicesetlist" : {
+      "$ref" : "#/definitions/DeviceSetList"
+    },
+    "user" : {
+      "$ref" : "#/definitions/User"
+    }
+  },
+  "description" : "Summarized information about this SDRangel instance"
 };
-            defs.LoggingInfo = {
-  "properties" : {
-    "consoleLevel" : {
-      "type" : "string",
-      "description" : "Minimum level of messages printed to console: debug, info, warning, error"
-    },
-    "fileLevel" : {
-      "type" : "string",
-      "description" : "Minimum level of messages written to file: debug, info, warning, error"
-    },
-    "dumpToFile" : {
-      "type" : "integer",
-      "description" : "not zero (true) if messages are written to file"
-    },
-    "fileName" : {
-      "type" : "string",
-      "description" : "Name of the log file"
-    }
-  },
-  "description" : "Logging parameters setting"
+            defs.LocationInformation = {
+  "required" : [ "latitude", "longitude" ],
+  "properties" : {
+    "latitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Lautitude in decimal degrees positive to the north"
+    },
+    "longitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Longitude in decimal degrees positive to the east"
+    }
+  },
+  "description" : "Instance geolocation information"
 };
-            defs.PresetGroup = {
-  "required" : [ "groupName", "nbPresets" ],
-  "properties" : {
-    "groupName" : {
-      "type" : "string",
-      "description" : "Name of the preset group"
-    },
-    "nbPresets" : {
-      "type" : "integer",
-      "description" : "Number of presets in the group"
-    },
-    "presets" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/PresetItem"
-      }
-    }
-  },
-  "description" : "Group of presets"
+            defs.LoggingInfo = {
+  "properties" : {
+    "consoleLevel" : {
+      "type" : "string",
+      "description" : "Minimum level of messages printed to console: debug, info, warning, error"
+    },
+    "fileLevel" : {
+      "type" : "string",
+      "description" : "Minimum level of messages written to file: debug, info, warning, error"
+    },
+    "dumpToFile" : {
+      "type" : "integer",
+      "description" : "not zero (true) if messages are written to file"
+    },
+    "fileName" : {
+      "type" : "string",
+      "description" : "Name of the log file"
+    }
+  },
+  "description" : "Logging parameters setting"
 };
-            defs.PresetIdentifier = {
-  "required" : [ "centerFrequency", "groupName", "name", "type" ],
-  "properties" : {
-    "groupName" : {
-      "type" : "string",
-      "description" : "Name of the preset group"
-    },
-    "centerFrequency" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Center freqeuency in MHz"
-    },
-    "type" : {
-      "type" : "string",
-      "description" : "Type of device set (R: Rx, T: Tx)"
-    },
-    "name" : {
-      "type" : "string",
-      "description" : "Descriptive name of the preset"
-    }
-  },
-  "description" : "Settings preset item"
+            defs.PresetGroup = {
+  "required" : [ "groupName", "nbPresets" ],
+  "properties" : {
+    "groupName" : {
+      "type" : "string",
+      "description" : "Name of the preset group"
+    },
+    "nbPresets" : {
+      "type" : "integer",
+      "description" : "Number of presets in the group"
+    },
+    "presets" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/PresetItem"
+      }
+    }
+  },
+  "description" : "Group of presets"
 };
-            defs.PresetItem = {
-  "required" : [ "centerFrequency", "name", "type" ],
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Center freqeuency in MHz"
-    },
-    "type" : {
-      "type" : "string",
-      "description" : "Type of device set (R: Rx, T: Tx)"
-    },
-    "name" : {
-      "type" : "string",
-      "description" : "Descriptive name of the preset"
-    }
-  },
-  "description" : "Settings preset item"
+            defs.PresetIdentifier = {
+  "required" : [ "centerFrequency", "groupName", "name", "type" ],
+  "properties" : {
+    "groupName" : {
+      "type" : "string",
+      "description" : "Name of the preset group"
+    },
+    "centerFrequency" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Center freqeuency in MHz"
+    },
+    "type" : {
+      "type" : "string",
+      "description" : "Type of device set (R: Rx, T: Tx)"
+    },
+    "name" : {
+      "type" : "string",
+      "description" : "Descriptive name of the preset"
+    }
+  },
+  "description" : "Settings preset item"
 };
-            defs.PresetTransfer = {
-  "required" : [ "deviceSetIndex", "preset" ],
-  "properties" : {
-    "deviceSetIndex" : {
-      "type" : "integer",
-      "description" : "Index of the device set"
-    },
-    "preset" : {
-      "$ref" : "#/definitions/PresetIdentifier"
-    }
-  },
-  "description" : "Preset transfer to or from a device set"
+            defs.PresetItem = {
+  "required" : [ "centerFrequency", "name", "type" ],
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Center freqeuency in MHz"
+    },
+    "type" : {
+      "type" : "string",
+      "description" : "Type of device set (R: Rx, T: Tx)"
+    },
+    "name" : {
+      "type" : "string",
+      "description" : "Descriptive name of the preset"
+    }
+  },
+  "description" : "Settings preset item"
 };
-            defs.Presets = {
-  "required" : [ "nbGroups" ],
-  "properties" : {
-    "nbGroups" : {
-      "type" : "integer",
-      "description" : "Number of preset groups"
-    },
-    "groups" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/PresetGroup"
-      }
-    }
-  },
-  "description" : "Settings presets"
+            defs.PresetTransfer = {
+  "required" : [ "deviceSetIndex", "preset" ],
+  "properties" : {
+    "deviceSetIndex" : {
+      "type" : "integer",
+      "description" : "Index of the device set"
+    },
+    "preset" : {
+      "$ref" : "#/definitions/PresetIdentifier"
+    }
+  },
+  "description" : "Preset transfer to or from a device set"
 };
-            defs.SamplingDevice = {
-  "required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
-  "properties" : {
-    "index" : {
-      "type" : "integer",
-      "description" : "Index in the list of device sets opened in this instance"
-    },
-    "hwType" : {
-      "type" : "string",
-      "description" : "Key to identify the type of hardware device"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Not zero (true) if this is a Tx device"
-    },
-    "nbStreams" : {
-      "type" : "integer",
-      "description" : "Number of channels or streams in the device"
-    },
-    "streamIndex" : {
-      "type" : "integer",
-      "description" : "Index of the channel in the device"
-    },
-    "sequence" : {
-      "type" : "integer",
-      "description" : "Sequence in the enumeration of same device types"
-    },
-    "serial" : {
-      "type" : "string",
-      "description" : "Serial number of the hardware device"
-    },
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Center frequency in Hz at which the device is tuned possibly taking NCO into account"
-    },
-    "bandwidth" : {
-      "type" : "integer",
-      "description" : "Bandwidth in Hz or complex S/s of baseband"
-    },
-    "state" : {
-      "type" : "string",
-      "description" : "State: notStarted, idle, ready, running, error"
-    }
-  },
-  "description" : "Information about a logical device available from an attached hardware device that can be used as a sampling device"
+            defs.Presets = {
+  "required" : [ "nbGroups" ],
+  "properties" : {
+    "nbGroups" : {
+      "type" : "integer",
+      "description" : "Number of preset groups"
+    },
+    "groups" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/PresetGroup"
+      }
+    }
+  },
+  "description" : "Settings presets"
 };
-            defs.User = {
-  "required" : [ "index", "name" ],
-  "properties" : {
-    "index" : {
-      "type" : "integer"
-    },
-    "name" : {
-      "type" : "string"
-    }
-  }
+            defs.SamplingDevice = {
+  "required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
+  "properties" : {
+    "index" : {
+      "type" : "integer",
+      "description" : "Index in the list of device sets opened in this instance"
+    },
+    "hwType" : {
+      "type" : "string",
+      "description" : "Key to identify the type of hardware device"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Not zero (true) if this is a Tx device"
+    },
+    "nbStreams" : {
+      "type" : "integer",
+      "description" : "Number of channels or streams in the device"
+    },
+    "streamIndex" : {
+      "type" : "integer",
+      "description" : "Index of the channel in the device"
+    },
+    "sequence" : {
+      "type" : "integer",
+      "description" : "Sequence in the enumeration of same device types"
+    },
+    "serial" : {
+      "type" : "string",
+      "description" : "Serial number of the hardware device"
+    },
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64",
+      "description" : "Center frequency in Hz at which the device is tuned possibly taking NCO into account"
+    },
+    "bandwidth" : {
+      "type" : "integer",
+      "description" : "Bandwidth in Hz or complex S/s of baseband"
+    },
+    "state" : {
+      "type" : "string",
+      "description" : "State: notStarted, idle, ready, running, error"
+    }
+  },
+  "description" : "Information about a logical device available from an attached hardware device that can be used as a sampling device"
+};
+            defs.User = {
+  "required" : [ "index", "name" ],
+  "properties" : {
+    "index" : {
+      "type" : "integer"
+    },
+    "name" : {
+      "type" : "string"
+    }
+  }
 };
   </script>
 
@@ -1450,11 +1470,11 @@ except ApiException as e:
                                   <div id='responses-instanceAudioGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/AudioDevices"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/AudioDevices"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1493,11 +1513,11 @@ except ApiException as e:
                                   <div id='responses-instanceAudioGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1754,14 +1774,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Select audio devices to use for this instance",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/AudioDevicesSelect"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Select audio devices to use for this instance",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/AudioDevicesSelect"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -1802,11 +1822,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceAudioPatch-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/AudioDevicesSelect"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/AudioDevicesSelect"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1845,11 +1865,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceAudioPatch-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2140,11 +2160,11 @@ except ApiException as e:
                                   <div id='responses-instanceChannels-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/InstanceChannelsResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/InstanceChannelsResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2183,11 +2203,11 @@ except ApiException as e:
                                   <div id='responses-instanceChannels-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2478,11 +2498,11 @@ except ApiException as e:
                                   <div id='responses-instanceDVSerialPatch-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return list of devices or empty list if unset",
-  "schema" : {
-    "$ref" : "#/definitions/DVSeralDevices"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return list of devices or empty list if unset",
+  "schema" : {
+    "$ref" : "#/definitions/DVSeralDevices"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2521,11 +2541,11 @@ except ApiException as e:
                                   <div id='responses-instanceDVSerialPatch-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2778,11 +2798,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsDelete-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return new list of device sets",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSetList"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return new list of device sets",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSetList"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2829,11 +2849,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsDelete-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3086,11 +3106,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return device set list",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSetList"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return device set list",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSetList"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3129,11 +3149,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3424,11 +3444,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsPost-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return new device set",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSet"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return new device set",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSet"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3467,11 +3487,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsPost-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3762,11 +3782,11 @@ except ApiException as e:
                                   <div id='responses-instanceDevices-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/InstanceDevicesResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/InstanceDevicesResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3805,11 +3825,11 @@ except ApiException as e:
                                   <div id='responses-instanceDevices-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4062,11 +4082,11 @@ except ApiException as e:
                                   <div id='responses-instanceLocationGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return location",
-  "schema" : {
-    "$ref" : "#/definitions/LocationInformation"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return location",
+  "schema" : {
+    "$ref" : "#/definitions/LocationInformation"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4105,11 +4125,11 @@ except ApiException as e:
                                   <div id='responses-instanceLocationGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4366,14 +4386,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Location of instance in latitude and longitude",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/LocationInformation"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Location of instance in latitude and longitude",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/LocationInformation"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -4414,11 +4434,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLocationPut-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return location",
-  "schema" : {
-    "$ref" : "#/definitions/LocationInformation"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return location",
+  "schema" : {
+    "$ref" : "#/definitions/LocationInformation"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4465,11 +4485,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLocationPut-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4722,11 +4742,11 @@ except ApiException as e:
                                   <div id='responses-instanceLoggingGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/LoggingInfo"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/LoggingInfo"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4765,11 +4785,11 @@ except ApiException as e:
                                   <div id='responses-instanceLoggingGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5026,14 +5046,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Logging information",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/LoggingInfo"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Logging information",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/LoggingInfo"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -5074,11 +5094,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLoggingPut-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Return new data on success",
-  "schema" : {
-    "$ref" : "#/definitions/LoggingInfo"
-  }
+                                        var schemaWrapper = {
+  "description" : "Return new data on success",
+  "schema" : {
+    "$ref" : "#/definitions/LoggingInfo"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5117,11 +5137,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLoggingPut-400-schema-400' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Invallid data",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invallid data",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5160,11 +5180,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLoggingPut-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5421,14 +5441,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "delete this preset",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "delete this preset",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -5469,11 +5489,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return deleted preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return deleted preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5528,11 +5548,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5785,11 +5805,11 @@ except ApiException as e:
                                   <div id='responses-instancePresetGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset list",
-  "schema" : {
-    "$ref" : "#/definitions/Presets"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset list",
+  "schema" : {
+    "$ref" : "#/definitions/Presets"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5828,11 +5848,11 @@ except ApiException as e:
                                   <div id='responses-instancePresetGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6089,14 +6109,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Load preset settings to the device set",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetTransfer"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Load preset settings to the device set",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetTransfer"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -6137,11 +6157,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6188,11 +6208,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-404-schema-404' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "No preset or device set found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "No preset or device set found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6231,11 +6251,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6492,14 +6512,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "save device set settings on a new preset",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetTransfer"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "save device set settings on a new preset",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetTransfer"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -6540,11 +6560,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6607,11 +6627,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6868,14 +6888,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "save device set settings to the preset",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetTransfer"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "save device set settings to the preset",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetTransfer"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -6916,11 +6936,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6967,11 +6987,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-404-schema-404' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "No preset or device set found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "No preset or device set found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7010,11 +7030,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7267,11 +7287,11 @@ except ApiException as e:
                                   <div id='responses-instanceSummary-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/InstanceSummaryResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/InstanceSummaryResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7310,11 +7330,11 @@ except ApiException as e:
                                   <div id='responses-instanceSummary-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7364,7 +7384,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2017-11-24T08:42:52.359+01:00
+              Generated 2017-11-24T17:11:18.943+01:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/webapi/webapiadapterinterface.h b/sdrbase/webapi/webapiadapterinterface.h
index c44ec8e9c..9c5c9f757 100644
--- a/sdrbase/webapi/webapiadapterinterface.h
+++ b/sdrbase/webapi/webapiadapterinterface.h
@@ -28,6 +28,7 @@ namespace Swagger
     class SWGInstanceChannelsResponse;
     class SWGLoggingInfo;
     class SWGAudioDevices;
+    class SWGAudioDevicesSelect;
     class SWGErrorResponse;
 }
 
@@ -92,6 +93,15 @@ public:
             Swagger::SWGErrorResponse& error __attribute__((unused)))
     { return 501; }
 
+    /**
+     * Handler of /sdrangel/audio (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
+     * returns the Http status code (default 501: not implemented)
+     */
+    virtual int instanceAudioPatch(
+            Swagger::SWGAudioDevicesSelect& response __attribute__((unused)),
+            Swagger::SWGErrorResponse& error __attribute__((unused)))
+    { return 501; }
+
     static QString instanceSummaryURL;
     static QString instanceDevicesURL;
     static QString instanceChannelsURL;
diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index 9d1f7f73a..d8a5896b8 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -54,165 +54,16 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http
     {
         QByteArray path=request.getPath();
 
-        if (path == WebAPIAdapterInterface::instanceSummaryURL)
-        {
-            if (request.getMethod() == "GET")
-            {
-                Swagger::SWGInstanceSummaryResponse normalResponse;
-                Swagger::SWGErrorResponse errorResponse;
-
-                int status = m_adapter->instanceSummary(normalResponse, errorResponse);
-                response.setStatus(status);
-
-                if (status == 200) {
-                    response.write(normalResponse.asJson().toUtf8());
-                } else {
-                    response.write(errorResponse.asJson().toUtf8());
-                }
-            }
-            else
-            {
-                response.setStatus(405,"Invalid HTTP method");
-                response.write("Invalid HTTP method");
-            }
-        }
-        else if (path == WebAPIAdapterInterface::instanceDevicesURL)
-        {
-            Swagger::SWGInstanceDevicesResponse normalResponse;
-            Swagger::SWGErrorResponse errorResponse;
-
-            if (request.getMethod() == "GET")
-            {
-                QByteArray txStr = request.getParameter("tx");
-                bool tx = (txStr == "1");
-
-                int status = m_adapter->instanceDevices(tx, normalResponse, errorResponse);
-                response.setStatus(status);
-
-                if (status == 200) {
-                    response.write(normalResponse.asJson().toUtf8());
-                } else {
-                    response.write(errorResponse.asJson().toUtf8());
-                }
-            }
-            else
-            {
-                response.setStatus(405,"Invalid HTTP method");
-                response.write("Invalid HTTP method");
-            }
-        }
-        else if (path == WebAPIAdapterInterface::instanceChannelsURL)
-        {
-            Swagger::SWGInstanceChannelsResponse normalResponse;
-            Swagger::SWGErrorResponse errorResponse;
-
-            if (request.getMethod() == "GET")
-            {
-                QByteArray txStr = request.getParameter("tx");
-                bool tx = (txStr == "1");
-
-                int status = m_adapter->instanceChannels(tx, normalResponse, errorResponse);
-                response.setStatus(status);
-
-                if (status == 200) {
-                    response.write(normalResponse.asJson().toUtf8());
-                } else {
-                    response.write(errorResponse.asJson().toUtf8());
-                }
-            }
-            else
-            {
-                response.setStatus(405,"Invalid HTTP method");
-                response.write("Invalid HTTP method");
-            }
-        }
-        else if (path == WebAPIAdapterInterface::instanceLoggingURL)
-        {
-            Swagger::SWGLoggingInfo normalResponse;
-            Swagger::SWGErrorResponse errorResponse;
-
-            if (request.getMethod() == "GET")
-            {
-                int status = m_adapter->instanceLoggingGet(normalResponse, errorResponse);
-                response.setStatus(status);
-
-                if (status == 200) {
-                    response.write(normalResponse.asJson().toUtf8());
-                } else {
-                    response.write(errorResponse.asJson().toUtf8());
-                }
-            }
-            else if (request.getMethod() == "PUT")
-            {
-                try
-                {
-                    QString jsonStr = request.getBody();
-                    QByteArray jsonBytes(jsonStr.toStdString().c_str());
-                    QJsonParseError error;
-                    QJsonDocument doc = QJsonDocument::fromJson(jsonBytes, &error);
-
-                    if (error.error == QJsonParseError::NoError)
-                    {
-                        normalResponse.fromJson(jsonStr);
-                        int status = m_adapter->instanceLoggingPut(normalResponse, errorResponse);
-                        response.setStatus(status);
-
-                        if (status == 200) {
-                            response.write(normalResponse.asJson().toUtf8());
-                        } else {
-                            response.write(errorResponse.asJson().toUtf8());
-                        }
-                    }
-                    else
-                    {
-                        QString errorMsg = QString("Input JSON error: ") + error.errorString();
-                        errorResponse.init();
-                        *errorResponse.getMessage() = errorMsg;
-                        response.setStatus(400, errorMsg.toUtf8());
-                        response.write(errorResponse.asJson().toUtf8());
-                    }
-                }
-                catch (const std::exception& ex)
-                {
-                    QString errorMsg = QString("Error parsing request: ") + ex.what();
-                    errorResponse.init();
-                    *errorResponse.getMessage() = errorMsg;
-                    response.setStatus(500, errorMsg.toUtf8());
-                    response.write(errorResponse.asJson().toUtf8());
-                }
-            }
-            else
-            {
-                response.setStatus(405,"Invalid HTTP method");
-                response.write("Invalid HTTP method");
-            }
-        }
-        else if (path == WebAPIAdapterInterface::instanceAudioURL)
-        {
-            Swagger::SWGErrorResponse errorResponse;
-
-            if (request.getMethod() == "GET")
-            {
-                Swagger::SWGAudioDevices normalResponse;
-
-                int status = m_adapter->instanceAudioGet(normalResponse, errorResponse);
-                response.setStatus(status);
-
-                if (status == 200) {
-                    response.write(normalResponse.asJson().toUtf8());
-                } else {
-                    response.write(errorResponse.asJson().toUtf8());
-                }
-            }
-            else if (request.getMethod() == "PATCH")
-            {
-                Swagger::SWGAudioDevicesSelect normalResponse;
-            }
-            else
-            {
-                response.setStatus(405,"Invalid HTTP method");
-                response.write("Invalid HTTP method");
-            }
+        if (path == WebAPIAdapterInterface::instanceSummaryURL) {
+            instanceSummaryService(request, response);
+        } else if (path == WebAPIAdapterInterface::instanceDevicesURL) {
+            instanceDevicesService(request, response);
+        } else if (path == WebAPIAdapterInterface::instanceChannelsURL) {
+            instanceChannelsService(request, response);
+        } else if (path == WebAPIAdapterInterface::instanceLoggingURL) {
+            instanceLoggingService(request, response);
+        } else if (path == WebAPIAdapterInterface::instanceAudioURL) {
+            instanceAudioService(request, response);
         }
         else
         {
@@ -223,7 +74,197 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http
 
             QByteArray path = "/index.html";
             m_staticFileController->service(path, response);
-            //response.setStatus(404,"Not found");
         }
     }
 }
+
+void WebAPIRequestMapper::instanceSummaryService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
+{
+    if (request.getMethod() == "GET")
+    {
+        Swagger::SWGInstanceSummaryResponse normalResponse;
+        Swagger::SWGErrorResponse errorResponse;
+
+        int status = m_adapter->instanceSummary(normalResponse, errorResponse);
+        response.setStatus(status);
+
+        if (status == 200) {
+            response.write(normalResponse.asJson().toUtf8());
+        } else {
+            response.write(errorResponse.asJson().toUtf8());
+        }
+    }
+    else
+    {
+        response.setStatus(405,"Invalid HTTP method");
+        response.write("Invalid HTTP method");
+    }
+}
+
+void WebAPIRequestMapper::instanceDevicesService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
+{
+    Swagger::SWGInstanceDevicesResponse normalResponse;
+    Swagger::SWGErrorResponse errorResponse;
+
+    if (request.getMethod() == "GET")
+    {
+        QByteArray txStr = request.getParameter("tx");
+        bool tx = (txStr == "1");
+
+        int status = m_adapter->instanceDevices(tx, normalResponse, errorResponse);
+        response.setStatus(status);
+
+        if (status == 200) {
+            response.write(normalResponse.asJson().toUtf8());
+        } else {
+            response.write(errorResponse.asJson().toUtf8());
+        }
+    }
+    else
+    {
+        response.setStatus(405,"Invalid HTTP method");
+        response.write("Invalid HTTP method");
+    }
+}
+
+void WebAPIRequestMapper::instanceChannelsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
+{
+    Swagger::SWGInstanceChannelsResponse normalResponse;
+    Swagger::SWGErrorResponse errorResponse;
+
+    if (request.getMethod() == "GET")
+    {
+        QByteArray txStr = request.getParameter("tx");
+        bool tx = (txStr == "1");
+
+        int status = m_adapter->instanceChannels(tx, normalResponse, errorResponse);
+        response.setStatus(status);
+
+        if (status == 200) {
+            response.write(normalResponse.asJson().toUtf8());
+        } else {
+            response.write(errorResponse.asJson().toUtf8());
+        }
+    }
+    else
+    {
+        response.setStatus(405,"Invalid HTTP method");
+        response.write("Invalid HTTP method");
+    }
+}
+
+void WebAPIRequestMapper::instanceLoggingService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
+{
+    Swagger::SWGLoggingInfo normalResponse;
+    Swagger::SWGErrorResponse errorResponse;
+
+    if (request.getMethod() == "GET")
+    {
+        int status = m_adapter->instanceLoggingGet(normalResponse, errorResponse);
+        response.setStatus(status);
+
+        if (status == 200) {
+            response.write(normalResponse.asJson().toUtf8());
+        } else {
+            response.write(errorResponse.asJson().toUtf8());
+        }
+    }
+    else if (request.getMethod() == "PUT")
+    {
+        QString jsonStr = request.getBody();
+
+        if (parseJsonBody(jsonStr, response))
+        {
+            normalResponse.fromJson(jsonStr);
+            int status = m_adapter->instanceLoggingPut(normalResponse, errorResponse);
+            response.setStatus(status);
+
+            if (status == 200) {
+                response.write(normalResponse.asJson().toUtf8());
+            } else {
+                response.write(errorResponse.asJson().toUtf8());
+            }
+        }
+    }
+    else
+    {
+        response.setStatus(405,"Invalid HTTP method");
+        response.write("Invalid HTTP method");
+    }
+}
+
+void WebAPIRequestMapper::instanceAudioService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
+{
+    Swagger::SWGErrorResponse errorResponse;
+
+    if (request.getMethod() == "GET")
+    {
+        Swagger::SWGAudioDevices normalResponse;
+
+        int status = m_adapter->instanceAudioGet(normalResponse, errorResponse);
+        response.setStatus(status);
+
+        if (status == 200) {
+            response.write(normalResponse.asJson().toUtf8());
+        } else {
+            response.write(errorResponse.asJson().toUtf8());
+        }
+    }
+    else if (request.getMethod() == "PATCH")
+    {
+        Swagger::SWGAudioDevicesSelect normalResponse;
+        QString jsonStr = request.getBody();
+
+        if (parseJsonBody(jsonStr, response))
+        {
+            normalResponse.fromJson(jsonStr);
+            int status = m_adapter->instanceAudioPatch(normalResponse, errorResponse);
+            response.setStatus(status);
+
+            if (status == 200) {
+                response.write(normalResponse.asJson().toUtf8());
+            } else {
+                response.write(errorResponse.asJson().toUtf8());
+            }
+        }
+    }
+    else
+    {
+        response.setStatus(405,"Invalid HTTP method");
+        response.write("Invalid HTTP method");
+    }
+}
+
+
+bool WebAPIRequestMapper::parseJsonBody(QString& jsonStr, qtwebapp::HttpResponse& response)
+{
+    Swagger::SWGErrorResponse errorResponse;
+
+    try
+    {
+        QByteArray jsonBytes(jsonStr.toStdString().c_str());
+        QJsonParseError error;
+        QJsonDocument doc = QJsonDocument::fromJson(jsonBytes, &error);
+
+        if (error.error != QJsonParseError::NoError)
+        {
+            QString errorMsg = QString("Input JSON error: ") + error.errorString();
+            errorResponse.init();
+            *errorResponse.getMessage() = errorMsg;
+            response.setStatus(400, errorMsg.toUtf8());
+            response.write(errorResponse.asJson().toUtf8());
+        }
+
+        return (error.error == QJsonParseError::NoError);
+    }
+    catch (const std::exception& ex)
+    {
+        QString errorMsg = QString("Error parsing request: ") + ex.what();
+        errorResponse.init();
+        *errorResponse.getMessage() = errorMsg;
+        response.setStatus(500, errorMsg.toUtf8());
+        response.write(errorResponse.asJson().toUtf8());
+
+        return false;
+    }
+}
diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h
index 395314853..2e052036c 100644
--- a/sdrbase/webapi/webapirequestmapper.h
+++ b/sdrbase/webapi/webapirequestmapper.h
@@ -19,6 +19,8 @@
 #ifndef SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_
 #define SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_
 
+#include <QJsonParseError>
+
 #include "httprequesthandler.h"
 #include "httprequest.h"
 #include "httpresponse.h"
@@ -36,6 +38,14 @@ public:
 private:
     WebAPIAdapterInterface *m_adapter;
     qtwebapp::StaticFileController *m_staticFileController;
+
+    void instanceSummaryService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
+    void instanceDevicesService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
+    void instanceChannelsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
+    void instanceLoggingService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
+    void instanceAudioService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
+
+    bool parseJsonBody(QString& jsonStr, qtwebapp::HttpResponse& response);
 };
 
 #endif /* SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_ */
diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp
index 976d2e1fe..c0fa38405 100644
--- a/sdrgui/webapi/webapiadaptergui.cpp
+++ b/sdrgui/webapi/webapiadaptergui.cpp
@@ -27,6 +27,7 @@
 #include "device/deviceenumerator.h"
 #include "dsp/devicesamplesource.h"
 #include "dsp/devicesamplesink.h"
+#include "dsp/dspengine.h"
 #include "plugin/pluginapi.h"
 #include "plugin/pluginmanager.h"
 #include "channel/channelsinkapi.h"
@@ -37,6 +38,7 @@
 #include "SWGInstanceChannelsResponse.h"
 #include "SWGDeviceListItem.h"
 #include "SWGAudioDevices.h"
+#include "SWGAudioDevicesSelect.h"
 #include "SWGErrorResponse.h"
 
 #include "webapiadaptergui.h"
@@ -264,24 +266,58 @@ int WebAPIAdapterGUI::instanceAudioGet(
     response.setInputDeviceSelectedIndex(m_mainWindow.m_audioDeviceInfo.getInputDeviceIndex());
     response.setNbOutputDevices(nbOutputDevices);
     response.setOutputDeviceSelectedIndex(m_mainWindow.m_audioDeviceInfo.getOutputDeviceIndex());
-    QList<QString*> *inputDeviceNames = response.getInputDevices();
-    QList<QString*> *outputDeviceNames = response.getOutputDevices();
+    response.setInputVolume(m_mainWindow.m_audioDeviceInfo.getInputVolume());
+    QList<Swagger::SWGAudioDevice*> *inputDevices = response.getInputDevices();
+    QList<Swagger::SWGAudioDevice*> *outputDevices = response.getOutputDevices();
 
     for (int i = 0; i < nbInputDevices; i++)
     {
-        inputDeviceNames->append(new QString());
-        *inputDeviceNames->back() = audioInputDevices[i].deviceName();
+        inputDevices->append(new Swagger::SWGAudioDevice);
+        *inputDevices->back()->getName() = audioInputDevices.at(i).deviceName();
     }
 
     for (int i = 0; i < nbOutputDevices; i++)
     {
-        outputDeviceNames->append(new QString());
-        *outputDeviceNames->back() = audioOutputDevices[i].deviceName();
+        outputDevices->append(new Swagger::SWGAudioDevice);
+        *outputDevices->back()->getName() = audioOutputDevices.at(i).deviceName();
     }
 
     return 200;
 }
 
+int WebAPIAdapterGUI::instanceAudioPatch(
+            Swagger::SWGAudioDevicesSelect& response,
+            Swagger::SWGErrorResponse& error)
+{
+    // response input is the query actually
+    float inputVolume = response.getInputVolume();
+    int inputIndex = response.getInputIndex();
+    int outputIndex = response.getOutputIndex();
+
+    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainWindow.m_audioDeviceInfo.getInputDevices();
+    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainWindow.m_audioDeviceInfo.getOutputDevices();
+    int nbInputDevices = audioInputDevices.size();
+    int nbOutputDevices = audioOutputDevices.size();
+
+    inputVolume = inputVolume < 0.0 ? 0.0 : inputVolume > 1.0 ? 1.0 : inputVolume;
+    inputIndex = inputIndex < -1 ? -1 : inputIndex > nbInputDevices ? nbInputDevices-1 : inputIndex;
+    outputIndex = outputIndex < -1 ? -1 : outputIndex > nbOutputDevices ? nbOutputDevices-1 : outputIndex;
+
+    m_mainWindow.m_audioDeviceInfo.setInputVolume(inputVolume);
+    m_mainWindow.m_audioDeviceInfo.setInputDeviceIndex(inputIndex);
+    m_mainWindow.m_audioDeviceInfo.setOutputDeviceIndex(outputIndex);
+
+    m_mainWindow.m_dspEngine->setAudioInputVolume(inputVolume);
+    m_mainWindow.m_dspEngine->setAudioInputDeviceIndex(inputIndex);
+    m_mainWindow.m_dspEngine->setAudioOutputDeviceIndex(outputIndex);
+
+    response.setInputVolume(m_mainWindow.m_audioDeviceInfo.getInputVolume());
+    response.setInputIndex(m_mainWindow.m_audioDeviceInfo.getInputDeviceIndex());
+    response.setOutputIndex(m_mainWindow.m_audioDeviceInfo.getOutputDeviceIndex());
+
+    return 200;
+}
+
 QtMsgType WebAPIAdapterGUI::getMsgTypeFromString(const QString& msgTypeString)
 {
     if (msgTypeString == "debug") {
diff --git a/sdrgui/webapi/webapiadaptergui.h b/sdrgui/webapi/webapiadaptergui.h
index 42d3faf3c..d5d051e31 100644
--- a/sdrgui/webapi/webapiadaptergui.h
+++ b/sdrgui/webapi/webapiadaptergui.h
@@ -57,6 +57,10 @@ public:
             Swagger::SWGAudioDevices& response,
             Swagger::SWGErrorResponse& error);
 
+    virtual int instanceAudioPatch(
+            Swagger::SWGAudioDevicesSelect& response,
+            Swagger::SWGErrorResponse& error);
+
 private:
     MainWindow& m_mainWindow;
 
diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml
index 02a1c5ca3..ddef00476 100644
--- a/swagger/sdrangel/api/swagger/swagger.yaml
+++ b/swagger/sdrangel/api/swagger/swagger.yaml
@@ -633,11 +633,16 @@ definitions:
   AudioDevices:
     description: "List of audio devices available in the system"
     required:
+      - inputVolume
       - nbInputDevices
       - inputDeviceSelectedIndex
       - nbOutputDevices
       - outputDeviceSelectedIndex
     properties:
+      inputVolume:
+        description: "Audio input volume [0.0..1.0]"
+        type: number
+        format: float
       nbInputDevices:
         description: "Number of input audio devices"
         type: integer
@@ -645,10 +650,10 @@ definitions:
         description: "Index of selected input audio devices (-1 if default)"
         type: integer
       inputDevices:
-        description: "Names of input devices"
+        description: "List of input devices"
         type: array
         items:
-          type: string
+          $ref: "#/definitions/AudioDevice"        
       nbOutputDevices:
         description: "Number of output audio devices"
         type: integer
@@ -656,17 +661,31 @@ definitions:
         description: "Index of selected output audio devices (-1 if default)"
         type: integer
       outputDevices:
-        description: "Names of output devices"
+        description: "List of output devices"
         type: array
         items:
-          type: string
+          $ref: "#/definitions/AudioDevice"        
+  AudioDevice:
+    description: "Audio device"
+    properties:
+      name: 
+        description: "Displayable name of the device"
+        type: string
   AudioDevicesSelect:
     description: "Audio devices selected"
+    required:
+      - inputVolume
+      - inputIndex
+      - outputIndex
     properties:
-      input:
+      inputVolume:
+        description: "Audio input volume [0.0..1.0]"
+        type: number
+        format: float
+      inputIndex:
         description: "Index of the audio input device (-1 for default)"
         type: integer
-      output:
+      outputIndex:
         description: "Index of the audio output device (-1 for default)"
         type: integer
   LocationInformation:
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index e9c527b75..2acf9644e 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -695,451 +695,471 @@ margin-bottom: 20px;
   <script>
     // Script section to load models into a JS Var
     var defs = {}
-            defs.AudioDevices = {
-  "required" : [ "inputDeviceSelectedIndex", "nbInputDevices", "nbOutputDevices", "outputDeviceSelectedIndex" ],
-  "properties" : {
-    "nbInputDevices" : {
-      "type" : "integer",
-      "description" : "Number of input audio devices"
-    },
-    "inputDeviceSelectedIndex" : {
-      "type" : "integer",
-      "description" : "Index of selected input audio devices (-1 if default)"
-    },
-    "inputDevices" : {
-      "type" : "array",
-      "description" : "Names of input devices",
-      "items" : {
-        "type" : "string"
-      }
-    },
-    "nbOutputDevices" : {
-      "type" : "integer",
-      "description" : "Number of output audio devices"
-    },
-    "outputDeviceSelectedIndex" : {
-      "type" : "integer",
-      "description" : "Index of selected output audio devices (-1 if default)"
-    },
-    "outputDevices" : {
-      "type" : "array",
-      "description" : "Names of output devices",
-      "items" : {
-        "type" : "string"
-      }
-    }
-  },
-  "description" : "List of audio devices available in the system"
+            defs.AudioDevice = {
+  "properties" : {
+    "name" : {
+      "type" : "string",
+      "description" : "Displayable name of the device"
+    }
+  },
+  "description" : "Audio device"
 };
-            defs.AudioDevicesSelect = {
-  "properties" : {
-    "input" : {
-      "type" : "integer",
-      "description" : "Index of the audio input device (-1 for default)"
-    },
-    "output" : {
-      "type" : "integer",
-      "description" : "Index of the audio output device (-1 for default)"
-    }
-  },
-  "description" : "Audio devices selected"
+            defs.AudioDevices = {
+  "required" : [ "inputDeviceSelectedIndex", "inputVolume", "nbInputDevices", "nbOutputDevices", "outputDeviceSelectedIndex" ],
+  "properties" : {
+    "inputVolume" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Audio input volume [0.0..1.0]"
+    },
+    "nbInputDevices" : {
+      "type" : "integer",
+      "description" : "Number of input audio devices"
+    },
+    "inputDeviceSelectedIndex" : {
+      "type" : "integer",
+      "description" : "Index of selected input audio devices (-1 if default)"
+    },
+    "inputDevices" : {
+      "type" : "array",
+      "description" : "List of input devices",
+      "items" : {
+        "$ref" : "#/definitions/AudioDevice"
+      }
+    },
+    "nbOutputDevices" : {
+      "type" : "integer",
+      "description" : "Number of output audio devices"
+    },
+    "outputDeviceSelectedIndex" : {
+      "type" : "integer",
+      "description" : "Index of selected output audio devices (-1 if default)"
+    },
+    "outputDevices" : {
+      "type" : "array",
+      "description" : "List of output devices",
+      "items" : {
+        "$ref" : "#/definitions/AudioDevice"
+      }
+    }
+  },
+  "description" : "List of audio devices available in the system"
 };
-            defs.Channel = {
-  "required" : [ "deltaFrequency", "id", "index", "title", "uid" ],
-  "properties" : {
-    "index" : {
-      "type" : "integer",
-      "description" : "Index in the list of channels"
-    },
-    "id" : {
-      "type" : "string",
-      "description" : "Key to identify the type of channel"
-    },
-    "uid" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Channel instance unique id"
-    },
-    "title" : {
-      "type" : "string",
-      "description" : "Freeform title of the channel"
-    },
-    "deltaFrequency" : {
-      "type" : "integer",
-      "description" : "Channel shift frequency in Hz from the center of baseband"
-    }
-  },
-  "description" : "Channel summarized information"
+            defs.AudioDevicesSelect = {
+  "required" : [ "inputIndex", "inputVolume", "outputIndex" ],
+  "properties" : {
+    "inputVolume" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Audio input volume [0.0..1.0]"
+    },
+    "inputIndex" : {
+      "type" : "integer",
+      "description" : "Index of the audio input device (-1 for default)"
+    },
+    "outputIndex" : {
+      "type" : "integer",
+      "description" : "Index of the audio output device (-1 for default)"
+    }
+  },
+  "description" : "Audio devices selected"
 };
-            defs.ChannelListItem = {
-  "required" : [ "id", "name" ],
-  "properties" : {
-    "name" : {
-      "type" : "string",
-      "description" : "Displayable name of the channel plugin"
-    },
-    "idURI" : {
-      "type" : "string",
-      "description" : "Key to identify the channel plugin type in URI form"
-    },
-    "id" : {
-      "type" : "string",
-      "description" : "Key to identify the channel plugin type as short object name"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Not zero (true) if this is a Tx channel"
-    },
-    "version" : {
-      "type" : "string",
-      "description" : "Channel plugin version number"
-    },
-    "index" : {
-      "type" : "integer",
-      "description" : "Index of the channel in the list of registered channels"
-    }
-  },
-  "description" : "Summarized information about channel plugin"
+            defs.Channel = {
+  "required" : [ "deltaFrequency", "id", "index", "title", "uid" ],
+  "properties" : {
+    "index" : {
+      "type" : "integer",
+      "description" : "Index in the list of channels"
+    },
+    "id" : {
+      "type" : "string",
+      "description" : "Key to identify the type of channel"
+    },
+    "uid" : {
+      "type" : "integer",
+      "format" : "int64",
+      "description" : "Channel instance unique id"
+    },
+    "title" : {
+      "type" : "string",
+      "description" : "Freeform title of the channel"
+    },
+    "deltaFrequency" : {
+      "type" : "integer",
+      "description" : "Channel shift frequency in Hz from the center of baseband"
+    }
+  },
+  "description" : "Channel summarized information"
 };
-            defs.DVSeralDevices = {
-  "required" : [ "nbDevices" ],
-  "properties" : {
-    "nbDevices" : {
-      "type" : "integer",
-      "description" : "Number of DV serial devices"
-    },
-    "dvSerialDevices" : {
-      "type" : "array",
-      "description" : "Device names of DV serial devices",
-      "items" : {
-        "type" : "string"
-      }
-    }
-  },
-  "description" : "List of DV serial devices available in the system"
+            defs.ChannelListItem = {
+  "required" : [ "id", "name" ],
+  "properties" : {
+    "name" : {
+      "type" : "string",
+      "description" : "Displayable name of the channel plugin"
+    },
+    "idURI" : {
+      "type" : "string",
+      "description" : "Key to identify the channel plugin type in URI form"
+    },
+    "id" : {
+      "type" : "string",
+      "description" : "Key to identify the channel plugin type as short object name"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Not zero (true) if this is a Tx channel"
+    },
+    "version" : {
+      "type" : "string",
+      "description" : "Channel plugin version number"
+    },
+    "index" : {
+      "type" : "integer",
+      "description" : "Index of the channel in the list of registered channels"
+    }
+  },
+  "description" : "Summarized information about channel plugin"
 };
-            defs.DeviceListItem = {
-  "required" : [ "hwType" ],
-  "properties" : {
-    "displayedName" : {
-      "type" : "string",
-      "description" : "Displayable name that uniquely identifies this device instance"
-    },
-    "hwType" : {
-      "type" : "string",
-      "description" : "Key to identify the type of hardware device"
-    },
-    "serial" : {
-      "type" : "string",
-      "description" : "Serial number of the hardware device"
-    },
-    "sequence" : {
-      "type" : "integer",
-      "description" : "Sequence in the enumeration of same device types"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Set to not zero (true) if this is a Tx device"
-    },
-    "nbStreams" : {
-      "type" : "integer",
-      "description" : "Number of channels or streams in the device"
-    },
-    "streamIndex" : {
-      "type" : "integer",
-      "description" : "Index of the channel in the device"
-    },
-    "deviceSetIndex" : {
-      "type" : "integer",
-      "description" : "Index of the device set that claimed this device (-1 if not claimed)"
-    },
-    "index" : {
-      "type" : "integer",
-      "description" : "Index of the device in the list of registered devices"
-    }
-  },
-  "description" : "Summarized information about attached hardware device"
+            defs.DVSeralDevices = {
+  "required" : [ "nbDevices" ],
+  "properties" : {
+    "nbDevices" : {
+      "type" : "integer",
+      "description" : "Number of DV serial devices"
+    },
+    "dvSerialDevices" : {
+      "type" : "array",
+      "description" : "Device names of DV serial devices",
+      "items" : {
+        "type" : "string"
+      }
+    }
+  },
+  "description" : "List of DV serial devices available in the system"
 };
-            defs.DeviceSet = {
-  "required" : [ "channelcount", "samplingDevice" ],
-  "properties" : {
-    "samplingDevice" : {
-      "$ref" : "#/definitions/SamplingDevice"
-    },
-    "channelcount" : {
-      "type" : "integer",
-      "description" : "Number of channels in the set"
-    },
-    "channels" : {
-      "type" : "array",
-      "description" : "Channels list",
-      "items" : {
-        "$ref" : "#/definitions/Channel"
-      }
-    }
-  },
-  "description" : "Sampling device and its associated channels"
+            defs.DeviceListItem = {
+  "required" : [ "hwType" ],
+  "properties" : {
+    "displayedName" : {
+      "type" : "string",
+      "description" : "Displayable name that uniquely identifies this device instance"
+    },
+    "hwType" : {
+      "type" : "string",
+      "description" : "Key to identify the type of hardware device"
+    },
+    "serial" : {
+      "type" : "string",
+      "description" : "Serial number of the hardware device"
+    },
+    "sequence" : {
+      "type" : "integer",
+      "description" : "Sequence in the enumeration of same device types"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Set to not zero (true) if this is a Tx device"
+    },
+    "nbStreams" : {
+      "type" : "integer",
+      "description" : "Number of channels or streams in the device"
+    },
+    "streamIndex" : {
+      "type" : "integer",
+      "description" : "Index of the channel in the device"
+    },
+    "deviceSetIndex" : {
+      "type" : "integer",
+      "description" : "Index of the device set that claimed this device (-1 if not claimed)"
+    },
+    "index" : {
+      "type" : "integer",
+      "description" : "Index of the device in the list of registered devices"
+    }
+  },
+  "description" : "Summarized information about attached hardware device"
 };
-            defs.DeviceSetList = {
-  "required" : [ "devicesetcount" ],
-  "properties" : {
-    "devicesetcount" : {
-      "type" : "integer",
-      "description" : "Number of device sets opened in this instance"
-    },
-    "deviceSets" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/DeviceSet"
-      }
-    }
-  },
-  "description" : "List of device sets opened in this instance"
+            defs.DeviceSet = {
+  "required" : [ "channelcount", "samplingDevice" ],
+  "properties" : {
+    "samplingDevice" : {
+      "$ref" : "#/definitions/SamplingDevice"
+    },
+    "channelcount" : {
+      "type" : "integer",
+      "description" : "Number of channels in the set"
+    },
+    "channels" : {
+      "type" : "array",
+      "description" : "Channels list",
+      "items" : {
+        "$ref" : "#/definitions/Channel"
+      }
+    }
+  },
+  "description" : "Sampling device and its associated channels"
 };
-            defs.ErrorResponse = {
-  "required" : [ "message" ],
-  "properties" : {
-    "message" : {
-      "type" : "string"
-    }
-  }
+            defs.DeviceSetList = {
+  "required" : [ "devicesetcount" ],
+  "properties" : {
+    "devicesetcount" : {
+      "type" : "integer",
+      "description" : "Number of device sets opened in this instance"
+    },
+    "deviceSets" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/DeviceSet"
+      }
+    }
+  },
+  "description" : "List of device sets opened in this instance"
 };
-            defs.InstanceChannelsResponse = {
-  "required" : [ "channelcount" ],
-  "properties" : {
-    "channelcount" : {
-      "type" : "integer",
-      "description" : "Number of plugins available"
-    },
-    "channels" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/ChannelListItem"
-      }
-    }
-  },
-  "description" : "Summarized information about channel plugins available in this SDRangel instance"
+            defs.ErrorResponse = {
+  "required" : [ "message" ],
+  "properties" : {
+    "message" : {
+      "type" : "string"
+    }
+  }
 };
-            defs.InstanceDevicesResponse = {
-  "required" : [ "devicecount" ],
-  "properties" : {
-    "devicecount" : {
-      "type" : "integer",
-      "description" : "Number of devices attached"
-    },
-    "devices" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/DeviceListItem"
-      }
-    }
-  },
-  "description" : "Summarized information about logical devices from hardware devices attached to this SDRangel instance"
+            defs.InstanceChannelsResponse = {
+  "required" : [ "channelcount" ],
+  "properties" : {
+    "channelcount" : {
+      "type" : "integer",
+      "description" : "Number of plugins available"
+    },
+    "channels" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/ChannelListItem"
+      }
+    }
+  },
+  "description" : "Summarized information about channel plugins available in this SDRangel instance"
 };
-            defs.InstanceSummaryResponse = {
-  "required" : [ "devicesetlist", "version" ],
-  "properties" : {
-    "version" : {
-      "type" : "string",
-      "description" : "Current software version"
-    },
-    "logging" : {
-      "$ref" : "#/definitions/LoggingInfo"
-    },
-    "devicesetlist" : {
-      "$ref" : "#/definitions/DeviceSetList"
-    },
-    "user" : {
-      "$ref" : "#/definitions/User"
-    }
-  },
-  "description" : "Summarized information about this SDRangel instance"
+            defs.InstanceDevicesResponse = {
+  "required" : [ "devicecount" ],
+  "properties" : {
+    "devicecount" : {
+      "type" : "integer",
+      "description" : "Number of devices attached"
+    },
+    "devices" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/DeviceListItem"
+      }
+    }
+  },
+  "description" : "Summarized information about logical devices from hardware devices attached to this SDRangel instance"
 };
-            defs.LocationInformation = {
-  "required" : [ "latitude", "longitude" ],
-  "properties" : {
-    "latitude" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Lautitude in decimal degrees positive to the north"
-    },
-    "longitude" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Longitude in decimal degrees positive to the east"
-    }
-  },
-  "description" : "Instance geolocation information"
+            defs.InstanceSummaryResponse = {
+  "required" : [ "devicesetlist", "version" ],
+  "properties" : {
+    "version" : {
+      "type" : "string",
+      "description" : "Current software version"
+    },
+    "logging" : {
+      "$ref" : "#/definitions/LoggingInfo"
+    },
+    "devicesetlist" : {
+      "$ref" : "#/definitions/DeviceSetList"
+    },
+    "user" : {
+      "$ref" : "#/definitions/User"
+    }
+  },
+  "description" : "Summarized information about this SDRangel instance"
 };
-            defs.LoggingInfo = {
-  "properties" : {
-    "consoleLevel" : {
-      "type" : "string",
-      "description" : "Minimum level of messages printed to console: debug, info, warning, error"
-    },
-    "fileLevel" : {
-      "type" : "string",
-      "description" : "Minimum level of messages written to file: debug, info, warning, error"
-    },
-    "dumpToFile" : {
-      "type" : "integer",
-      "description" : "not zero (true) if messages are written to file"
-    },
-    "fileName" : {
-      "type" : "string",
-      "description" : "Name of the log file"
-    }
-  },
-  "description" : "Logging parameters setting"
+            defs.LocationInformation = {
+  "required" : [ "latitude", "longitude" ],
+  "properties" : {
+    "latitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Lautitude in decimal degrees positive to the north"
+    },
+    "longitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Longitude in decimal degrees positive to the east"
+    }
+  },
+  "description" : "Instance geolocation information"
 };
-            defs.PresetGroup = {
-  "required" : [ "groupName", "nbPresets" ],
-  "properties" : {
-    "groupName" : {
-      "type" : "string",
-      "description" : "Name of the preset group"
-    },
-    "nbPresets" : {
-      "type" : "integer",
-      "description" : "Number of presets in the group"
-    },
-    "presets" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/PresetItem"
-      }
-    }
-  },
-  "description" : "Group of presets"
+            defs.LoggingInfo = {
+  "properties" : {
+    "consoleLevel" : {
+      "type" : "string",
+      "description" : "Minimum level of messages printed to console: debug, info, warning, error"
+    },
+    "fileLevel" : {
+      "type" : "string",
+      "description" : "Minimum level of messages written to file: debug, info, warning, error"
+    },
+    "dumpToFile" : {
+      "type" : "integer",
+      "description" : "not zero (true) if messages are written to file"
+    },
+    "fileName" : {
+      "type" : "string",
+      "description" : "Name of the log file"
+    }
+  },
+  "description" : "Logging parameters setting"
 };
-            defs.PresetIdentifier = {
-  "required" : [ "centerFrequency", "groupName", "name", "type" ],
-  "properties" : {
-    "groupName" : {
-      "type" : "string",
-      "description" : "Name of the preset group"
-    },
-    "centerFrequency" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Center freqeuency in MHz"
-    },
-    "type" : {
-      "type" : "string",
-      "description" : "Type of device set (R: Rx, T: Tx)"
-    },
-    "name" : {
-      "type" : "string",
-      "description" : "Descriptive name of the preset"
-    }
-  },
-  "description" : "Settings preset item"
+            defs.PresetGroup = {
+  "required" : [ "groupName", "nbPresets" ],
+  "properties" : {
+    "groupName" : {
+      "type" : "string",
+      "description" : "Name of the preset group"
+    },
+    "nbPresets" : {
+      "type" : "integer",
+      "description" : "Number of presets in the group"
+    },
+    "presets" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/PresetItem"
+      }
+    }
+  },
+  "description" : "Group of presets"
 };
-            defs.PresetItem = {
-  "required" : [ "centerFrequency", "name", "type" ],
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "number",
-      "format" : "float",
-      "description" : "Center freqeuency in MHz"
-    },
-    "type" : {
-      "type" : "string",
-      "description" : "Type of device set (R: Rx, T: Tx)"
-    },
-    "name" : {
-      "type" : "string",
-      "description" : "Descriptive name of the preset"
-    }
-  },
-  "description" : "Settings preset item"
+            defs.PresetIdentifier = {
+  "required" : [ "centerFrequency", "groupName", "name", "type" ],
+  "properties" : {
+    "groupName" : {
+      "type" : "string",
+      "description" : "Name of the preset group"
+    },
+    "centerFrequency" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Center freqeuency in MHz"
+    },
+    "type" : {
+      "type" : "string",
+      "description" : "Type of device set (R: Rx, T: Tx)"
+    },
+    "name" : {
+      "type" : "string",
+      "description" : "Descriptive name of the preset"
+    }
+  },
+  "description" : "Settings preset item"
 };
-            defs.PresetTransfer = {
-  "required" : [ "deviceSetIndex", "preset" ],
-  "properties" : {
-    "deviceSetIndex" : {
-      "type" : "integer",
-      "description" : "Index of the device set"
-    },
-    "preset" : {
-      "$ref" : "#/definitions/PresetIdentifier"
-    }
-  },
-  "description" : "Preset transfer to or from a device set"
+            defs.PresetItem = {
+  "required" : [ "centerFrequency", "name", "type" ],
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Center freqeuency in MHz"
+    },
+    "type" : {
+      "type" : "string",
+      "description" : "Type of device set (R: Rx, T: Tx)"
+    },
+    "name" : {
+      "type" : "string",
+      "description" : "Descriptive name of the preset"
+    }
+  },
+  "description" : "Settings preset item"
 };
-            defs.Presets = {
-  "required" : [ "nbGroups" ],
-  "properties" : {
-    "nbGroups" : {
-      "type" : "integer",
-      "description" : "Number of preset groups"
-    },
-    "groups" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/PresetGroup"
-      }
-    }
-  },
-  "description" : "Settings presets"
+            defs.PresetTransfer = {
+  "required" : [ "deviceSetIndex", "preset" ],
+  "properties" : {
+    "deviceSetIndex" : {
+      "type" : "integer",
+      "description" : "Index of the device set"
+    },
+    "preset" : {
+      "$ref" : "#/definitions/PresetIdentifier"
+    }
+  },
+  "description" : "Preset transfer to or from a device set"
 };
-            defs.SamplingDevice = {
-  "required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
-  "properties" : {
-    "index" : {
-      "type" : "integer",
-      "description" : "Index in the list of device sets opened in this instance"
-    },
-    "hwType" : {
-      "type" : "string",
-      "description" : "Key to identify the type of hardware device"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Not zero (true) if this is a Tx device"
-    },
-    "nbStreams" : {
-      "type" : "integer",
-      "description" : "Number of channels or streams in the device"
-    },
-    "streamIndex" : {
-      "type" : "integer",
-      "description" : "Index of the channel in the device"
-    },
-    "sequence" : {
-      "type" : "integer",
-      "description" : "Sequence in the enumeration of same device types"
-    },
-    "serial" : {
-      "type" : "string",
-      "description" : "Serial number of the hardware device"
-    },
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Center frequency in Hz at which the device is tuned possibly taking NCO into account"
-    },
-    "bandwidth" : {
-      "type" : "integer",
-      "description" : "Bandwidth in Hz or complex S/s of baseband"
-    },
-    "state" : {
-      "type" : "string",
-      "description" : "State: notStarted, idle, ready, running, error"
-    }
-  },
-  "description" : "Information about a logical device available from an attached hardware device that can be used as a sampling device"
+            defs.Presets = {
+  "required" : [ "nbGroups" ],
+  "properties" : {
+    "nbGroups" : {
+      "type" : "integer",
+      "description" : "Number of preset groups"
+    },
+    "groups" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/PresetGroup"
+      }
+    }
+  },
+  "description" : "Settings presets"
 };
-            defs.User = {
-  "required" : [ "index", "name" ],
-  "properties" : {
-    "index" : {
-      "type" : "integer"
-    },
-    "name" : {
-      "type" : "string"
-    }
-  }
+            defs.SamplingDevice = {
+  "required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
+  "properties" : {
+    "index" : {
+      "type" : "integer",
+      "description" : "Index in the list of device sets opened in this instance"
+    },
+    "hwType" : {
+      "type" : "string",
+      "description" : "Key to identify the type of hardware device"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Not zero (true) if this is a Tx device"
+    },
+    "nbStreams" : {
+      "type" : "integer",
+      "description" : "Number of channels or streams in the device"
+    },
+    "streamIndex" : {
+      "type" : "integer",
+      "description" : "Index of the channel in the device"
+    },
+    "sequence" : {
+      "type" : "integer",
+      "description" : "Sequence in the enumeration of same device types"
+    },
+    "serial" : {
+      "type" : "string",
+      "description" : "Serial number of the hardware device"
+    },
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64",
+      "description" : "Center frequency in Hz at which the device is tuned possibly taking NCO into account"
+    },
+    "bandwidth" : {
+      "type" : "integer",
+      "description" : "Bandwidth in Hz or complex S/s of baseband"
+    },
+    "state" : {
+      "type" : "string",
+      "description" : "State: notStarted, idle, ready, running, error"
+    }
+  },
+  "description" : "Information about a logical device available from an attached hardware device that can be used as a sampling device"
+};
+            defs.User = {
+  "required" : [ "index", "name" ],
+  "properties" : {
+    "index" : {
+      "type" : "integer"
+    },
+    "name" : {
+      "type" : "string"
+    }
+  }
 };
   </script>
 
@@ -1450,11 +1470,11 @@ except ApiException as e:
                                   <div id='responses-instanceAudioGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/AudioDevices"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/AudioDevices"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1493,11 +1513,11 @@ except ApiException as e:
                                   <div id='responses-instanceAudioGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1754,14 +1774,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Select audio devices to use for this instance",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/AudioDevicesSelect"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Select audio devices to use for this instance",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/AudioDevicesSelect"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -1802,11 +1822,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceAudioPatch-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/AudioDevicesSelect"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/AudioDevicesSelect"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1845,11 +1865,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceAudioPatch-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2140,11 +2160,11 @@ except ApiException as e:
                                   <div id='responses-instanceChannels-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/InstanceChannelsResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/InstanceChannelsResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2183,11 +2203,11 @@ except ApiException as e:
                                   <div id='responses-instanceChannels-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2478,11 +2498,11 @@ except ApiException as e:
                                   <div id='responses-instanceDVSerialPatch-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return list of devices or empty list if unset",
-  "schema" : {
-    "$ref" : "#/definitions/DVSeralDevices"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return list of devices or empty list if unset",
+  "schema" : {
+    "$ref" : "#/definitions/DVSeralDevices"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2521,11 +2541,11 @@ except ApiException as e:
                                   <div id='responses-instanceDVSerialPatch-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2778,11 +2798,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsDelete-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return new list of device sets",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSetList"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return new list of device sets",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSetList"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2829,11 +2849,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsDelete-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3086,11 +3106,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return device set list",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSetList"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return device set list",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSetList"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3129,11 +3149,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3424,11 +3444,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsPost-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return new device set",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSet"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return new device set",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSet"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3467,11 +3487,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsPost-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3762,11 +3782,11 @@ except ApiException as e:
                                   <div id='responses-instanceDevices-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/InstanceDevicesResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/InstanceDevicesResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -3805,11 +3825,11 @@ except ApiException as e:
                                   <div id='responses-instanceDevices-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4062,11 +4082,11 @@ except ApiException as e:
                                   <div id='responses-instanceLocationGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return location",
-  "schema" : {
-    "$ref" : "#/definitions/LocationInformation"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return location",
+  "schema" : {
+    "$ref" : "#/definitions/LocationInformation"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4105,11 +4125,11 @@ except ApiException as e:
                                   <div id='responses-instanceLocationGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4366,14 +4386,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Location of instance in latitude and longitude",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/LocationInformation"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Location of instance in latitude and longitude",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/LocationInformation"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -4414,11 +4434,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLocationPut-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return location",
-  "schema" : {
-    "$ref" : "#/definitions/LocationInformation"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return location",
+  "schema" : {
+    "$ref" : "#/definitions/LocationInformation"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4465,11 +4485,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLocationPut-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4722,11 +4742,11 @@ except ApiException as e:
                                   <div id='responses-instanceLoggingGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/LoggingInfo"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/LoggingInfo"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4765,11 +4785,11 @@ except ApiException as e:
                                   <div id='responses-instanceLoggingGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5026,14 +5046,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Logging information",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/LoggingInfo"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Logging information",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/LoggingInfo"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -5074,11 +5094,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLoggingPut-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Return new data on success",
-  "schema" : {
-    "$ref" : "#/definitions/LoggingInfo"
-  }
+                                        var schemaWrapper = {
+  "description" : "Return new data on success",
+  "schema" : {
+    "$ref" : "#/definitions/LoggingInfo"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5117,11 +5137,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLoggingPut-400-schema-400' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Invallid data",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invallid data",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5160,11 +5180,11 @@ $(document).ready(function() {
                                   <div id='responses-instanceLoggingPut-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5421,14 +5441,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "delete this preset",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "delete this preset",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -5469,11 +5489,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return deleted preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return deleted preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5528,11 +5548,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5785,11 +5805,11 @@ except ApiException as e:
                                   <div id='responses-instancePresetGet-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset list",
-  "schema" : {
-    "$ref" : "#/definitions/Presets"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset list",
+  "schema" : {
+    "$ref" : "#/definitions/Presets"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -5828,11 +5848,11 @@ except ApiException as e:
                                   <div id='responses-instancePresetGet-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6089,14 +6109,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Load preset settings to the device set",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetTransfer"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Load preset settings to the device set",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetTransfer"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -6137,11 +6157,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6188,11 +6208,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-404-schema-404' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "No preset or device set found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "No preset or device set found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6231,11 +6251,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6492,14 +6512,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "save device set settings on a new preset",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetTransfer"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "save device set settings on a new preset",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetTransfer"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -6540,11 +6560,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6607,11 +6627,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6868,14 +6888,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "save device set settings to the preset",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/PresetTransfer"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "save device set settings to the preset",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/PresetTransfer"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -6916,11 +6936,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "On success return preset identification",
-  "schema" : {
-    "$ref" : "#/definitions/PresetIdentifier"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return preset identification",
+  "schema" : {
+    "$ref" : "#/definitions/PresetIdentifier"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6967,11 +6987,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-404-schema-404' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "No preset or device set found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "No preset or device set found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7010,11 +7030,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7267,11 +7287,11 @@ except ApiException as e:
                                   <div id='responses-instanceSummary-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Success",
-  "schema" : {
-    "$ref" : "#/definitions/InstanceSummaryResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Success",
+  "schema" : {
+    "$ref" : "#/definitions/InstanceSummaryResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7310,11 +7330,11 @@ except ApiException as e:
                                   <div id='responses-instanceSummary-500-schema-500' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
                                     <script>
                                       $(document).ready(function() {
-                                        var schemaWrapper = {
-  "description" : "Error",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Error",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7364,7 +7384,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2017-11-24T08:42:52.359+01:00
+              Generated 2017-11-24T17:11:18.943+01:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGAudioDevice.cpp
new file mode 100644
index 000000000..047716387
--- /dev/null
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevice.cpp
@@ -0,0 +1,95 @@
+/**
+ * SDRangel
+ * This is the web API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube
+ *
+ * OpenAPI spec version: 4.0.0
+ * Contact: f4exb06@gmail.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+#include "SWGAudioDevice.h"
+
+#include "SWGHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace Swagger {
+
+SWGAudioDevice::SWGAudioDevice(QString* json) {
+    init();
+    this->fromJson(*json);
+}
+
+SWGAudioDevice::SWGAudioDevice() {
+    init();
+}
+
+SWGAudioDevice::~SWGAudioDevice() {
+    this->cleanup();
+}
+
+void
+SWGAudioDevice::init() {
+    name = new QString("");
+}
+
+void
+SWGAudioDevice::cleanup() {
+    
+    if(name != nullptr) {
+        delete name;
+    }
+}
+
+SWGAudioDevice*
+SWGAudioDevice::fromJson(QString &json) {
+    QByteArray array (json.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+    return this;
+}
+
+void
+SWGAudioDevice::fromJsonObject(QJsonObject &pJson) {
+    ::Swagger::setValue(&name, pJson["name"], "QString", "QString");
+}
+
+QString
+SWGAudioDevice::asJson ()
+{
+    QJsonObject* obj = this->asJsonObject();
+    
+    QJsonDocument doc(*obj);
+    QByteArray bytes = doc.toJson();
+    return QString(bytes);
+}
+
+QJsonObject*
+SWGAudioDevice::asJsonObject() {
+    QJsonObject* obj = new QJsonObject();
+    
+    toJsonValue(QString("name"), name, obj, QString("QString"));
+
+    return obj;
+}
+
+QString*
+SWGAudioDevice::getName() {
+    return name;
+}
+void
+SWGAudioDevice::setName(QString* name) {
+    this->name = name;
+}
+
+
+}
+
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevice.h b/swagger/sdrangel/code/qt5/client/SWGAudioDevice.h
new file mode 100644
index 000000000..9ce857bd1
--- /dev/null
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevice.h
@@ -0,0 +1,55 @@
+/**
+ * SDRangel
+ * This is the web API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube
+ *
+ * OpenAPI spec version: 4.0.0
+ * Contact: f4exb06@gmail.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/*
+ * SWGAudioDevice.h
+ * 
+ * Audio device
+ */
+
+#ifndef SWGAudioDevice_H_
+#define SWGAudioDevice_H_
+
+#include <QJsonObject>
+
+
+#include <QString>
+
+#include "SWGObject.h"
+
+
+namespace Swagger {
+
+class SWGAudioDevice: public SWGObject {
+public:
+    SWGAudioDevice();
+    SWGAudioDevice(QString* json);
+    virtual ~SWGAudioDevice();
+    void init();
+    void cleanup();
+
+    QString asJson ();
+    QJsonObject* asJsonObject();
+    void fromJsonObject(QJsonObject &json);
+    SWGAudioDevice* fromJson(QString &jsonString);
+
+    QString* getName();
+    void setName(QString* name);
+
+
+private:
+    QString* name;
+};
+
+}
+
+#endif /* SWGAudioDevice_H_ */
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp b/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp
index 5a3a9dc6c..602f55139 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp
@@ -37,12 +37,13 @@ SWGAudioDevices::~SWGAudioDevices() {
 
 void
 SWGAudioDevices::init() {
+    input_volume = 0.0f;
     nb_input_devices = 0;
     input_device_selected_index = 0;
-    input_devices = new QList<QString*>();
+    input_devices = new QList<SWGAudioDevice*>();
     nb_output_devices = 0;
     output_device_selected_index = 0;
-    output_devices = new QList<QString*>();
+    output_devices = new QList<SWGAudioDevice*>();
 }
 
 void
@@ -50,9 +51,10 @@ SWGAudioDevices::cleanup() {
     
 
 
+
     if(input_devices != nullptr) {
-        QList<QString*>* arr = input_devices;
-        foreach(QString* o, *arr) {
+        QList<SWGAudioDevice*>* arr = input_devices;
+        foreach(SWGAudioDevice* o, *arr) {
             delete o;
         }
         delete input_devices;
@@ -61,8 +63,8 @@ SWGAudioDevices::cleanup() {
 
 
     if(output_devices != nullptr) {
-        QList<QString*>* arr = output_devices;
-        foreach(QString* o, *arr) {
+        QList<SWGAudioDevice*>* arr = output_devices;
+        foreach(SWGAudioDevice* o, *arr) {
             delete o;
         }
         delete output_devices;
@@ -80,15 +82,16 @@ SWGAudioDevices::fromJson(QString &json) {
 
 void
 SWGAudioDevices::fromJsonObject(QJsonObject &pJson) {
+    ::Swagger::setValue(&input_volume, pJson["inputVolume"], "float", "");
     ::Swagger::setValue(&nb_input_devices, pJson["nbInputDevices"], "qint32", "");
     ::Swagger::setValue(&input_device_selected_index, pJson["inputDeviceSelectedIndex"], "qint32", "");
     
-    ::Swagger::setValue(&input_devices, pJson["inputDevices"], "QList", "QString");
+    ::Swagger::setValue(&input_devices, pJson["inputDevices"], "QList", "SWGAudioDevice");
     
     ::Swagger::setValue(&nb_output_devices, pJson["nbOutputDevices"], "qint32", "");
     ::Swagger::setValue(&output_device_selected_index, pJson["outputDeviceSelectedIndex"], "qint32", "");
     
-    ::Swagger::setValue(&output_devices, pJson["outputDevices"], "QList", "QString");
+    ::Swagger::setValue(&output_devices, pJson["outputDevices"], "QList", "SWGAudioDevice");
     
 }
 
@@ -106,12 +109,14 @@ QJsonObject*
 SWGAudioDevices::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     
+    obj->insert("inputVolume", QJsonValue(input_volume));
+
     obj->insert("nbInputDevices", QJsonValue(nb_input_devices));
 
     obj->insert("inputDeviceSelectedIndex", QJsonValue(input_device_selected_index));
 
     QJsonArray input_devicesJsonArray;
-    toJsonArray((QList<void*>*)input_devices, &input_devicesJsonArray, "input_devices", "QString");
+    toJsonArray((QList<void*>*)input_devices, &input_devicesJsonArray, "input_devices", "SWGAudioDevice");
     obj->insert("inputDevices", input_devicesJsonArray);
 
     obj->insert("nbOutputDevices", QJsonValue(nb_output_devices));
@@ -119,12 +124,21 @@ SWGAudioDevices::asJsonObject() {
     obj->insert("outputDeviceSelectedIndex", QJsonValue(output_device_selected_index));
 
     QJsonArray output_devicesJsonArray;
-    toJsonArray((QList<void*>*)output_devices, &output_devicesJsonArray, "output_devices", "QString");
+    toJsonArray((QList<void*>*)output_devices, &output_devicesJsonArray, "output_devices", "SWGAudioDevice");
     obj->insert("outputDevices", output_devicesJsonArray);
 
     return obj;
 }
 
+float
+SWGAudioDevices::getInputVolume() {
+    return input_volume;
+}
+void
+SWGAudioDevices::setInputVolume(float input_volume) {
+    this->input_volume = input_volume;
+}
+
 qint32
 SWGAudioDevices::getNbInputDevices() {
     return nb_input_devices;
@@ -143,12 +157,12 @@ SWGAudioDevices::setInputDeviceSelectedIndex(qint32 input_device_selected_index)
     this->input_device_selected_index = input_device_selected_index;
 }
 
-QList<QString*>*
+QList<SWGAudioDevice*>*
 SWGAudioDevices::getInputDevices() {
     return input_devices;
 }
 void
-SWGAudioDevices::setInputDevices(QList<QString*>* input_devices) {
+SWGAudioDevices::setInputDevices(QList<SWGAudioDevice*>* input_devices) {
     this->input_devices = input_devices;
 }
 
@@ -170,12 +184,12 @@ SWGAudioDevices::setOutputDeviceSelectedIndex(qint32 output_device_selected_inde
     this->output_device_selected_index = output_device_selected_index;
 }
 
-QList<QString*>*
+QList<SWGAudioDevice*>*
 SWGAudioDevices::getOutputDevices() {
     return output_devices;
 }
 void
-SWGAudioDevices::setOutputDevices(QList<QString*>* output_devices) {
+SWGAudioDevices::setOutputDevices(QList<SWGAudioDevice*>* output_devices) {
     this->output_devices = output_devices;
 }
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevices.h b/swagger/sdrangel/code/qt5/client/SWGAudioDevices.h
index 563f239c0..058e47cd1 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioDevices.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevices.h
@@ -22,8 +22,8 @@
 #include <QJsonObject>
 
 
+#include "SWGAudioDevice.h"
 #include <QList>
-#include <QString>
 
 #include "SWGObject.h"
 
@@ -43,14 +43,17 @@ public:
     void fromJsonObject(QJsonObject &json);
     SWGAudioDevices* fromJson(QString &jsonString);
 
+    float getInputVolume();
+    void setInputVolume(float input_volume);
+
     qint32 getNbInputDevices();
     void setNbInputDevices(qint32 nb_input_devices);
 
     qint32 getInputDeviceSelectedIndex();
     void setInputDeviceSelectedIndex(qint32 input_device_selected_index);
 
-    QList<QString*>* getInputDevices();
-    void setInputDevices(QList<QString*>* input_devices);
+    QList<SWGAudioDevice*>* getInputDevices();
+    void setInputDevices(QList<SWGAudioDevice*>* input_devices);
 
     qint32 getNbOutputDevices();
     void setNbOutputDevices(qint32 nb_output_devices);
@@ -58,17 +61,18 @@ public:
     qint32 getOutputDeviceSelectedIndex();
     void setOutputDeviceSelectedIndex(qint32 output_device_selected_index);
 
-    QList<QString*>* getOutputDevices();
-    void setOutputDevices(QList<QString*>* output_devices);
+    QList<SWGAudioDevice*>* getOutputDevices();
+    void setOutputDevices(QList<SWGAudioDevice*>* output_devices);
 
 
 private:
+    float input_volume;
     qint32 nb_input_devices;
     qint32 input_device_selected_index;
-    QList<QString*>* input_devices;
+    QList<SWGAudioDevice*>* input_devices;
     qint32 nb_output_devices;
     qint32 output_device_selected_index;
-    QList<QString*>* output_devices;
+    QList<SWGAudioDevice*>* output_devices;
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.cpp b/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.cpp
index 80139ea4e..b2747b79e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.cpp
@@ -37,14 +37,16 @@ SWGAudioDevicesSelect::~SWGAudioDevicesSelect() {
 
 void
 SWGAudioDevicesSelect::init() {
-    input = 0;
-    output = 0;
+    input_volume = 0.0f;
+    input_index = 0;
+    output_index = 0;
 }
 
 void
 SWGAudioDevicesSelect::cleanup() {
     
 
+
 }
 
 SWGAudioDevicesSelect*
@@ -58,8 +60,9 @@ SWGAudioDevicesSelect::fromJson(QString &json) {
 
 void
 SWGAudioDevicesSelect::fromJsonObject(QJsonObject &pJson) {
-    ::Swagger::setValue(&input, pJson["input"], "qint32", "");
-    ::Swagger::setValue(&output, pJson["output"], "qint32", "");
+    ::Swagger::setValue(&input_volume, pJson["inputVolume"], "float", "");
+    ::Swagger::setValue(&input_index, pJson["inputIndex"], "qint32", "");
+    ::Swagger::setValue(&output_index, pJson["outputIndex"], "qint32", "");
 }
 
 QString
@@ -76,29 +79,40 @@ QJsonObject*
 SWGAudioDevicesSelect::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     
-    obj->insert("input", QJsonValue(input));
+    obj->insert("inputVolume", QJsonValue(input_volume));
 
-    obj->insert("output", QJsonValue(output));
+    obj->insert("inputIndex", QJsonValue(input_index));
+
+    obj->insert("outputIndex", QJsonValue(output_index));
 
     return obj;
 }
 
-qint32
-SWGAudioDevicesSelect::getInput() {
-    return input;
+float
+SWGAudioDevicesSelect::getInputVolume() {
+    return input_volume;
 }
 void
-SWGAudioDevicesSelect::setInput(qint32 input) {
-    this->input = input;
+SWGAudioDevicesSelect::setInputVolume(float input_volume) {
+    this->input_volume = input_volume;
 }
 
 qint32
-SWGAudioDevicesSelect::getOutput() {
-    return output;
+SWGAudioDevicesSelect::getInputIndex() {
+    return input_index;
 }
 void
-SWGAudioDevicesSelect::setOutput(qint32 output) {
-    this->output = output;
+SWGAudioDevicesSelect::setInputIndex(qint32 input_index) {
+    this->input_index = input_index;
+}
+
+qint32
+SWGAudioDevicesSelect::getOutputIndex() {
+    return output_index;
+}
+void
+SWGAudioDevicesSelect::setOutputIndex(qint32 output_index) {
+    this->output_index = output_index;
 }
 
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.h b/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.h
index c87c0e317..2711681fb 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.h
@@ -41,16 +41,20 @@ public:
     void fromJsonObject(QJsonObject &json);
     SWGAudioDevicesSelect* fromJson(QString &jsonString);
 
-    qint32 getInput();
-    void setInput(qint32 input);
+    float getInputVolume();
+    void setInputVolume(float input_volume);
 
-    qint32 getOutput();
-    void setOutput(qint32 output);
+    qint32 getInputIndex();
+    void setInputIndex(qint32 input_index);
+
+    qint32 getOutputIndex();
+    void setOutputIndex(qint32 output_index);
 
 
 private:
-    qint32 input;
-    qint32 output;
+    float input_volume;
+    qint32 input_index;
+    qint32 output_index;
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
index b6a0269dd..cc5d54113 100644
--- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
+++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
@@ -14,6 +14,7 @@
 #define ModelFactory_H_
 
 
+#include "SWGAudioDevice.h"
 #include "SWGAudioDevices.h"
 #include "SWGAudioDevicesSelect.h"
 #include "SWGChannel.h"
@@ -39,6 +40,9 @@
 namespace Swagger {
 
   inline void* create(QString type) {
+    if(QString("SWGAudioDevice").compare(type) == 0) {
+      return new SWGAudioDevice();
+    }
     if(QString("SWGAudioDevices").compare(type) == 0) {
       return new SWGAudioDevices();
     }