From 3797f2db501b3776cce1afc8067a1d64dd0b56a3 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 26 Oct 2023 09:28:38 +0100 Subject: [PATCH 1/4] Update ADSB and FreqScanner yaml --- .../api/swagger/include/ADSBDemod.yaml | 27 +++++++++++++++++++ .../api/swagger/include/FreqScanner.yaml | 23 ++++++++-------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml b/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml index da23a93f33..53aa0c8075 100644 --- a/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml @@ -126,3 +126,30 @@ ADSBDemodReport: targetRange: type: number format: float + aircraftState: + type: array + items: + $ref: "http://swgserver:8081/api/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/swagger/sdrangel/api/swagger/include/FreqScanner.yaml b/swagger/sdrangel/api/swagger/include/FreqScanner.yaml index 34b669e464..d2bb0c510b 100644 --- a/swagger/sdrangel/api/swagger/include/FreqScanner.yaml +++ b/swagger/sdrangel/api/swagger/include/FreqScanner.yaml @@ -10,19 +10,10 @@ FreqScannerSettings: threshold: type: number format: float - m_frequencies: + frequencies: type: array items: - type: integer - format: int64 - m_enabled: - type: array - items: - type: integer - m_notes: - type: array - items: - type: string + $ref: "http://swgserver:8081/api/swagger/include/FreqScanner.yaml#/FreqScannerFrequency" channel: type: string scanTime: @@ -68,3 +59,13 @@ FreqScannerReport: properties: channelSampleRate: type: integer + +FreqScannerFrequency: + properties: + frequency: + type: integer + format: int64 + enabled: + type: integer + notes: + type: string From a20e7999d1052d346128e192f80a2c6e5c88cb5c Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Thu, 26 Oct 2023 09:35:55 +0100 Subject: [PATCH 2/4] Regen swagger files --- sdrbase/resources/webapi/doc/html2/index.html | 157 +++++++++++- .../webapi/doc/swagger/include/ADSBDemod.yaml | 27 +++ .../webapi/doc/swagger/include/AMDemod.yaml | 4 + .../doc/swagger/include/ChannelReport.yaml | 2 + .../doc/swagger/include/ChannelSettings.yaml | 2 + .../doc/swagger/include/FreqScanner.yaml | 71 ++++++ .../webapi/doc/swagger/include/RtlSdr.yaml | 2 + .../webapi/doc/swagger/include/SDRPlayV3.yaml | 3 + swagger/sdrangel/code/html2/index.html | 157 +++++++++++- .../qt5/client/SWGADSBDemodAircraftState.cpp | 227 ++++++++++++++++++ .../qt5/client/SWGADSBDemodAircraftState.h | 89 +++++++ .../code/qt5/client/SWGADSBDemodReport.cpp | 29 +++ .../code/qt5/client/SWGADSBDemodReport.h | 8 + .../code/qt5/client/SWGAMDemodSettings.cpp | 53 ++-- .../code/qt5/client/SWGAMDemodSettings.h | 4 +- .../qt5/client/SWGFreqScannerFrequency.cpp | 156 ++++++++++++ .../code/qt5/client/SWGFreqScannerFrequency.h | 71 ++++++ .../qt5/client/SWGFreqScannerSettings.cpp | 86 ++----- .../code/qt5/client/SWGFreqScannerSettings.h | 21 +- .../code/qt5/client/SWGModelFactory.h | 12 + 20 files changed, 1066 insertions(+), 115 deletions(-) create mode 100644 sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml create mode 100644 swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGADSBDemodAircraftState.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGFreqScannerFrequency.h diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index e2797e2844..3be7af1e86 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -696,6 +696,36 @@