diff --git a/plugins/samplesource/filesource/CMakeLists.txt b/plugins/samplesource/filesource/CMakeLists.txt
index feb67eec2..f50b39413 100644
--- a/plugins/samplesource/filesource/CMakeLists.txt
+++ b/plugins/samplesource/filesource/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(filesource)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
 set(filesource_SOURCES
 	filesourcegui.cpp
 	filesourceinput.cpp
diff --git a/sdrbase/resources/index.html b/sdrbase/resources/index.html
index 6c369aa7b..6f6f7db73 100644
--- a/sdrbase/resources/index.html
+++ b/sdrbase/resources/index.html
@@ -695,665 +695,651 @@ margin-bottom: 20px;
   <script>
     // Script section to load models into a JS Var
     var defs = {}
-            defs.AudioDevice = {
-  "properties" : {
-    "name" : {
-      "type" : "string",
-      "description" : "Displayable name of the device"
-    }
-  },
-  "description" : "Audio device"
+            defs.AudioDevice = {
+  "properties" : {
+    "name" : {
+      "type" : "string",
+      "description" : "Displayable name of the device"
+    }
+  },
+  "description" : "Audio device"
 };
-            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.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.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.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.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.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.ChannelListItem = {
-  "required" : [ "id" ],
-  "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.ChannelListItem = {
+  "required" : [ "id" ],
+  "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.DVSeralDevices = {
-  "required" : [ "nbDevices" ],
-  "properties" : {
-    "nbDevices" : {
-      "type" : "integer",
-      "description" : "Number of DV serial devices"
-    },
-    "dvSerialDevices" : {
-      "type" : "array",
-      "description" : "Device names of DV serial devices",
-      "items" : {
-        "$ref" : "#/definitions/DVSerialDevice"
-      }
-    }
-  },
-  "description" : "List of DV serial devices available in the system"
+            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" : {
+        "$ref" : "#/definitions/DVSerialDevice"
+      }
+    }
+  },
+  "description" : "List of DV serial devices available in the system"
 };
-            defs.DVSerialDevice = {
-  "properties" : {
-    "deviceName" : {
-      "type" : "string",
-      "description" : "Name of the serial device in the system"
-    }
-  },
-  "description" : "DV serial device details"
+            defs.DVSerialDevice = {
+  "properties" : {
+    "deviceName" : {
+      "type" : "string",
+      "description" : "Name of the serial device in the system"
+    }
+  },
+  "description" : "DV serial device details"
 };
-            defs.DeviceListItem = {
-  "required" : [ "tx" ],
-  "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.DeviceListItem = {
+  "required" : [ "tx" ],
+  "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.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.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.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.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.DeviceSettings = {
-  "required" : [ "deviceHwType", "tx" ],
-  "discriminator" : "deviceHwType",
-  "properties" : {
-    "deviceHwType" : {
-      "type" : "string",
-      "description" : "Device hardware type code"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Not zero if it is a tx device else it is a rx device"
-    },
-    "fileSourceSettings" : {
-      "$ref" : "#/definitions/FileSourceSettings"
-    },
-    "rtlSdrSettings" : {
-      "$ref" : "#/definitions/RtlSdrSettings"
-    },
-    "limeSdrInputSettings" : {
-      "$ref" : "#/definitions/LimeSdrInputSettings"
-    },
-    "limeSdrOutputSettings" : {
-      "$ref" : "#/definitions/LimeSdrOutputSettings"
-    }
-  },
-  "description" : "Base device settings"
+            defs.DeviceSettings = {
+  "required" : [ "deviceHwType", "tx" ],
+  "discriminator" : "deviceHwType",
+  "properties" : {
+    "deviceHwType" : {
+      "type" : "string",
+      "description" : "Device hardware type code"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Not zero if it is a tx device else it is a rx device"
+    },
+    "fileSourceSettings" : {
+      "$ref" : "#/definitions/FileSourceSettings"
+    },
+    "rtlSdrSettings" : {
+      "$ref" : "#/definitions/RtlSdrSettings"
+    },
+    "limeSdrInputSettings" : {
+      "$ref" : "#/definitions/LimeSdrInputSettings"
+    },
+    "limeSdrOutputSettings" : {
+      "$ref" : "#/definitions/LimeSdrOutputSettings"
+    }
+  },
+  "description" : "Base device settings"
 };
-            defs.ErrorResponse = {
-  "required" : [ "message" ],
-  "properties" : {
-    "message" : {
-      "type" : "string"
-    }
-  }
+            defs.ErrorResponse = {
+  "required" : [ "message" ],
+  "properties" : {
+    "message" : {
+      "type" : "string"
+    }
+  }
 };
-            defs.FileSourceSettings = {
-  "properties" : {
-    "fileName" : {
-      "type" : "string"
-    }
-  }
+            defs.FileSourceSettings = {
+  "properties" : {
+    "fileName" : {
+      "type" : "string"
+    }
+  }
 };
-            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.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.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.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.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.InstanceSummaryResponse = {
+  "required" : [ "devicesetlist", "version" ],
+  "properties" : {
+    "version" : {
+      "type" : "string",
+      "description" : "Current software version"
+    },
+    "logging" : {
+      "$ref" : "#/definitions/LoggingInfo"
+    },
+    "devicesetlist" : {
+      "$ref" : "#/definitions/DeviceSetList"
+    }
+  },
+  "description" : "Summarized information about this SDRangel instance"
 };
-            defs.LimeSdrInputSettings = {
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "devSampleRate" : {
-      "type" : "integer"
-    },
-    "log2HardDecim" : {
-      "type" : "integer"
-    },
-    "dcBlock" : {
-      "type" : "integer"
-    },
-    "iqCorrection" : {
-      "type" : "integer"
-    },
-    "log2SoftDecim" : {
-      "type" : "integer"
-    },
-    "lpfBW" : {
-      "type" : "integer"
-    },
-    "lpfFIREnable" : {
-      "type" : "integer"
-    },
-    "lpfFIRBW" : {
-      "type" : "integer"
-    },
-    "gain" : {
-      "type" : "integer"
-    },
-    "ncoEnable" : {
-      "type" : "integer"
-    },
-    "ncoFrequency" : {
-      "type" : "integer"
-    },
-    "antennaPath" : {
-      "type" : "integer"
-    },
-    "gainMode" : {
-      "type" : "integer"
-    },
-    "lnaGain" : {
-      "type" : "integer"
-    },
-    "tiaGain" : {
-      "type" : "integer"
-    },
-    "pgaGain" : {
-      "type" : "integer"
-    },
-    "extClock" : {
-      "type" : "integer"
-    },
-    "extClockFreq" : {
-      "type" : "integer"
-    }
-  }
+            defs.LimeSdrInputSettings = {
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "devSampleRate" : {
+      "type" : "integer"
+    },
+    "log2HardDecim" : {
+      "type" : "integer"
+    },
+    "dcBlock" : {
+      "type" : "integer"
+    },
+    "iqCorrection" : {
+      "type" : "integer"
+    },
+    "log2SoftDecim" : {
+      "type" : "integer"
+    },
+    "lpfBW" : {
+      "type" : "integer"
+    },
+    "lpfFIREnable" : {
+      "type" : "integer"
+    },
+    "lpfFIRBW" : {
+      "type" : "integer"
+    },
+    "gain" : {
+      "type" : "integer"
+    },
+    "ncoEnable" : {
+      "type" : "integer"
+    },
+    "ncoFrequency" : {
+      "type" : "integer"
+    },
+    "antennaPath" : {
+      "type" : "integer"
+    },
+    "gainMode" : {
+      "type" : "integer"
+    },
+    "lnaGain" : {
+      "type" : "integer"
+    },
+    "tiaGain" : {
+      "type" : "integer"
+    },
+    "pgaGain" : {
+      "type" : "integer"
+    },
+    "extClock" : {
+      "type" : "integer"
+    },
+    "extClockFreq" : {
+      "type" : "integer"
+    }
+  }
 };
-            defs.LimeSdrOutputSettings = {
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "devSampleRate" : {
-      "type" : "integer"
-    },
-    "log2HardInterp" : {
-      "type" : "integer"
-    },
-    "log2SoftInterp" : {
-      "type" : "integer"
-    },
-    "lpfBW" : {
-      "type" : "integer"
-    },
-    "lpfFIREnable" : {
-      "type" : "integer"
-    },
-    "lpfFIRBW" : {
-      "type" : "integer"
-    },
-    "gain" : {
-      "type" : "integer"
-    },
-    "ncoEnable" : {
-      "type" : "integer"
-    },
-    "ncoFrequency" : {
-      "type" : "integer"
-    },
-    "antennaPath" : {
-      "type" : "integer"
-    },
-    "extClock" : {
-      "type" : "integer"
-    },
-    "extClockFreq" : {
-      "type" : "integer"
-    }
-  }
+            defs.LimeSdrOutputSettings = {
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "devSampleRate" : {
+      "type" : "integer"
+    },
+    "log2HardInterp" : {
+      "type" : "integer"
+    },
+    "log2SoftInterp" : {
+      "type" : "integer"
+    },
+    "lpfBW" : {
+      "type" : "integer"
+    },
+    "lpfFIREnable" : {
+      "type" : "integer"
+    },
+    "lpfFIRBW" : {
+      "type" : "integer"
+    },
+    "gain" : {
+      "type" : "integer"
+    },
+    "ncoEnable" : {
+      "type" : "integer"
+    },
+    "ncoFrequency" : {
+      "type" : "integer"
+    },
+    "antennaPath" : {
+      "type" : "integer"
+    },
+    "extClock" : {
+      "type" : "integer"
+    },
+    "extClockFreq" : {
+      "type" : "integer"
+    }
+  }
 };
-            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.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.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.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.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.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.PresetIdentifier = {
-  "required" : [ "centerFrequency", "groupName", "name", "type" ],
-  "properties" : {
-    "groupName" : {
-      "type" : "string",
-      "description" : "Name of the preset group"
-    },
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Center freqeuency in Hz"
-    },
-    "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" : "integer",
+      "format" : "int64",
+      "description" : "Center freqeuency in Hz"
+    },
+    "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.PresetItem = {
-  "required" : [ "centerFrequency", "name", "type" ],
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Center freqeuency in Hz"
-    },
-    "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.PresetItem = {
+  "required" : [ "centerFrequency", "name", "type" ],
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64",
+      "description" : "Center freqeuency in Hz"
+    },
+    "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.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.Presets = {
-  "required" : [ "nbGroups" ],
-  "properties" : {
-    "nbGroups" : {
-      "type" : "integer",
-      "description" : "Number of preset groups"
-    },
-    "groups" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/PresetGroup"
-      }
-    }
-  },
-  "description" : "Settings presets"
+            defs.Presets = {
+  "required" : [ "nbGroups" ],
+  "properties" : {
+    "nbGroups" : {
+      "type" : "integer",
+      "description" : "Number of preset groups"
+    },
+    "groups" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/PresetGroup"
+      }
+    }
+  },
+  "description" : "Settings presets"
 };
-            defs.RtlSdrSettings = {
-  "properties" : {
-    "devSampleRate" : {
-      "type" : "integer"
-    },
-    "lowSampleRate" : {
-      "type" : "integer"
-    },
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "gain" : {
-      "type" : "integer"
-    },
-    "loPpmCorrection" : {
-      "type" : "integer"
-    },
-    "log2Decim" : {
-      "type" : "integer"
-    },
-    "fcPos" : {
-      "type" : "integer"
-    },
-    "dcBlock" : {
-      "type" : "integer"
-    },
-    "iqImbalance" : {
-      "type" : "integer"
-    },
-    "agc" : {
-      "type" : "integer"
-    },
-    "noModMode" : {
-      "type" : "integer"
-    },
-    "transverterMode" : {
-      "type" : "integer"
-    },
-    "transverterDeltaFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    }
-  }
+            defs.RtlSdrSettings = {
+  "properties" : {
+    "devSampleRate" : {
+      "type" : "integer"
+    },
+    "lowSampleRate" : {
+      "type" : "integer"
+    },
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "gain" : {
+      "type" : "integer"
+    },
+    "loPpmCorrection" : {
+      "type" : "integer"
+    },
+    "log2Decim" : {
+      "type" : "integer"
+    },
+    "fcPos" : {
+      "type" : "integer"
+    },
+    "dcBlock" : {
+      "type" : "integer"
+    },
+    "iqImbalance" : {
+      "type" : "integer"
+    },
+    "agc" : {
+      "type" : "integer"
+    },
+    "noModMode" : {
+      "type" : "integer"
+    },
+    "transverterMode" : {
+      "type" : "integer"
+    },
+    "transverterDeltaFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    }
+  }
 };
-            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"
-    }
-  }
+            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"
 };
   </script>
 
@@ -1469,7 +1455,7 @@ margin-bottom: 20px;
                         <p class="marked">Get device settings</p>
                         <p></p>
                         <br />
-                        <pre class="prettyprint language-html prettyprinted" data-type="get"><code><span class="pln">/sdrangel/deviceset/{deviceSetIndex}/device</span></code></pre>
+                        <pre class="prettyprint language-html prettyprinted" data-type="get"><code><span class="pln">/sdrangel/deviceset/{deviceSetIndex}/device/settings</span></code></pre>
                         <p>
                           <h3>Usage and SDK Samples</h3>
                         </p>
@@ -1489,7 +1475,7 @@ margin-bottom: 20px;
 
                         <div class="tab-content">
                           <div class="tab-pane active" id="examples-DeviceSet-devicesetDeviceGet-0-curl">
-                            <pre class="prettyprint"><code class="language-bsh">curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device"</code></pre>
+                            <pre class="prettyprint"><code class="language-bsh">curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device/settings"</code></pre>
                           </div>
                           <div class="tab-pane" id="examples-DeviceSet-devicesetDeviceGet-0-java">
                             <pre class="prettyprint"><code class="language-java">import SWGSDRangel.*;
@@ -1714,11 +1700,11 @@ except ApiException as e:
                                   <div id='responses-devicesetDeviceGet-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 returns current settings values",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSettings"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success returns current settings values",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSettings"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1757,11 +1743,11 @@ except ApiException as e:
                                   <div id='responses-devicesetDeviceGet-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) {
@@ -2058,14 +2044,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Device item to look for. Give values for only the fields you want to search for among displayedName, hwType, serial, sequence and deviceSetIndex. For integers except tx set to -1 to ignore the field. It will match the first device found.",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/DeviceListItem"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Device item to look for. Give values for only the fields you want to search for among displayedName, hwType, serial, sequence and deviceSetIndex. For integers except tx set to -1 to ignore the field. It will match the first device found.",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/DeviceListItem"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -2106,11 +2092,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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 details on the selected device",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceListItem"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return details on the selected device",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceListItem"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2149,11 +2135,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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" : "Device set and device type mismatch (Rx vs Tx)",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Device set and device type mismatch (Rx vs Tx)",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2192,11 +2178,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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" : "Invalid device set index or device not found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid device set index or device not found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2235,11 +2221,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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) {
@@ -2532,11 +2518,11 @@ except ApiException as e:
                                   <div id='responses-devicesetGet-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 details on the device set",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSet"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return details on the device set",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSet"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2575,11 +2561,11 @@ except ApiException as e:
                                   <div id='responses-devicesetGet-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" : "Invalid index",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid index",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2618,11 +2604,11 @@ except ApiException as e:
                                   <div id='responses-devicesetGet-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) {
@@ -2878,11 +2864,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) {
@@ -2921,11 +2907,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) {
@@ -3182,14 +3168,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) {
@@ -3230,11 +3216,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) {
@@ -3273,11 +3259,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) {
@@ -3568,11 +3554,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) {
@@ -3611,11 +3597,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) {
@@ -3906,11 +3892,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) {
@@ -3949,11 +3935,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) {
@@ -4206,11 +4192,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) {
@@ -4249,11 +4235,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsDelete-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 more device sets to be deleted",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "No more device sets to be deleted",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4292,11 +4278,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) {
@@ -4549,11 +4535,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) {
@@ -4592,11 +4578,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) {
@@ -4887,11 +4873,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) {
@@ -4930,11 +4916,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) {
@@ -5225,11 +5211,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) {
@@ -5268,11 +5254,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) {
@@ -5525,11 +5511,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) {
@@ -5568,11 +5554,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) {
@@ -5829,14 +5815,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) {
@@ -5877,11 +5863,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) {
@@ -5928,11 +5914,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) {
@@ -6185,11 +6171,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) {
@@ -6228,11 +6214,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) {
@@ -6489,14 +6475,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) {
@@ -6537,11 +6523,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) {
@@ -6580,11 +6566,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" : "Invalid data",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid data",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6623,11 +6609,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) {
@@ -6884,14 +6870,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) {
@@ -6932,11 +6918,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) {
@@ -6975,11 +6961,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-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" : "Invalid JSON request",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7018,11 +7004,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-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" : "Preset not found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Preset not found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7061,11 +7047,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) {
@@ -7318,11 +7304,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) {
@@ -7361,11 +7347,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) {
@@ -7622,14 +7608,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) {
@@ -7670,11 +7656,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) {
@@ -7713,11 +7699,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-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" : "Invalid JSON request or preset type and device set type mismatch",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request or preset type and device set type mismatch",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7756,11 +7742,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) {
@@ -7799,11 +7785,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) {
@@ -8060,14 +8046,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) {
@@ -8108,11 +8094,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) {
@@ -8151,11 +8137,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-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" : "Invalid JSON request",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8194,11 +8180,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-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" : "Device set not found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Device set not found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8237,11 +8223,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-409-schema-409' 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" : "Preset already exists",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Preset already exists",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8280,11 +8266,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) {
@@ -8541,14 +8527,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) {
@@ -8589,11 +8575,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) {
@@ -8632,11 +8618,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-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" : "Invalid JSON request",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8675,11 +8661,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) {
@@ -8718,11 +8704,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) {
@@ -8975,11 +8961,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) {
@@ -9018,11 +9004,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) {
@@ -9072,7 +9058,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2017-12-06T19:21:13.596+01:00
+              Generated 2017-12-06T21:52:02.995+01:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/webapi/webapiadapterinterface.cpp b/sdrbase/webapi/webapiadapterinterface.cpp
index 0f940a953..c1ab9cf97 100644
--- a/sdrbase/webapi/webapiadapterinterface.cpp
+++ b/sdrbase/webapi/webapiadapterinterface.cpp
@@ -30,3 +30,4 @@ QString WebAPIAdapterInterface::instanceDeviceSetsURL = "/sdrangel/devicesets";
 
 std::regex WebAPIAdapterInterface::devicesetURLRe("^/sdrangel/deviceset/([0-9]{1,2})$");
 std::regex WebAPIAdapterInterface::devicesetDeviceURLRe("^/sdrangel/deviceset/([0-9]{1,2})/device$");
+std::regex WebAPIAdapterInterface::devicesetDeviceSettingsURLRe("^/sdrangel/deviceset/([0-9]{1,2})/device/settings$");
diff --git a/sdrbase/webapi/webapiadapterinterface.h b/sdrbase/webapi/webapiadapterinterface.h
index 3eea06e56..d42e3df41 100644
--- a/sdrbase/webapi/webapiadapterinterface.h
+++ b/sdrbase/webapi/webapiadapterinterface.h
@@ -217,7 +217,7 @@ public:
     { return 501; }
 
     /**
-     * Handler of /sdrangel/devicesets (DELETE) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
+     * Handler of /sdrangel/deviceset/{devicesetIndex} (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
      * returns the Http status code (default 501: not implemented)
      */
     virtual int devicesetGet(
@@ -237,10 +237,10 @@ public:
     { return 501; }
 
     /**
-     * Handler of /sdrangel/deviceset/{devicesetIndex}/device (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
+     * Handler of /sdrangel/deviceset/{devicesetIndex}/device/settings (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
      * returns the Http status code (default 501: not implemented)
      */
-    virtual int devicesetDeviceGet(
+    virtual int devicesetDeviceSettingsGet(
             int deviceSetIndex __attribute__((unused)),
             SWGSDRangel::SWGDeviceSettings& response __attribute__((unused)),
             SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
@@ -257,6 +257,7 @@ public:
     static QString instanceDeviceSetsURL;
     static std::regex devicesetURLRe;
     static std::regex devicesetDeviceURLRe;
+    static std::regex devicesetDeviceSettingsURLRe;
 };
 
 
diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index eaa26c468..4ca0b997b 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -90,6 +90,8 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http
                 devicesetService(std::string(desc_match[1]), request, response);
             } else if (std::regex_match(pathStr, desc_match, WebAPIAdapterInterface::devicesetDeviceURLRe)) {
                 devicesetDeviceService(std::string(desc_match[1]), request, response);
+            } else if (std::regex_match(pathStr, desc_match, WebAPIAdapterInterface::devicesetDeviceSettingsURLRe)) {
+                devicesetDeviceSettingsService(std::string(desc_match[1]), request, response);
             }
             else
             {
@@ -601,15 +603,40 @@ void WebAPIRequestMapper::devicesetDeviceService(const std::string& indexStr, qt
                 }
             }
         }
+        else
+        {
+            response.setStatus(405,"Invalid HTTP method");
+            response.write("Invalid HTTP method");
+        }
+    }
+    catch (const boost::bad_lexical_cast &e)
+    {
+        errorResponse.init();
+        *errorResponse.getMessage() = "Wrong integer conversion on device set index";
+        response.setStatus(400,"Invalid data");
+        response.write(errorResponse.asJson().toUtf8());
+    }
+}
+
+void WebAPIRequestMapper::devicesetDeviceSettingsService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
+{
+    SWGSDRangel::SWGErrorResponse errorResponse;
+
+    try
+    {
+        int deviceSetIndex = boost::lexical_cast<int>(indexStr);
+
+        if (request.getMethod() == "PUT")
+        {
+        }
+        else if (request.getMethod() == "PATCH")
+        {
+        }
         else if (request.getMethod() == "GET")
         {
             SWGSDRangel::SWGDeviceSettings normalResponse;
-            normalResponse.cleanup();
-            normalResponse.setFileSourceSettings(0);
-            normalResponse.setRtlSdrSettings(0);
-            normalResponse.setLimeSdrInputSettings(0);
-            normalResponse.setLimeSdrOutputSettings(0);
-            int status = m_adapter->devicesetDeviceGet(deviceSetIndex, normalResponse, errorResponse);
+            resetDeviceSettings(normalResponse);
+            int status = m_adapter->devicesetDeviceSettingsGet(deviceSetIndex, normalResponse, errorResponse);
             response.setStatus(status);
 
             if (status == 200) {
@@ -682,4 +709,12 @@ bool WebAPIRequestMapper::validatePresetIdentifer(SWGSDRangel::SWGPresetIdentifi
     return (presetIdentifier.getGroupName() && presetIdentifier.getName() && presetIdentifier.getType());
 }
 
+void WebAPIRequestMapper::resetDeviceSettings(SWGSDRangel::SWGDeviceSettings& deviceSettings)
+{
+    deviceSettings.cleanup();
+    deviceSettings.setFileSourceSettings(0);
+    deviceSettings.setRtlSdrSettings(0);
+    deviceSettings.setLimeSdrInputSettings(0);
+    deviceSettings.setLimeSdrOutputSettings(0);
+}
 
diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h
index ad94a023f..5f52b0bf5 100644
--- a/sdrbase/webapi/webapirequestmapper.h
+++ b/sdrbase/webapi/webapirequestmapper.h
@@ -57,11 +57,14 @@ private:
 
     void devicesetService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
     void devicesetDeviceService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
+    void devicesetDeviceSettingsService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
 
     bool validatePresetTransfer(SWGSDRangel::SWGPresetTransfer& presetTransfer);
     bool validatePresetIdentifer(SWGSDRangel::SWGPresetIdentifier& presetIdentifier);
 
     bool parseJsonBody(QString& jsonStr, qtwebapp::HttpResponse& response);
+
+    void resetDeviceSettings(SWGSDRangel::SWGDeviceSettings& deviceSettings);
 };
 
 #endif /* SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_ */
diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp
index c385f2903..b882d8722 100644
--- a/sdrgui/webapi/webapiadaptergui.cpp
+++ b/sdrgui/webapi/webapiadaptergui.cpp
@@ -694,7 +694,7 @@ int WebAPIAdapterGUI::devicesetDevicePut(
     }
 }
 
-int WebAPIAdapterGUI::devicesetDeviceGet(
+int WebAPIAdapterGUI::devicesetDeviceSettingsGet(
         int deviceSetIndex,
         SWGSDRangel::SWGDeviceSettings& response,
         SWGSDRangel::SWGErrorResponse& error)
diff --git a/sdrgui/webapi/webapiadaptergui.h b/sdrgui/webapi/webapiadaptergui.h
index 9cd3cd49e..f2fdd5799 100644
--- a/sdrgui/webapi/webapiadaptergui.h
+++ b/sdrgui/webapi/webapiadaptergui.h
@@ -120,7 +120,7 @@ public:
             SWGSDRangel::SWGDeviceListItem& response,
             SWGSDRangel::SWGErrorResponse& error);
 
-    virtual int devicesetDeviceGet(
+    virtual int devicesetDeviceSettingsGet(
             int deviceSetIndex,
             SWGSDRangel::SWGDeviceSettings& response,
             SWGSDRangel::SWGErrorResponse& error);
diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml
index d9b3db6b8..c3e7d9853 100644
--- a/swagger/sdrangel/api/swagger/swagger.yaml
+++ b/swagger/sdrangel/api/swagger/swagger.yaml
@@ -530,9 +530,11 @@ paths:
             $ref: "#/definitions/ErrorResponse"
         "501":
           description: Function not implemented
+  /sdrangel/deviceset/{deviceSetIndex}/device/settings:
+    x-swagger-router-controller: deviceset
     get:
       description: Get device settings
-      operationId: devicesetDeviceGet
+      operationId: devicesetDeviceSettingsGet
       tags:
         - DeviceSet
       parameters:
@@ -569,8 +571,6 @@ definitions:
         $ref: "#/definitions/LoggingInfo"
       devicesetlist:
         $ref: "#/definitions/DeviceSetList"
-      user:
-        $ref: "http://localhost:8081/User.yaml#/User"
   InstanceDevicesResponse:
     description: "Summarized information about logical devices from hardware devices attached to this SDRangel instance"
     required:
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index 6c369aa7b..6f6f7db73 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -695,665 +695,651 @@ margin-bottom: 20px;
   <script>
     // Script section to load models into a JS Var
     var defs = {}
-            defs.AudioDevice = {
-  "properties" : {
-    "name" : {
-      "type" : "string",
-      "description" : "Displayable name of the device"
-    }
-  },
-  "description" : "Audio device"
+            defs.AudioDevice = {
+  "properties" : {
+    "name" : {
+      "type" : "string",
+      "description" : "Displayable name of the device"
+    }
+  },
+  "description" : "Audio device"
 };
-            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.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.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.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.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.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.ChannelListItem = {
-  "required" : [ "id" ],
-  "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.ChannelListItem = {
+  "required" : [ "id" ],
+  "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.DVSeralDevices = {
-  "required" : [ "nbDevices" ],
-  "properties" : {
-    "nbDevices" : {
-      "type" : "integer",
-      "description" : "Number of DV serial devices"
-    },
-    "dvSerialDevices" : {
-      "type" : "array",
-      "description" : "Device names of DV serial devices",
-      "items" : {
-        "$ref" : "#/definitions/DVSerialDevice"
-      }
-    }
-  },
-  "description" : "List of DV serial devices available in the system"
+            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" : {
+        "$ref" : "#/definitions/DVSerialDevice"
+      }
+    }
+  },
+  "description" : "List of DV serial devices available in the system"
 };
-            defs.DVSerialDevice = {
-  "properties" : {
-    "deviceName" : {
-      "type" : "string",
-      "description" : "Name of the serial device in the system"
-    }
-  },
-  "description" : "DV serial device details"
+            defs.DVSerialDevice = {
+  "properties" : {
+    "deviceName" : {
+      "type" : "string",
+      "description" : "Name of the serial device in the system"
+    }
+  },
+  "description" : "DV serial device details"
 };
-            defs.DeviceListItem = {
-  "required" : [ "tx" ],
-  "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.DeviceListItem = {
+  "required" : [ "tx" ],
+  "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.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.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.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.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.DeviceSettings = {
-  "required" : [ "deviceHwType", "tx" ],
-  "discriminator" : "deviceHwType",
-  "properties" : {
-    "deviceHwType" : {
-      "type" : "string",
-      "description" : "Device hardware type code"
-    },
-    "tx" : {
-      "type" : "integer",
-      "description" : "Not zero if it is a tx device else it is a rx device"
-    },
-    "fileSourceSettings" : {
-      "$ref" : "#/definitions/FileSourceSettings"
-    },
-    "rtlSdrSettings" : {
-      "$ref" : "#/definitions/RtlSdrSettings"
-    },
-    "limeSdrInputSettings" : {
-      "$ref" : "#/definitions/LimeSdrInputSettings"
-    },
-    "limeSdrOutputSettings" : {
-      "$ref" : "#/definitions/LimeSdrOutputSettings"
-    }
-  },
-  "description" : "Base device settings"
+            defs.DeviceSettings = {
+  "required" : [ "deviceHwType", "tx" ],
+  "discriminator" : "deviceHwType",
+  "properties" : {
+    "deviceHwType" : {
+      "type" : "string",
+      "description" : "Device hardware type code"
+    },
+    "tx" : {
+      "type" : "integer",
+      "description" : "Not zero if it is a tx device else it is a rx device"
+    },
+    "fileSourceSettings" : {
+      "$ref" : "#/definitions/FileSourceSettings"
+    },
+    "rtlSdrSettings" : {
+      "$ref" : "#/definitions/RtlSdrSettings"
+    },
+    "limeSdrInputSettings" : {
+      "$ref" : "#/definitions/LimeSdrInputSettings"
+    },
+    "limeSdrOutputSettings" : {
+      "$ref" : "#/definitions/LimeSdrOutputSettings"
+    }
+  },
+  "description" : "Base device settings"
 };
-            defs.ErrorResponse = {
-  "required" : [ "message" ],
-  "properties" : {
-    "message" : {
-      "type" : "string"
-    }
-  }
+            defs.ErrorResponse = {
+  "required" : [ "message" ],
+  "properties" : {
+    "message" : {
+      "type" : "string"
+    }
+  }
 };
-            defs.FileSourceSettings = {
-  "properties" : {
-    "fileName" : {
-      "type" : "string"
-    }
-  }
+            defs.FileSourceSettings = {
+  "properties" : {
+    "fileName" : {
+      "type" : "string"
+    }
+  }
 };
-            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.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.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.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.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.InstanceSummaryResponse = {
+  "required" : [ "devicesetlist", "version" ],
+  "properties" : {
+    "version" : {
+      "type" : "string",
+      "description" : "Current software version"
+    },
+    "logging" : {
+      "$ref" : "#/definitions/LoggingInfo"
+    },
+    "devicesetlist" : {
+      "$ref" : "#/definitions/DeviceSetList"
+    }
+  },
+  "description" : "Summarized information about this SDRangel instance"
 };
-            defs.LimeSdrInputSettings = {
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "devSampleRate" : {
-      "type" : "integer"
-    },
-    "log2HardDecim" : {
-      "type" : "integer"
-    },
-    "dcBlock" : {
-      "type" : "integer"
-    },
-    "iqCorrection" : {
-      "type" : "integer"
-    },
-    "log2SoftDecim" : {
-      "type" : "integer"
-    },
-    "lpfBW" : {
-      "type" : "integer"
-    },
-    "lpfFIREnable" : {
-      "type" : "integer"
-    },
-    "lpfFIRBW" : {
-      "type" : "integer"
-    },
-    "gain" : {
-      "type" : "integer"
-    },
-    "ncoEnable" : {
-      "type" : "integer"
-    },
-    "ncoFrequency" : {
-      "type" : "integer"
-    },
-    "antennaPath" : {
-      "type" : "integer"
-    },
-    "gainMode" : {
-      "type" : "integer"
-    },
-    "lnaGain" : {
-      "type" : "integer"
-    },
-    "tiaGain" : {
-      "type" : "integer"
-    },
-    "pgaGain" : {
-      "type" : "integer"
-    },
-    "extClock" : {
-      "type" : "integer"
-    },
-    "extClockFreq" : {
-      "type" : "integer"
-    }
-  }
+            defs.LimeSdrInputSettings = {
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "devSampleRate" : {
+      "type" : "integer"
+    },
+    "log2HardDecim" : {
+      "type" : "integer"
+    },
+    "dcBlock" : {
+      "type" : "integer"
+    },
+    "iqCorrection" : {
+      "type" : "integer"
+    },
+    "log2SoftDecim" : {
+      "type" : "integer"
+    },
+    "lpfBW" : {
+      "type" : "integer"
+    },
+    "lpfFIREnable" : {
+      "type" : "integer"
+    },
+    "lpfFIRBW" : {
+      "type" : "integer"
+    },
+    "gain" : {
+      "type" : "integer"
+    },
+    "ncoEnable" : {
+      "type" : "integer"
+    },
+    "ncoFrequency" : {
+      "type" : "integer"
+    },
+    "antennaPath" : {
+      "type" : "integer"
+    },
+    "gainMode" : {
+      "type" : "integer"
+    },
+    "lnaGain" : {
+      "type" : "integer"
+    },
+    "tiaGain" : {
+      "type" : "integer"
+    },
+    "pgaGain" : {
+      "type" : "integer"
+    },
+    "extClock" : {
+      "type" : "integer"
+    },
+    "extClockFreq" : {
+      "type" : "integer"
+    }
+  }
 };
-            defs.LimeSdrOutputSettings = {
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "devSampleRate" : {
-      "type" : "integer"
-    },
-    "log2HardInterp" : {
-      "type" : "integer"
-    },
-    "log2SoftInterp" : {
-      "type" : "integer"
-    },
-    "lpfBW" : {
-      "type" : "integer"
-    },
-    "lpfFIREnable" : {
-      "type" : "integer"
-    },
-    "lpfFIRBW" : {
-      "type" : "integer"
-    },
-    "gain" : {
-      "type" : "integer"
-    },
-    "ncoEnable" : {
-      "type" : "integer"
-    },
-    "ncoFrequency" : {
-      "type" : "integer"
-    },
-    "antennaPath" : {
-      "type" : "integer"
-    },
-    "extClock" : {
-      "type" : "integer"
-    },
-    "extClockFreq" : {
-      "type" : "integer"
-    }
-  }
+            defs.LimeSdrOutputSettings = {
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "devSampleRate" : {
+      "type" : "integer"
+    },
+    "log2HardInterp" : {
+      "type" : "integer"
+    },
+    "log2SoftInterp" : {
+      "type" : "integer"
+    },
+    "lpfBW" : {
+      "type" : "integer"
+    },
+    "lpfFIREnable" : {
+      "type" : "integer"
+    },
+    "lpfFIRBW" : {
+      "type" : "integer"
+    },
+    "gain" : {
+      "type" : "integer"
+    },
+    "ncoEnable" : {
+      "type" : "integer"
+    },
+    "ncoFrequency" : {
+      "type" : "integer"
+    },
+    "antennaPath" : {
+      "type" : "integer"
+    },
+    "extClock" : {
+      "type" : "integer"
+    },
+    "extClockFreq" : {
+      "type" : "integer"
+    }
+  }
 };
-            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.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.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.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.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.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.PresetIdentifier = {
-  "required" : [ "centerFrequency", "groupName", "name", "type" ],
-  "properties" : {
-    "groupName" : {
-      "type" : "string",
-      "description" : "Name of the preset group"
-    },
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Center freqeuency in Hz"
-    },
-    "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" : "integer",
+      "format" : "int64",
+      "description" : "Center freqeuency in Hz"
+    },
+    "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.PresetItem = {
-  "required" : [ "centerFrequency", "name", "type" ],
-  "properties" : {
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64",
-      "description" : "Center freqeuency in Hz"
-    },
-    "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.PresetItem = {
+  "required" : [ "centerFrequency", "name", "type" ],
+  "properties" : {
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64",
+      "description" : "Center freqeuency in Hz"
+    },
+    "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.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.Presets = {
-  "required" : [ "nbGroups" ],
-  "properties" : {
-    "nbGroups" : {
-      "type" : "integer",
-      "description" : "Number of preset groups"
-    },
-    "groups" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/PresetGroup"
-      }
-    }
-  },
-  "description" : "Settings presets"
+            defs.Presets = {
+  "required" : [ "nbGroups" ],
+  "properties" : {
+    "nbGroups" : {
+      "type" : "integer",
+      "description" : "Number of preset groups"
+    },
+    "groups" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/PresetGroup"
+      }
+    }
+  },
+  "description" : "Settings presets"
 };
-            defs.RtlSdrSettings = {
-  "properties" : {
-    "devSampleRate" : {
-      "type" : "integer"
-    },
-    "lowSampleRate" : {
-      "type" : "integer"
-    },
-    "centerFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "gain" : {
-      "type" : "integer"
-    },
-    "loPpmCorrection" : {
-      "type" : "integer"
-    },
-    "log2Decim" : {
-      "type" : "integer"
-    },
-    "fcPos" : {
-      "type" : "integer"
-    },
-    "dcBlock" : {
-      "type" : "integer"
-    },
-    "iqImbalance" : {
-      "type" : "integer"
-    },
-    "agc" : {
-      "type" : "integer"
-    },
-    "noModMode" : {
-      "type" : "integer"
-    },
-    "transverterMode" : {
-      "type" : "integer"
-    },
-    "transverterDeltaFrequency" : {
-      "type" : "integer",
-      "format" : "int64"
-    }
-  }
+            defs.RtlSdrSettings = {
+  "properties" : {
+    "devSampleRate" : {
+      "type" : "integer"
+    },
+    "lowSampleRate" : {
+      "type" : "integer"
+    },
+    "centerFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "gain" : {
+      "type" : "integer"
+    },
+    "loPpmCorrection" : {
+      "type" : "integer"
+    },
+    "log2Decim" : {
+      "type" : "integer"
+    },
+    "fcPos" : {
+      "type" : "integer"
+    },
+    "dcBlock" : {
+      "type" : "integer"
+    },
+    "iqImbalance" : {
+      "type" : "integer"
+    },
+    "agc" : {
+      "type" : "integer"
+    },
+    "noModMode" : {
+      "type" : "integer"
+    },
+    "transverterMode" : {
+      "type" : "integer"
+    },
+    "transverterDeltaFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    }
+  }
 };
-            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"
-    }
-  }
+            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"
 };
   </script>
 
@@ -1469,7 +1455,7 @@ margin-bottom: 20px;
                         <p class="marked">Get device settings</p>
                         <p></p>
                         <br />
-                        <pre class="prettyprint language-html prettyprinted" data-type="get"><code><span class="pln">/sdrangel/deviceset/{deviceSetIndex}/device</span></code></pre>
+                        <pre class="prettyprint language-html prettyprinted" data-type="get"><code><span class="pln">/sdrangel/deviceset/{deviceSetIndex}/device/settings</span></code></pre>
                         <p>
                           <h3>Usage and SDK Samples</h3>
                         </p>
@@ -1489,7 +1475,7 @@ margin-bottom: 20px;
 
                         <div class="tab-content">
                           <div class="tab-pane active" id="examples-DeviceSet-devicesetDeviceGet-0-curl">
-                            <pre class="prettyprint"><code class="language-bsh">curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device"</code></pre>
+                            <pre class="prettyprint"><code class="language-bsh">curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device/settings"</code></pre>
                           </div>
                           <div class="tab-pane" id="examples-DeviceSet-devicesetDeviceGet-0-java">
                             <pre class="prettyprint"><code class="language-java">import SWGSDRangel.*;
@@ -1714,11 +1700,11 @@ except ApiException as e:
                                   <div id='responses-devicesetDeviceGet-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 returns current settings values",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSettings"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success returns current settings values",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSettings"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -1757,11 +1743,11 @@ except ApiException as e:
                                   <div id='responses-devicesetDeviceGet-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) {
@@ -2058,14 +2044,14 @@ except ApiException as e:
 
 <script>
 $(document).ready(function() {
-  var schemaWrapper = {
-  "in" : "body",
-  "name" : "body",
-  "description" : "Device item to look for. Give values for only the fields you want to search for among displayedName, hwType, serial, sequence and deviceSetIndex. For integers except tx set to -1 to ignore the field. It will match the first device found.",
-  "required" : true,
-  "schema" : {
-    "$ref" : "#/definitions/DeviceListItem"
-  }
+  var schemaWrapper = {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Device item to look for. Give values for only the fields you want to search for among displayedName, hwType, serial, sequence and deviceSetIndex. For integers except tx set to -1 to ignore the field. It will match the first device found.",
+  "required" : true,
+  "schema" : {
+    "$ref" : "#/definitions/DeviceListItem"
+  }
 };
   var schema = schemaWrapper.schema;
   if (schema.$ref != null) {
@@ -2106,11 +2092,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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 details on the selected device",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceListItem"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return details on the selected device",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceListItem"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2149,11 +2135,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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" : "Device set and device type mismatch (Rx vs Tx)",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Device set and device type mismatch (Rx vs Tx)",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2192,11 +2178,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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" : "Invalid device set index or device not found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid device set index or device not found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2235,11 +2221,11 @@ $(document).ready(function() {
                                   <div id='responses-devicesetDevicePut-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) {
@@ -2532,11 +2518,11 @@ except ApiException as e:
                                   <div id='responses-devicesetGet-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 details on the device set",
-  "schema" : {
-    "$ref" : "#/definitions/DeviceSet"
-  }
+                                        var schemaWrapper = {
+  "description" : "On success return details on the device set",
+  "schema" : {
+    "$ref" : "#/definitions/DeviceSet"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2575,11 +2561,11 @@ except ApiException as e:
                                   <div id='responses-devicesetGet-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" : "Invalid index",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid index",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -2618,11 +2604,11 @@ except ApiException as e:
                                   <div id='responses-devicesetGet-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) {
@@ -2878,11 +2864,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) {
@@ -2921,11 +2907,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) {
@@ -3182,14 +3168,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) {
@@ -3230,11 +3216,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) {
@@ -3273,11 +3259,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) {
@@ -3568,11 +3554,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) {
@@ -3611,11 +3597,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) {
@@ -3906,11 +3892,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) {
@@ -3949,11 +3935,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) {
@@ -4206,11 +4192,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) {
@@ -4249,11 +4235,11 @@ except ApiException as e:
                                   <div id='responses-instanceDeviceSetsDelete-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 more device sets to be deleted",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "No more device sets to be deleted",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -4292,11 +4278,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) {
@@ -4549,11 +4535,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) {
@@ -4592,11 +4578,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) {
@@ -4887,11 +4873,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) {
@@ -4930,11 +4916,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) {
@@ -5225,11 +5211,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) {
@@ -5268,11 +5254,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) {
@@ -5525,11 +5511,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) {
@@ -5568,11 +5554,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) {
@@ -5829,14 +5815,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) {
@@ -5877,11 +5863,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) {
@@ -5928,11 +5914,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) {
@@ -6185,11 +6171,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) {
@@ -6228,11 +6214,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) {
@@ -6489,14 +6475,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) {
@@ -6537,11 +6523,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) {
@@ -6580,11 +6566,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" : "Invalid data",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid data",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -6623,11 +6609,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) {
@@ -6884,14 +6870,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) {
@@ -6932,11 +6918,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) {
@@ -6975,11 +6961,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-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" : "Invalid JSON request",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7018,11 +7004,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetDelete-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" : "Preset not found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Preset not found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7061,11 +7047,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) {
@@ -7318,11 +7304,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) {
@@ -7361,11 +7347,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) {
@@ -7622,14 +7608,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) {
@@ -7670,11 +7656,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) {
@@ -7713,11 +7699,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPatch-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" : "Invalid JSON request or preset type and device set type mismatch",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request or preset type and device set type mismatch",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -7756,11 +7742,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) {
@@ -7799,11 +7785,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) {
@@ -8060,14 +8046,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) {
@@ -8108,11 +8094,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) {
@@ -8151,11 +8137,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-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" : "Invalid JSON request",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8194,11 +8180,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-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" : "Device set not found",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Device set not found",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8237,11 +8223,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPost-409-schema-409' 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" : "Preset already exists",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Preset already exists",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8280,11 +8266,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) {
@@ -8541,14 +8527,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) {
@@ -8589,11 +8575,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) {
@@ -8632,11 +8618,11 @@ $(document).ready(function() {
                                   <div id='responses-instancePresetPut-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" : "Invalid JSON request",
-  "schema" : {
-    "$ref" : "#/definitions/ErrorResponse"
-  }
+                                        var schemaWrapper = {
+  "description" : "Invalid JSON request",
+  "schema" : {
+    "$ref" : "#/definitions/ErrorResponse"
+  }
 };
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
@@ -8675,11 +8661,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) {
@@ -8718,11 +8704,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) {
@@ -8975,11 +8961,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) {
@@ -9018,11 +9004,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) {
@@ -9072,7 +9058,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2017-12-06T19:21:13.596+01:00
+              Generated 2017-12-06T21:52:02.995+01:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSetApi.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSetApi.cpp
index f72a894b0..fbe15fa6e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceSetApi.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSetApi.cpp
@@ -31,7 +31,7 @@ SWGDeviceSetApi::SWGDeviceSetApi(QString host, QString basePath) {
 void
 SWGDeviceSetApi::devicesetDeviceGet(qint32 device_set_index) {
     QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/sdrangel/deviceset/{deviceSetIndex}/device");
+    fullPath.append(this->host).append(this->basePath).append("/sdrangel/deviceset/{deviceSetIndex}/device/settings");
 
     QString device_set_indexPathParam("{"); device_set_indexPathParam.append("deviceSetIndex").append("}");
     fullPath.replace(device_set_indexPathParam, stringValue(device_set_index));
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp
index 44926ab49..4f880b415 100644
--- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp
@@ -40,7 +40,6 @@ SWGInstanceSummaryResponse::init() {
     version = new QString("");
     logging = new SWGLoggingInfo();
     devicesetlist = new SWGDeviceSetList();
-    user = new SWGUser();
 }
 
 void
@@ -57,10 +56,6 @@ SWGInstanceSummaryResponse::cleanup() {
     if(devicesetlist != nullptr) {
         delete devicesetlist;
     }
-
-    if(user != nullptr) {
-        delete user;
-    }
 }
 
 SWGInstanceSummaryResponse*
@@ -77,7 +72,6 @@ SWGInstanceSummaryResponse::fromJsonObject(QJsonObject &pJson) {
     ::SWGSDRangel::setValue(&version, pJson["version"], "QString", "QString");
     ::SWGSDRangel::setValue(&logging, pJson["logging"], "SWGLoggingInfo", "SWGLoggingInfo");
     ::SWGSDRangel::setValue(&devicesetlist, pJson["devicesetlist"], "SWGDeviceSetList", "SWGDeviceSetList");
-    ::SWGSDRangel::setValue(&user, pJson["user"], "SWGUser", "SWGUser");
 }
 
 QString
@@ -100,8 +94,6 @@ SWGInstanceSummaryResponse::asJsonObject() {
 
     toJsonValue(QString("devicesetlist"), devicesetlist, obj, QString("SWGDeviceSetList"));
 
-    toJsonValue(QString("user"), user, obj, QString("SWGUser"));
-
     return obj;
 }
 
@@ -132,15 +124,6 @@ SWGInstanceSummaryResponse::setDevicesetlist(SWGDeviceSetList* devicesetlist) {
     this->devicesetlist = devicesetlist;
 }
 
-SWGUser*
-SWGInstanceSummaryResponse::getUser() {
-    return user;
-}
-void
-SWGInstanceSummaryResponse::setUser(SWGUser* user) {
-    this->user = user;
-}
-
 
 }
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h
index ac09f2992..df72e9710 100644
--- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h
+++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h
@@ -24,7 +24,6 @@
 
 #include "SWGDeviceSetList.h"
 #include "SWGLoggingInfo.h"
-#include "SWGUser.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -54,15 +53,11 @@ public:
     SWGDeviceSetList* getDevicesetlist();
     void setDevicesetlist(SWGDeviceSetList* devicesetlist);
 
-    SWGUser* getUser();
-    void setUser(SWGUser* user);
-
 
 private:
     QString* version;
     SWGLoggingInfo* logging;
     SWGDeviceSetList* devicesetlist;
-    SWGUser* user;
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
index 32464bf6b..e4044fcc6 100644
--- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
+++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
@@ -41,7 +41,6 @@
 #include "SWGPresets.h"
 #include "SWGRtlSdrSettings.h"
 #include "SWGSamplingDevice.h"
-#include "SWGUser.h"
 
 namespace SWGSDRangel {
 
@@ -127,9 +126,6 @@ namespace SWGSDRangel {
     if(QString("SWGSamplingDevice").compare(type) == 0) {
       return new SWGSamplingDevice();
     }
-    if(QString("SWGUser").compare(type) == 0) {
-      return new SWGUser();
-    }
     
     return nullptr;
   }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUser.cpp b/swagger/sdrangel/code/qt5/client/SWGUser.cpp
deleted file mode 100644
index 514eb40da..000000000
--- a/swagger/sdrangel/code/qt5/client/SWGUser.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * 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 "SWGUser.h"
-
-#include "SWGHelpers.h"
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QObject>
-#include <QDebug>
-
-namespace SWGSDRangel {
-
-SWGUser::SWGUser(QString* json) {
-    init();
-    this->fromJson(*json);
-}
-
-SWGUser::SWGUser() {
-    init();
-}
-
-SWGUser::~SWGUser() {
-    this->cleanup();
-}
-
-void
-SWGUser::init() {
-    index = 0;
-    name = new QString("");
-}
-
-void
-SWGUser::cleanup() {
-    
-
-    if(name != nullptr) {
-        delete name;
-    }
-}
-
-SWGUser*
-SWGUser::fromJson(QString &json) {
-    QByteArray array (json.toStdString().c_str());
-    QJsonDocument doc = QJsonDocument::fromJson(array);
-    QJsonObject jsonObject = doc.object();
-    this->fromJsonObject(jsonObject);
-    return this;
-}
-
-void
-SWGUser::fromJsonObject(QJsonObject &pJson) {
-    ::SWGSDRangel::setValue(&index, pJson["index"], "qint32", "");
-    ::SWGSDRangel::setValue(&name, pJson["name"], "QString", "QString");
-}
-
-QString
-SWGUser::asJson ()
-{
-    QJsonObject* obj = this->asJsonObject();
-    
-    QJsonDocument doc(*obj);
-    QByteArray bytes = doc.toJson();
-    return QString(bytes);
-}
-
-QJsonObject*
-SWGUser::asJsonObject() {
-    QJsonObject* obj = new QJsonObject();
-    
-    obj->insert("index", QJsonValue(index));
-
-    toJsonValue(QString("name"), name, obj, QString("QString"));
-
-    return obj;
-}
-
-qint32
-SWGUser::getIndex() {
-    return index;
-}
-void
-SWGUser::setIndex(qint32 index) {
-    this->index = index;
-}
-
-QString*
-SWGUser::getName() {
-    return name;
-}
-void
-SWGUser::setName(QString* name) {
-    this->name = name;
-}
-
-
-}
-
diff --git a/swagger/sdrangel/code/qt5/client/SWGUser.h b/swagger/sdrangel/code/qt5/client/SWGUser.h
deleted file mode 100644
index 332d5d437..000000000
--- a/swagger/sdrangel/code/qt5/client/SWGUser.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.
- */
-
-/*
- * SWGUser.h
- * 
- * 
- */
-
-#ifndef SWGUser_H_
-#define SWGUser_H_
-
-#include <QJsonObject>
-
-
-#include <QString>
-
-#include "SWGObject.h"
-
-
-namespace SWGSDRangel {
-
-class SWGUser: public SWGObject {
-public:
-    SWGUser();
-    SWGUser(QString* json);
-    virtual ~SWGUser();
-    void init();
-    void cleanup();
-
-    QString asJson ();
-    QJsonObject* asJsonObject();
-    void fromJsonObject(QJsonObject &json);
-    SWGUser* fromJson(QString &jsonString);
-
-    qint32 getIndex();
-    void setIndex(qint32 index);
-
-    QString* getName();
-    void setName(QString* name);
-
-
-private:
-    qint32 index;
-    QString* name;
-};
-
-}
-
-#endif /* SWGUser_H_ */