diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index e2797e284..3be7af1e8 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -696,6 +696,36 @@ margin-bottom: 20px;
   <script>
     // Script section to load models into a JS Var
     var defs = {}
+            defs.ADSBDemodAircraftState = {
+  "properties" : {
+    "icao" : {
+      "type" : "string",
+      "description" : "24-bit hex ICAO identifier"
+    },
+    "callsign" : {
+      "type" : "string",
+      "description" : "Callsign (E.g. BAW123)"
+    },
+    "latitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Latitude of aircraft in degrees"
+    },
+    "longitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Longitude of aircraft in degrees"
+    },
+    "altitude" : {
+      "type" : "integer",
+      "description" : "Altitude of aircraft in feet"
+    },
+    "groundSpeed" : {
+      "type" : "integer",
+      "description" : "Groundspeed of aircraft in knots"
+    }
+  }
+};
             defs.ADSBDemodReport = {
   "properties" : {
     "channelPowerDB" : {
@@ -720,6 +750,12 @@ margin-bottom: 20px;
     "targetRange" : {
       "type" : "number",
       "format" : "float"
+    },
+    "aircraftState" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/ADSBDemodAircraftState"
+      }
     }
   },
   "description" : "ADSBDemod"
@@ -1399,6 +1435,11 @@ margin-bottom: 20px;
       "format" : "float",
       "description" : "channel RF bandwidth in Hz (floors to next 100 Hz)"
     },
+    "afBandwidth" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "AF bandwidth in Hz"
+    },
     "squelch" : {
       "type" : "number",
       "format" : "float",
@@ -3797,6 +3838,9 @@ margin-bottom: 20px;
     "FreeDVModReport" : {
       "$ref" : "#/definitions/FreeDVModReport"
     },
+    "FreqScannerReport" : {
+      "$ref" : "#/definitions/FreqScannerReport"
+    },
     "FreqTrackerReport" : {
       "$ref" : "#/definitions/FreqTrackerReport"
     },
@@ -3973,6 +4017,9 @@ margin-bottom: 20px;
     "FreeDVModSettings" : {
       "$ref" : "#/definitions/FreeDVModSettings"
     },
+    "FreqScannerSettings" : {
+      "$ref" : "#/definitions/FreqScannerSettings"
+    },
     "FreqTrackerSettings" : {
       "$ref" : "#/definitions/FreqTrackerSettings"
     },
@@ -6935,6 +6982,107 @@ margin-bottom: 20px;
     }
   },
   "description" : "FreeDVMod"
+};
+            defs.FreqScannerFrequency = {
+  "properties" : {
+    "frequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "enabled" : {
+      "type" : "integer"
+    },
+    "notes" : {
+      "type" : "string"
+    }
+  }
+};
+            defs.FreqScannerReport = {
+  "properties" : {
+    "channelSampleRate" : {
+      "type" : "integer"
+    }
+  },
+  "description" : "FreqScanner"
+};
+            defs.FreqScannerSettings = {
+  "properties" : {
+    "channelBandwidth" : {
+      "type" : "integer",
+      "description" : "channel RF bandwidth in Hz"
+    },
+    "channelFrequencyOffset" : {
+      "type" : "integer",
+      "description" : "channel center frequency shift from baseband center in Hz"
+    },
+    "threshold" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "frequencies" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/FreqScannerFrequency"
+      }
+    },
+    "channel" : {
+      "type" : "string"
+    },
+    "scanTime" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "retransmitTime" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "tuneTime" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "priority" : {
+      "type" : "integer"
+    },
+    "measurement" : {
+      "type" : "integer"
+    },
+    "mode" : {
+      "type" : "integer"
+    },
+    "rgbColor" : {
+      "type" : "integer"
+    },
+    "title" : {
+      "type" : "string"
+    },
+    "streamIndex" : {
+      "type" : "integer",
+      "description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
+    },
+    "useReverseAPI" : {
+      "type" : "integer",
+      "description" : "Synchronize with reverse API (1 for yes, 0 for no)"
+    },
+    "reverseAPIAddress" : {
+      "type" : "string"
+    },
+    "reverseAPIPort" : {
+      "type" : "integer"
+    },
+    "reverseAPIDeviceIndex" : {
+      "type" : "integer"
+    },
+    "reverseAPIChannelIndex" : {
+      "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
+    },
+    "rollupState" : {
+      "$ref" : "#/definitions/RollupState"
+    }
+  },
+  "description" : "FreqScanner"
 };
             defs.FreqTrackerReport = {
   "properties" : {
@@ -13080,6 +13228,9 @@ margin-bottom: 20px;
       "items" : {
         "$ref" : "#/definitions/Gain"
       }
+    },
+    "tunerType" : {
+      "type" : "string"
     }
   },
   "description" : "RTLSDR"
@@ -13309,6 +13460,10 @@ margin-bottom: 20px;
     "lnaIndex" : {
       "type" : "integer"
     },
+    "lnaGain" : {
+      "type" : "integer",
+      "description" : "Gain in dB, as an alternative to lnaIndex setting"
+    },
     "ifAGC" : {
       "type" : "integer"
     },
@@ -58206,7 +58361,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2023-09-13T05:10:07.874+02:00
+              Generated 2023-10-26T10:32:08.802+02:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml
index ac539d159..e61ffe145 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml
@@ -126,3 +126,30 @@ ADSBDemodReport:
     targetRange:
       type: number
       format: float
+    aircraftState:
+      type: array
+      items:
+        $ref: "/doc/swagger/include/ADSBDemod.yaml#/ADSBDemodAircraftState"
+
+ADSBDemodAircraftState:
+  properties:
+    icao:
+      description: "24-bit hex ICAO identifier"
+      type: string
+    callsign:
+      description: "Callsign (E.g. BAW123)"
+      type: string
+    latitude:
+      description: "Latitude of aircraft in degrees"
+      type: number
+      format: float
+    longitude:
+      description: "Longitude of aircraft in degrees"
+      type: number
+      format: float
+    altitude:
+      description: "Altitude of aircraft in feet"
+      type: integer
+    groundSpeed:
+      description: "Groundspeed of aircraft in knots"
+      type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml
index 5be1b548e..ed5312cf4 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml
@@ -9,6 +9,10 @@ AMDemodSettings:
       description: channel RF bandwidth in Hz (floors to next 100 Hz)
       type: number
       format: float
+    afBandwidth:
+      description: AF bandwidth in Hz
+      type: number
+      format: float
     squelch:
       description: power squelch threshold in decibels
       type: number
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
index 3a3e216d6..45ce8e560 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
@@ -49,6 +49,8 @@ ChannelReport:
       $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodReport"
     FreeDVModReport:
       $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModReport"
+    FreqScannerReport:
+      $ref: "/doc/swagger/include/FreqScanner.yaml#/FreqScannerReport"
     FreqTrackerReport:
       $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerReport"
     FT8DemodReport:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
index b8bbdbb0c..bb277fe10 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
@@ -63,6 +63,8 @@ ChannelSettings:
       $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings"
     FreeDVModSettings:
       $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModSettings"
+    FreqScannerSettings:
+      $ref: "/doc/swagger/include/FreqScanner.yaml#/FreqScannerSettings"
     FreqTrackerSettings:
       $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerSettings"
     FT8DemodSettings:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml
new file mode 100644
index 000000000..866c118f3
--- /dev/null
+++ b/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml
@@ -0,0 +1,71 @@
+FreqScannerSettings:
+  description: FreqScanner
+  properties:
+    channelBandwidth:
+      description: channel RF bandwidth in Hz
+      type: integer
+    channelFrequencyOffset:
+      description: channel center frequency shift from baseband center in Hz
+      type: integer
+    threshold:
+      type: number
+      format: float
+    frequencies:
+      type: array
+      items:
+        $ref: "/doc/swagger/include/FreqScanner.yaml#/FreqScannerFrequency"
+    channel:
+      type: string
+    scanTime:
+      type: number
+      format: float
+    retransmitTime:
+      type: number
+      format: float
+    tuneTime:
+      type: number
+      format: float
+    priority:
+      type: integer
+    measurement:
+      type: integer
+    mode:
+      type: integer
+    rgbColor:
+      type: integer
+    title:
+      type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
+    useReverseAPI:
+      description: Synchronize with reverse API (1 for yes, 0 for no)
+      type: integer
+    reverseAPIAddress:
+      type: string
+    reverseAPIPort:
+      type: integer
+    reverseAPIDeviceIndex:
+      type: integer
+    reverseAPIChannelIndex:
+      type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
+    rollupState:
+      $ref: "/doc/swagger/include/RollupState.yaml#/RollupState"
+
+FreqScannerReport:
+  description: FreqScanner
+  properties:
+    channelSampleRate:
+      type: integer
+
+FreqScannerFrequency:
+  properties:
+    frequency:
+      type: integer
+      format: int64
+    enabled:
+      type: integer
+    notes:
+      type: string
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
index 253012cc9..96773c026 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
@@ -62,3 +62,5 @@ RtlSdrReport:
       type: array
       items:
         $ref: "/doc/swagger/include/Structs.yaml#/Gain"
+    tunerType:
+      type: string
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml
index 4854cb601..b383ae214 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml
@@ -22,6 +22,9 @@ SDRPlayV3Settings:
       type: integer
     lnaIndex:
       type: integer
+    lnaGain:
+      description: Gain in dB, as an alternative to lnaIndex setting
+      type: integer
     ifAGC:
       type: integer
     ifGain:
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index e2797e284..3be7af1e8 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -696,6 +696,36 @@ margin-bottom: 20px;
   <script>
     // Script section to load models into a JS Var
     var defs = {}
+            defs.ADSBDemodAircraftState = {
+  "properties" : {
+    "icao" : {
+      "type" : "string",
+      "description" : "24-bit hex ICAO identifier"
+    },
+    "callsign" : {
+      "type" : "string",
+      "description" : "Callsign (E.g. BAW123)"
+    },
+    "latitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Latitude of aircraft in degrees"
+    },
+    "longitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Longitude of aircraft in degrees"
+    },
+    "altitude" : {
+      "type" : "integer",
+      "description" : "Altitude of aircraft in feet"
+    },
+    "groundSpeed" : {
+      "type" : "integer",
+      "description" : "Groundspeed of aircraft in knots"
+    }
+  }
+};
             defs.ADSBDemodReport = {
   "properties" : {
     "channelPowerDB" : {
@@ -720,6 +750,12 @@ margin-bottom: 20px;
     "targetRange" : {
       "type" : "number",
       "format" : "float"
+    },
+    "aircraftState" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/ADSBDemodAircraftState"
+      }
     }
   },
   "description" : "ADSBDemod"
@@ -1399,6 +1435,11 @@ margin-bottom: 20px;
       "format" : "float",
       "description" : "channel RF bandwidth in Hz (floors to next 100 Hz)"
     },
+    "afBandwidth" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "AF bandwidth in Hz"
+    },
     "squelch" : {
       "type" : "number",
       "format" : "float",
@@ -3797,6 +3838,9 @@ margin-bottom: 20px;
     "FreeDVModReport" : {
       "$ref" : "#/definitions/FreeDVModReport"
     },
+    "FreqScannerReport" : {
+      "$ref" : "#/definitions/FreqScannerReport"
+    },
     "FreqTrackerReport" : {
       "$ref" : "#/definitions/FreqTrackerReport"
     },
@@ -3973,6 +4017,9 @@ margin-bottom: 20px;
     "FreeDVModSettings" : {
       "$ref" : "#/definitions/FreeDVModSettings"
     },
+    "FreqScannerSettings" : {
+      "$ref" : "#/definitions/FreqScannerSettings"
+    },
     "FreqTrackerSettings" : {
       "$ref" : "#/definitions/FreqTrackerSettings"
     },
@@ -6935,6 +6982,107 @@ margin-bottom: 20px;
     }
   },
   "description" : "FreeDVMod"
+};
+            defs.FreqScannerFrequency = {
+  "properties" : {
+    "frequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "enabled" : {
+      "type" : "integer"
+    },
+    "notes" : {
+      "type" : "string"
+    }
+  }
+};
+            defs.FreqScannerReport = {
+  "properties" : {
+    "channelSampleRate" : {
+      "type" : "integer"
+    }
+  },
+  "description" : "FreqScanner"
+};
+            defs.FreqScannerSettings = {
+  "properties" : {
+    "channelBandwidth" : {
+      "type" : "integer",
+      "description" : "channel RF bandwidth in Hz"
+    },
+    "channelFrequencyOffset" : {
+      "type" : "integer",
+      "description" : "channel center frequency shift from baseband center in Hz"
+    },
+    "threshold" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "frequencies" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/FreqScannerFrequency"
+      }
+    },
+    "channel" : {
+      "type" : "string"
+    },
+    "scanTime" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "retransmitTime" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "tuneTime" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "priority" : {
+      "type" : "integer"
+    },
+    "measurement" : {
+      "type" : "integer"
+    },
+    "mode" : {
+      "type" : "integer"
+    },
+    "rgbColor" : {
+      "type" : "integer"
+    },
+    "title" : {
+      "type" : "string"
+    },
+    "streamIndex" : {
+      "type" : "integer",
+      "description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
+    },
+    "useReverseAPI" : {
+      "type" : "integer",
+      "description" : "Synchronize with reverse API (1 for yes, 0 for no)"
+    },
+    "reverseAPIAddress" : {
+      "type" : "string"
+    },
+    "reverseAPIPort" : {
+      "type" : "integer"
+    },
+    "reverseAPIDeviceIndex" : {
+      "type" : "integer"
+    },
+    "reverseAPIChannelIndex" : {
+      "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
+    },
+    "rollupState" : {
+      "$ref" : "#/definitions/RollupState"
+    }
+  },
+  "description" : "FreqScanner"
 };
             defs.FreqTrackerReport = {
   "properties" : {
@@ -13080,6 +13228,9 @@ margin-bottom: 20px;
       "items" : {
         "$ref" : "#/definitions/Gain"
       }
+    },
+    "tunerType" : {
+      "type" : "string"
     }
   },
   "description" : "RTLSDR"
@@ -13309,6 +13460,10 @@ margin-bottom: 20px;
     "lnaIndex" : {
       "type" : "integer"
     },
+    "lnaGain" : {
+      "type" : "integer",
+      "description" : "Gain in dB, as an alternative to lnaIndex setting"
+    },
     "ifAGC" : {
       "type" : "integer"
     },
@@ -58206,7 +58361,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2023-09-13T05:10:07.874+02:00
+              Generated 2023-10-26T10:32:08.802+02:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.cpp b/swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.cpp
new file mode 100644
index 000000000..f4b459a1c
--- /dev/null
+++ b/swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.cpp
@@ -0,0 +1,227 @@
+/**
+ * SDRangel
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
+ *
+ * OpenAPI spec version: 7.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 "SWGADSBDemodAircraftState.h"
+
+#include "SWGHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace SWGSDRangel {
+
+SWGADSBDemodAircraftState::SWGADSBDemodAircraftState(QString* json) {
+    init();
+    this->fromJson(*json);
+}
+
+SWGADSBDemodAircraftState::SWGADSBDemodAircraftState() {
+    icao = nullptr;
+    m_icao_isSet = false;
+    callsign = nullptr;
+    m_callsign_isSet = false;
+    latitude = 0.0f;
+    m_latitude_isSet = false;
+    longitude = 0.0f;
+    m_longitude_isSet = false;
+    altitude = 0;
+    m_altitude_isSet = false;
+    ground_speed = 0;
+    m_ground_speed_isSet = false;
+}
+
+SWGADSBDemodAircraftState::~SWGADSBDemodAircraftState() {
+    this->cleanup();
+}
+
+void
+SWGADSBDemodAircraftState::init() {
+    icao = new QString("");
+    m_icao_isSet = false;
+    callsign = new QString("");
+    m_callsign_isSet = false;
+    latitude = 0.0f;
+    m_latitude_isSet = false;
+    longitude = 0.0f;
+    m_longitude_isSet = false;
+    altitude = 0;
+    m_altitude_isSet = false;
+    ground_speed = 0;
+    m_ground_speed_isSet = false;
+}
+
+void
+SWGADSBDemodAircraftState::cleanup() {
+    if(icao != nullptr) { 
+        delete icao;
+    }
+    if(callsign != nullptr) { 
+        delete callsign;
+    }
+
+
+
+
+}
+
+SWGADSBDemodAircraftState*
+SWGADSBDemodAircraftState::fromJson(QString &json) {
+    QByteArray array (json.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+    return this;
+}
+
+void
+SWGADSBDemodAircraftState::fromJsonObject(QJsonObject &pJson) {
+    ::SWGSDRangel::setValue(&icao, pJson["icao"], "QString", "QString");
+    
+    ::SWGSDRangel::setValue(&callsign, pJson["callsign"], "QString", "QString");
+    
+    ::SWGSDRangel::setValue(&latitude, pJson["latitude"], "float", "");
+    
+    ::SWGSDRangel::setValue(&longitude, pJson["longitude"], "float", "");
+    
+    ::SWGSDRangel::setValue(&altitude, pJson["altitude"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&ground_speed, pJson["groundSpeed"], "qint32", "");
+    
+}
+
+QString
+SWGADSBDemodAircraftState::asJson ()
+{
+    QJsonObject* obj = this->asJsonObject();
+
+    QJsonDocument doc(*obj);
+    QByteArray bytes = doc.toJson();
+    delete obj;
+    return QString(bytes);
+}
+
+QJsonObject*
+SWGADSBDemodAircraftState::asJsonObject() {
+    QJsonObject* obj = new QJsonObject();
+    if(icao != nullptr && *icao != QString("")){
+        toJsonValue(QString("icao"), icao, obj, QString("QString"));
+    }
+    if(callsign != nullptr && *callsign != QString("")){
+        toJsonValue(QString("callsign"), callsign, obj, QString("QString"));
+    }
+    if(m_latitude_isSet){
+        obj->insert("latitude", QJsonValue(latitude));
+    }
+    if(m_longitude_isSet){
+        obj->insert("longitude", QJsonValue(longitude));
+    }
+    if(m_altitude_isSet){
+        obj->insert("altitude", QJsonValue(altitude));
+    }
+    if(m_ground_speed_isSet){
+        obj->insert("groundSpeed", QJsonValue(ground_speed));
+    }
+
+    return obj;
+}
+
+QString*
+SWGADSBDemodAircraftState::getIcao() {
+    return icao;
+}
+void
+SWGADSBDemodAircraftState::setIcao(QString* icao) {
+    this->icao = icao;
+    this->m_icao_isSet = true;
+}
+
+QString*
+SWGADSBDemodAircraftState::getCallsign() {
+    return callsign;
+}
+void
+SWGADSBDemodAircraftState::setCallsign(QString* callsign) {
+    this->callsign = callsign;
+    this->m_callsign_isSet = true;
+}
+
+float
+SWGADSBDemodAircraftState::getLatitude() {
+    return latitude;
+}
+void
+SWGADSBDemodAircraftState::setLatitude(float latitude) {
+    this->latitude = latitude;
+    this->m_latitude_isSet = true;
+}
+
+float
+SWGADSBDemodAircraftState::getLongitude() {
+    return longitude;
+}
+void
+SWGADSBDemodAircraftState::setLongitude(float longitude) {
+    this->longitude = longitude;
+    this->m_longitude_isSet = true;
+}
+
+qint32
+SWGADSBDemodAircraftState::getAltitude() {
+    return altitude;
+}
+void
+SWGADSBDemodAircraftState::setAltitude(qint32 altitude) {
+    this->altitude = altitude;
+    this->m_altitude_isSet = true;
+}
+
+qint32
+SWGADSBDemodAircraftState::getGroundSpeed() {
+    return ground_speed;
+}
+void
+SWGADSBDemodAircraftState::setGroundSpeed(qint32 ground_speed) {
+    this->ground_speed = ground_speed;
+    this->m_ground_speed_isSet = true;
+}
+
+
+bool
+SWGADSBDemodAircraftState::isSet(){
+    bool isObjectUpdated = false;
+    do{
+        if(icao && *icao != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(callsign && *callsign != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_latitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_longitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_altitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ground_speed_isSet){
+            isObjectUpdated = true; break;
+        }
+    }while(false);
+    return isObjectUpdated;
+}
+}
+
diff --git a/swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.h b/swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.h
new file mode 100644
index 000000000..188de75c1
--- /dev/null
+++ b/swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.h
@@ -0,0 +1,89 @@
+/**
+ * SDRangel
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
+ *
+ * OpenAPI spec version: 7.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.
+ */
+
+/*
+ * SWGADSBDemodAircraftState.h
+ *
+ * 
+ */
+
+#ifndef SWGADSBDemodAircraftState_H_
+#define SWGADSBDemodAircraftState_H_
+
+#include <QJsonObject>
+
+
+#include <QString>
+
+#include "SWGObject.h"
+#include "export.h"
+
+namespace SWGSDRangel {
+
+class SWG_API SWGADSBDemodAircraftState: public SWGObject {
+public:
+    SWGADSBDemodAircraftState();
+    SWGADSBDemodAircraftState(QString* json);
+    virtual ~SWGADSBDemodAircraftState();
+    void init();
+    void cleanup();
+
+    virtual QString asJson () override;
+    virtual QJsonObject* asJsonObject() override;
+    virtual void fromJsonObject(QJsonObject &json) override;
+    virtual SWGADSBDemodAircraftState* fromJson(QString &jsonString) override;
+
+    QString* getIcao();
+    void setIcao(QString* icao);
+
+    QString* getCallsign();
+    void setCallsign(QString* callsign);
+
+    float getLatitude();
+    void setLatitude(float latitude);
+
+    float getLongitude();
+    void setLongitude(float longitude);
+
+    qint32 getAltitude();
+    void setAltitude(qint32 altitude);
+
+    qint32 getGroundSpeed();
+    void setGroundSpeed(qint32 ground_speed);
+
+
+    virtual bool isSet() override;
+
+private:
+    QString* icao;
+    bool m_icao_isSet;
+
+    QString* callsign;
+    bool m_callsign_isSet;
+
+    float latitude;
+    bool m_latitude_isSet;
+
+    float longitude;
+    bool m_longitude_isSet;
+
+    qint32 altitude;
+    bool m_altitude_isSet;
+
+    qint32 ground_speed;
+    bool m_ground_speed_isSet;
+
+};
+
+}
+
+#endif /* SWGADSBDemodAircraftState_H_ */
diff --git a/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.cpp
index e5ca7ca7d..af0d45484 100644
--- a/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.cpp
@@ -40,6 +40,8 @@ SWGADSBDemodReport::SWGADSBDemodReport() {
     m_target_elevation_isSet = false;
     target_range = 0.0f;
     m_target_range_isSet = false;
+    aircraft_state = nullptr;
+    m_aircraft_state_isSet = false;
 }
 
 SWGADSBDemodReport::~SWGADSBDemodReport() {
@@ -60,6 +62,8 @@ SWGADSBDemodReport::init() {
     m_target_elevation_isSet = false;
     target_range = 0.0f;
     m_target_range_isSet = false;
+    aircraft_state = new QList<SWGADSBDemodAircraftState*>();
+    m_aircraft_state_isSet = false;
 }
 
 void
@@ -72,6 +76,13 @@ SWGADSBDemodReport::cleanup() {
 
 
 
+    if(aircraft_state != nullptr) { 
+        auto arr = aircraft_state;
+        for(auto o: *arr) { 
+            delete o;
+        }
+        delete aircraft_state;
+    }
 }
 
 SWGADSBDemodReport*
@@ -97,6 +108,8 @@ SWGADSBDemodReport::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&target_range, pJson["targetRange"], "float", "");
     
+    
+    ::SWGSDRangel::setValue(&aircraft_state, pJson["aircraftState"], "QList", "SWGADSBDemodAircraftState");
 }
 
 QString
@@ -131,6 +144,9 @@ SWGADSBDemodReport::asJsonObject() {
     if(m_target_range_isSet){
         obj->insert("targetRange", QJsonValue(target_range));
     }
+    if(aircraft_state && aircraft_state->size() > 0){
+        toJsonArray((QList<void*>*)aircraft_state, obj, "aircraftState", "SWGADSBDemodAircraftState");
+    }
 
     return obj;
 }
@@ -195,6 +211,16 @@ SWGADSBDemodReport::setTargetRange(float target_range) {
     this->m_target_range_isSet = true;
 }
 
+QList<SWGADSBDemodAircraftState*>*
+SWGADSBDemodReport::getAircraftState() {
+    return aircraft_state;
+}
+void
+SWGADSBDemodReport::setAircraftState(QList<SWGADSBDemodAircraftState*>* aircraft_state) {
+    this->aircraft_state = aircraft_state;
+    this->m_aircraft_state_isSet = true;
+}
+
 
 bool
 SWGADSBDemodReport::isSet(){
@@ -218,6 +244,9 @@ SWGADSBDemodReport::isSet(){
         if(m_target_range_isSet){
             isObjectUpdated = true; break;
         }
+        if(aircraft_state && (aircraft_state->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.h b/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.h
index cae499beb..b4d01a463 100644
--- a/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.h
+++ b/swagger/sdrangel/code/qt5/client/SWGADSBDemodReport.h
@@ -22,6 +22,8 @@
 #include <QJsonObject>
 
 
+#include "SWGADSBDemodAircraftState.h"
+#include <QList>
 #include <QString>
 
 #include "SWGObject.h"
@@ -60,6 +62,9 @@ public:
     float getTargetRange();
     void setTargetRange(float target_range);
 
+    QList<SWGADSBDemodAircraftState*>* getAircraftState();
+    void setAircraftState(QList<SWGADSBDemodAircraftState*>* aircraft_state);
+
 
     virtual bool isSet() override;
 
@@ -82,6 +87,9 @@ private:
     float target_range;
     bool m_target_range_isSet;
 
+    QList<SWGADSBDemodAircraftState*>* aircraft_state;
+    bool m_aircraft_state_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp
index a79c75089..c6bbecbea 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp
@@ -1,6 +1,6 @@
 /**
  * SDRangel
- * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    ---
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
  *
  * OpenAPI spec version: 7.0.0
  * Contact: f4exb06@gmail.com
@@ -128,26 +128,26 @@ SWGAMDemodSettings::cleanup() {
 
 
 
-    if(title != nullptr) {
+    if(title != nullptr) { 
         delete title;
     }
-    if(audio_device_name != nullptr) {
+    if(audio_device_name != nullptr) { 
         delete audio_device_name;
     }
 
 
 
 
-    if(reverse_api_address != nullptr) {
+    if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
 
 
 
-    if(channel_marker != nullptr) {
+    if(channel_marker != nullptr) { 
         delete channel_marker;
     }
-    if(rollup_state != nullptr) {
+    if(rollup_state != nullptr) { 
         delete rollup_state;
     }
 }
@@ -164,45 +164,45 @@ SWGAMDemodSettings::fromJson(QString &json) {
 void
 SWGAMDemodSettings::fromJsonObject(QJsonObject &pJson) {
     ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", "");
-
+    
     ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", "");
-
+    
     ::SWGSDRangel::setValue(&af_bandwidth, pJson["afBandwidth"], "float", "");
-
+    
     ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "float", "");
-
+    
     ::SWGSDRangel::setValue(&volume, pJson["volume"], "float", "");
-
+    
     ::SWGSDRangel::setValue(&audio_mute, pJson["audioMute"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&bandpass_enable, pJson["bandpassEnable"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
-
+    
     ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString");
-
+    
     ::SWGSDRangel::setValue(&pll, pJson["pll"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&sync_am_operation, pJson["syncAMOperation"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
-
+    
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
-
+    
     ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
-
+    
     ::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState");
-
+    
 }
 
 QString
@@ -552,3 +552,4 @@ SWGAMDemodSettings::isSet(){
     return isObjectUpdated;
 }
 }
+
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h
index 7e46a2149..fdbeabaa5 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h
@@ -1,6 +1,6 @@
 /**
  * SDRangel
- * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    ---
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
  *
  * OpenAPI spec version: 7.0.0
  * Contact: f4exb06@gmail.com
@@ -172,4 +172,4 @@ private:
 
 }
 
-#endif /* SWGAMDemodSettings_H_ */
\ No newline at end of file
+#endif /* SWGAMDemodSettings_H_ */
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.cpp
new file mode 100644
index 000000000..f3d75133e
--- /dev/null
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.cpp
@@ -0,0 +1,156 @@
+/**
+ * SDRangel
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
+ *
+ * OpenAPI spec version: 7.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 "SWGFreqScannerFrequency.h"
+
+#include "SWGHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace SWGSDRangel {
+
+SWGFreqScannerFrequency::SWGFreqScannerFrequency(QString* json) {
+    init();
+    this->fromJson(*json);
+}
+
+SWGFreqScannerFrequency::SWGFreqScannerFrequency() {
+    frequency = 0L;
+    m_frequency_isSet = false;
+    enabled = 0;
+    m_enabled_isSet = false;
+    notes = nullptr;
+    m_notes_isSet = false;
+}
+
+SWGFreqScannerFrequency::~SWGFreqScannerFrequency() {
+    this->cleanup();
+}
+
+void
+SWGFreqScannerFrequency::init() {
+    frequency = 0L;
+    m_frequency_isSet = false;
+    enabled = 0;
+    m_enabled_isSet = false;
+    notes = new QString("");
+    m_notes_isSet = false;
+}
+
+void
+SWGFreqScannerFrequency::cleanup() {
+
+
+    if(notes != nullptr) { 
+        delete notes;
+    }
+}
+
+SWGFreqScannerFrequency*
+SWGFreqScannerFrequency::fromJson(QString &json) {
+    QByteArray array (json.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+    return this;
+}
+
+void
+SWGFreqScannerFrequency::fromJsonObject(QJsonObject &pJson) {
+    ::SWGSDRangel::setValue(&frequency, pJson["frequency"], "qint64", "");
+    
+    ::SWGSDRangel::setValue(&enabled, pJson["enabled"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&notes, pJson["notes"], "QString", "QString");
+    
+}
+
+QString
+SWGFreqScannerFrequency::asJson ()
+{
+    QJsonObject* obj = this->asJsonObject();
+
+    QJsonDocument doc(*obj);
+    QByteArray bytes = doc.toJson();
+    delete obj;
+    return QString(bytes);
+}
+
+QJsonObject*
+SWGFreqScannerFrequency::asJsonObject() {
+    QJsonObject* obj = new QJsonObject();
+    if(m_frequency_isSet){
+        obj->insert("frequency", QJsonValue(frequency));
+    }
+    if(m_enabled_isSet){
+        obj->insert("enabled", QJsonValue(enabled));
+    }
+    if(notes != nullptr && *notes != QString("")){
+        toJsonValue(QString("notes"), notes, obj, QString("QString"));
+    }
+
+    return obj;
+}
+
+qint64
+SWGFreqScannerFrequency::getFrequency() {
+    return frequency;
+}
+void
+SWGFreqScannerFrequency::setFrequency(qint64 frequency) {
+    this->frequency = frequency;
+    this->m_frequency_isSet = true;
+}
+
+qint32
+SWGFreqScannerFrequency::getEnabled() {
+    return enabled;
+}
+void
+SWGFreqScannerFrequency::setEnabled(qint32 enabled) {
+    this->enabled = enabled;
+    this->m_enabled_isSet = true;
+}
+
+QString*
+SWGFreqScannerFrequency::getNotes() {
+    return notes;
+}
+void
+SWGFreqScannerFrequency::setNotes(QString* notes) {
+    this->notes = notes;
+    this->m_notes_isSet = true;
+}
+
+
+bool
+SWGFreqScannerFrequency::isSet(){
+    bool isObjectUpdated = false;
+    do{
+        if(m_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_enabled_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(notes && *notes != QString("")){
+            isObjectUpdated = true; break;
+        }
+    }while(false);
+    return isObjectUpdated;
+}
+}
+
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.h b/swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.h
new file mode 100644
index 000000000..996480723
--- /dev/null
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.h
@@ -0,0 +1,71 @@
+/**
+ * SDRangel
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
+ *
+ * OpenAPI spec version: 7.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.
+ */
+
+/*
+ * SWGFreqScannerFrequency.h
+ *
+ * 
+ */
+
+#ifndef SWGFreqScannerFrequency_H_
+#define SWGFreqScannerFrequency_H_
+
+#include <QJsonObject>
+
+
+#include <QString>
+
+#include "SWGObject.h"
+#include "export.h"
+
+namespace SWGSDRangel {
+
+class SWG_API SWGFreqScannerFrequency: public SWGObject {
+public:
+    SWGFreqScannerFrequency();
+    SWGFreqScannerFrequency(QString* json);
+    virtual ~SWGFreqScannerFrequency();
+    void init();
+    void cleanup();
+
+    virtual QString asJson () override;
+    virtual QJsonObject* asJsonObject() override;
+    virtual void fromJsonObject(QJsonObject &json) override;
+    virtual SWGFreqScannerFrequency* fromJson(QString &jsonString) override;
+
+    qint64 getFrequency();
+    void setFrequency(qint64 frequency);
+
+    qint32 getEnabled();
+    void setEnabled(qint32 enabled);
+
+    QString* getNotes();
+    void setNotes(QString* notes);
+
+
+    virtual bool isSet() override;
+
+private:
+    qint64 frequency;
+    bool m_frequency_isSet;
+
+    qint32 enabled;
+    bool m_enabled_isSet;
+
+    QString* notes;
+    bool m_notes_isSet;
+
+};
+
+}
+
+#endif /* SWGFreqScannerFrequency_H_ */
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.cpp
index f850678c2..212bb1829 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.cpp
@@ -34,12 +34,8 @@ SWGFreqScannerSettings::SWGFreqScannerSettings() {
     m_channel_frequency_offset_isSet = false;
     threshold = 0.0f;
     m_threshold_isSet = false;
-    m_frequencies = new QList<qint64>();
-    m_m_frequencies_isSet = false;
-    m_enabled = new QList<qint32>();
-    m_m_enabled_isSet = false;
-    m_notes = nullptr;
-    m_m_notes_isSet = false;
+    frequencies = nullptr;
+    m_frequencies_isSet = false;
     channel = nullptr;
     m_channel_isSet = false;
     scan_time = 0.0f;
@@ -88,12 +84,8 @@ SWGFreqScannerSettings::init() {
     m_channel_frequency_offset_isSet = false;
     threshold = 0.0f;
     m_threshold_isSet = false;
-    m_frequencies = new QList<qint64>();
-    m_m_frequencies_isSet = false;
-    m_enabled = new QList<qint32>();
-    m_m_enabled_isSet = false;
-    m_notes = new QList<QString*>();
-    m_m_notes_isSet = false;
+    frequencies = new QList<SWGFreqScannerFrequency*>();
+    m_frequencies_isSet = false;
     channel = new QString("");
     m_channel_isSet = false;
     scan_time = 0.0f;
@@ -135,14 +127,12 @@ SWGFreqScannerSettings::cleanup() {
 
 
 
-
-
-    if(m_notes != nullptr) { 
-        auto arr = m_notes;
+    if(frequencies != nullptr) { 
+        auto arr = frequencies;
         for(auto o: *arr) { 
             delete o;
         }
-        delete m_notes;
+        delete frequencies;
     }
     if(channel != nullptr) { 
         delete channel;
@@ -191,11 +181,7 @@ SWGFreqScannerSettings::fromJsonObject(QJsonObject &pJson) {
     ::SWGSDRangel::setValue(&threshold, pJson["threshold"], "float", "");
     
     
-    ::SWGSDRangel::setValue(&m_frequencies, pJson["m_frequencies"], "QList", "qint64");
-    
-    ::SWGSDRangel::setValue(&m_enabled, pJson["m_enabled"], "QList", "qint32");
-    
-    ::SWGSDRangel::setValue(&m_notes, pJson["m_notes"], "QList", "QString");
+    ::SWGSDRangel::setValue(&frequencies, pJson["frequencies"], "QList", "SWGFreqScannerFrequency");
     ::SWGSDRangel::setValue(&channel, pJson["channel"], "QString", "QString");
     
     ::SWGSDRangel::setValue(&scan_time, pJson["scanTime"], "float", "");
@@ -255,14 +241,8 @@ SWGFreqScannerSettings::asJsonObject() {
     if(m_threshold_isSet){
         obj->insert("threshold", QJsonValue(threshold));
     }
-    if(m_frequencies && m_frequencies->size() > 0){
-        toJsonArray((QList<void*>*)m_frequencies, obj, "m_frequencies", "");
-    }
-    if(m_enabled && m_enabled->size() > 0){
-        toJsonArray((QList<void*>*)m_enabled, obj, "m_enabled", "");
-    }
-    if(m_notes && m_notes->size() > 0){
-        toJsonArray((QList<void*>*)m_notes, obj, "m_notes", "QString");
+    if(frequencies && frequencies->size() > 0){
+        toJsonArray((QList<void*>*)frequencies, obj, "frequencies", "SWGFreqScannerFrequency");
     }
     if(channel != nullptr && *channel != QString("")){
         toJsonValue(QString("channel"), channel, obj, QString("QString"));
@@ -349,34 +329,14 @@ SWGFreqScannerSettings::setThreshold(float threshold) {
     this->m_threshold_isSet = true;
 }
 
-QList<qint64>*
-SWGFreqScannerSettings::getMFrequencies() {
-    return m_frequencies;
+QList<SWGFreqScannerFrequency*>*
+SWGFreqScannerSettings::getFrequencies() {
+    return frequencies;
 }
 void
-SWGFreqScannerSettings::setMFrequencies(QList<qint64>* m_frequencies) {
-    this->m_frequencies = m_frequencies;
-    this->m_m_frequencies_isSet = true;
-}
-
-QList<qint32>*
-SWGFreqScannerSettings::getMEnabled() {
-    return m_enabled;
-}
-void
-SWGFreqScannerSettings::setMEnabled(QList<qint32>* m_enabled) {
-    this->m_enabled = m_enabled;
-    this->m_m_enabled_isSet = true;
-}
-
-QList<QString*>*
-SWGFreqScannerSettings::getMNotes() {
-    return m_notes;
-}
-void
-SWGFreqScannerSettings::setMNotes(QList<QString*>* m_notes) {
-    this->m_notes = m_notes;
-    this->m_m_notes_isSet = true;
+SWGFreqScannerSettings::setFrequencies(QList<SWGFreqScannerFrequency*>* frequencies) {
+    this->frequencies = frequencies;
+    this->m_frequencies_isSet = true;
 }
 
 QString*
@@ -563,19 +523,7 @@ SWGFreqScannerSettings::isSet(){
         if(m_threshold_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_m_frequencies_isSet){
-            isObjectUpdated = true; break;
-        }
-        if(m_frequencies && (m_frequencies->size() > 0)){
-            isObjectUpdated = true; break;
-        }
-        if(m_m_enabled_isSet){
-            isObjectUpdated = true; break;
-        }
-        if(m_enabled && (m_enabled->size() > 0)){
-            isObjectUpdated = true; break;
-        }
-        if(m_notes && (m_notes->size() > 0)){
+        if(frequencies && (frequencies->size() > 0)){
             isObjectUpdated = true; break;
         }
         if(channel && *channel != QString("")){
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.h b/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.h
index a166b027b..f9bc3a81f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqScannerSettings.h
@@ -23,6 +23,7 @@
 
 
 #include "SWGChannelMarker.h"
+#include "SWGFreqScannerFrequency.h"
 #include "SWGRollupState.h"
 #include <QList>
 #include <QString>
@@ -54,14 +55,8 @@ public:
     float getThreshold();
     void setThreshold(float threshold);
 
-    QList<qint64>* getMFrequencies();
-    void setMFrequencies(QList<qint64>* m_frequencies);
-
-    QList<qint32>* getMEnabled();
-    void setMEnabled(QList<qint32>* m_enabled);
-
-    QList<QString*>* getMNotes();
-    void setMNotes(QList<QString*>* m_notes);
+    QList<SWGFreqScannerFrequency*>* getFrequencies();
+    void setFrequencies(QList<SWGFreqScannerFrequency*>* frequencies);
 
     QString* getChannel();
     void setChannel(QString* channel);
@@ -127,14 +122,8 @@ private:
     float threshold;
     bool m_threshold_isSet;
 
-    QList<qint64>* m_frequencies;
-    bool m_m_frequencies_isSet;
-
-    QList<qint32>* m_enabled;
-    bool m_m_enabled_isSet;
-
-    QList<QString*>* m_notes;
-    bool m_m_notes_isSet;
+    QList<SWGFreqScannerFrequency*>* frequencies;
+    bool m_frequencies_isSet;
 
     QString* channel;
     bool m_channel_isSet;
diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
index f2ea14a39..be7b5cce4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
+++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
@@ -14,6 +14,7 @@
 #define ModelFactory_H_
 
 
+#include "SWGADSBDemodAircraftState.h"
 #include "SWGADSBDemodReport.h"
 #include "SWGADSBDemodSettings.h"
 #include "SWGAFCActions.h"
@@ -151,6 +152,7 @@
 #include "SWGFreeDVDemodSettings.h"
 #include "SWGFreeDVModReport.h"
 #include "SWGFreeDVModSettings.h"
+#include "SWGFreqScannerFrequency.h"
 #include "SWGFreqScannerReport.h"
 #include "SWGFreqScannerSettings.h"
 #include "SWGFreqTrackerReport.h"
@@ -372,6 +374,11 @@
 namespace SWGSDRangel {
 
   inline void* create(QString type) {
+    if(QString("SWGADSBDemodAircraftState").compare(type) == 0) {
+      SWGADSBDemodAircraftState *obj = new SWGADSBDemodAircraftState();
+      obj->init();
+      return obj;
+    }
     if(QString("SWGADSBDemodReport").compare(type) == 0) {
       SWGADSBDemodReport *obj = new SWGADSBDemodReport();
       obj->init();
@@ -1057,6 +1064,11 @@ namespace SWGSDRangel {
       obj->init();
       return obj;
     }
+    if(QString("SWGFreqScannerFrequency").compare(type) == 0) {
+      SWGFreqScannerFrequency *obj = new SWGFreqScannerFrequency();
+      obj->init();
+      return obj;
+    }
     if(QString("SWGFreqScannerReport").compare(type) == 0) {
       SWGFreqScannerReport *obj = new SWGFreqScannerReport();
       obj->init();