From 42980850ce0279f56dfee592bc4916c7468e0919 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 1 May 2022 12:15:03 +0200 Subject: [PATCH] v7: VORDemodSC to VORDemod conversion in swagger. Part of #1223 --- plugins/channelrx/demodvorsc/vordemodsc.cpp | 154 ++++++------- .../channelrx/demodvorsc/vordemodscplugin.h | 2 +- .../demodvorsc/vordemodscwebapiadapter.cpp | 4 +- plugins/feature/vorlocalizer/vorlocalizer.cpp | 42 ++-- sdrbase/resources/webapi/doc/html2/index.html | 18 +- .../doc/swagger/include/ChannelReport.yaml | 4 +- .../doc/swagger/include/ChannelSettings.yaml | 4 +- .../webapi/doc/swagger/include/VORDemod.yaml | 56 ++++- sdrbase/webapi/webapirequestmapper.cpp | 8 +- .../api/swagger/include/ChannelReport.yaml | 4 +- .../api/swagger/include/ChannelSettings.yaml | 4 +- .../{VORDemodSC.yaml => VORDemod.yaml} | 8 +- swagger/sdrangel/code/html2/index.html | 18 +- .../code/qt5/client/SWGChannelReport.cpp | 32 +-- .../code/qt5/client/SWGChannelReport.h | 10 +- .../code/qt5/client/SWGChannelSettings.cpp | 32 +-- .../code/qt5/client/SWGChannelSettings.h | 10 +- .../code/qt5/client/SWGModelFactory.h | 12 +- .../code/qt5/client/SWGVORDemodReport.cpp | 209 ++++++++++++++++++ .../code/qt5/client/SWGVORDemodReport.h | 55 +++++ .../code/qt5/client/SWGVORDemodSettings.cpp | 69 ++++-- .../code/qt5/client/SWGVORDemodSettings.h | 18 +- 22 files changed, 554 insertions(+), 219 deletions(-) rename swagger/sdrangel/api/swagger/include/{VORDemodSC.yaml => VORDemod.yaml} (96%) diff --git a/plugins/channelrx/demodvorsc/vordemodsc.cpp b/plugins/channelrx/demodvorsc/vordemodsc.cpp index ce9720311..33cc8b5ab 100644 --- a/plugins/channelrx/demodvorsc/vordemodsc.cpp +++ b/plugins/channelrx/demodvorsc/vordemodsc.cpp @@ -44,7 +44,7 @@ MESSAGE_CLASS_DEFINITION(VORDemod::MsgConfigureVORDemod, Message) -const char * const VORDemod::m_channelIdURI = "sdrangel.channel.vordemodsc"; +const char * const VORDemod::m_channelIdURI = "sdrangel.channel.vordemod"; const char * const VORDemod::m_channelId = "VORDemod"; VORDemod::VORDemod(DeviceAPI *deviceAPI) : @@ -340,8 +340,8 @@ int VORDemod::webapiSettingsGet( QString& errorMessage) { (void) errorMessage; - response.setVorDemodScSettings(new SWGSDRangel::SWGVORDemodSCSettings()); - response.getVorDemodScSettings()->init(); + response.setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings()); + response.getVorDemodSettings()->init(); webapiFormatChannelSettings(response, m_settings); return 200; } @@ -377,55 +377,55 @@ void VORDemod::webapiUpdateChannelSettings( SWGSDRangel::SWGChannelSettings& response) { if (channelSettingsKeys.contains("inputFrequencyOffset")) { - settings.m_inputFrequencyOffset = response.getVorDemodScSettings()->getInputFrequencyOffset(); + settings.m_inputFrequencyOffset = response.getVorDemodSettings()->getInputFrequencyOffset(); } if (channelSettingsKeys.contains("navId")) { - settings.m_navId = response.getVorDemodScSettings()->getNavId(); + settings.m_navId = response.getVorDemodSettings()->getNavId(); } if (channelSettingsKeys.contains("audioMute")) { - settings.m_audioMute = response.getVorDemodScSettings()->getAudioMute() != 0; + settings.m_audioMute = response.getVorDemodSettings()->getAudioMute() != 0; } if (channelSettingsKeys.contains("rgbColor")) { - settings.m_rgbColor = response.getVorDemodScSettings()->getRgbColor(); + settings.m_rgbColor = response.getVorDemodSettings()->getRgbColor(); } if (channelSettingsKeys.contains("squelch")) { - settings.m_squelch = response.getVorDemodScSettings()->getSquelch(); + settings.m_squelch = response.getVorDemodSettings()->getSquelch(); } if (channelSettingsKeys.contains("title")) { - settings.m_title = *response.getVorDemodScSettings()->getTitle(); + settings.m_title = *response.getVorDemodSettings()->getTitle(); } if (channelSettingsKeys.contains("volume")) { - settings.m_volume = response.getVorDemodScSettings()->getVolume(); + settings.m_volume = response.getVorDemodSettings()->getVolume(); } if (channelSettingsKeys.contains("audioDeviceName")) { - settings.m_audioDeviceName = *response.getVorDemodScSettings()->getAudioDeviceName(); + settings.m_audioDeviceName = *response.getVorDemodSettings()->getAudioDeviceName(); } if (channelSettingsKeys.contains("streamIndex")) { - settings.m_streamIndex = response.getVorDemodScSettings()->getStreamIndex(); + settings.m_streamIndex = response.getVorDemodSettings()->getStreamIndex(); } if (channelSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getVorDemodScSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getVorDemodSettings()->getUseReverseApi() != 0; } if (channelSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getVorDemodScSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getVorDemodSettings()->getReverseApiAddress(); } if (channelSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getVorDemodScSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getVorDemodSettings()->getReverseApiPort(); } if (channelSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getVorDemodScSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getVorDemodSettings()->getReverseApiDeviceIndex(); } if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { - settings.m_reverseAPIChannelIndex = response.getVorDemodScSettings()->getReverseApiChannelIndex(); + settings.m_reverseAPIChannelIndex = response.getVorDemodSettings()->getReverseApiChannelIndex(); } if (channelSettingsKeys.contains("identThreshold")) { - settings.m_identThreshold = response.getVorDemodScSettings()->getIdentThreshold(); + settings.m_identThreshold = response.getVorDemodSettings()->getIdentThreshold(); } if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) { - settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getVorDemodScSettings()->getChannelMarker()); + settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getVorDemodSettings()->getChannelMarker()); } if (settings.m_rollupState && channelSettingsKeys.contains("rollupState")) { - settings.m_rollupState->updateFrom(channelSettingsKeys, response.getVorDemodScSettings()->getRollupState()); + settings.m_rollupState->updateFrom(channelSettingsKeys, response.getVorDemodSettings()->getRollupState()); } } @@ -434,72 +434,72 @@ int VORDemod::webapiReportGet( QString& errorMessage) { (void) errorMessage; - response.setVorDemodScReport(new SWGSDRangel::SWGVORDemodSCReport()); - response.getVorDemodScReport()->init(); + response.setVorDemodReport(new SWGSDRangel::SWGVORDemodReport()); + response.getVorDemodReport()->init(); webapiFormatChannelReport(response); return 200; } void VORDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const VORDemodSettings& settings) { - response.getVorDemodScSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset); - response.getVorDemodScSettings()->setNavId(settings.m_navId); - response.getVorDemodScSettings()->setAudioMute(settings.m_audioMute ? 1 : 0); - response.getVorDemodScSettings()->setRgbColor(settings.m_rgbColor); - response.getVorDemodScSettings()->setSquelch(settings.m_squelch); - response.getVorDemodScSettings()->setVolume(settings.m_volume); + response.getVorDemodSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset); + response.getVorDemodSettings()->setNavId(settings.m_navId); + response.getVorDemodSettings()->setAudioMute(settings.m_audioMute ? 1 : 0); + response.getVorDemodSettings()->setRgbColor(settings.m_rgbColor); + response.getVorDemodSettings()->setSquelch(settings.m_squelch); + response.getVorDemodSettings()->setVolume(settings.m_volume); - if (response.getVorDemodScSettings()->getTitle()) { - *response.getVorDemodScSettings()->getTitle() = settings.m_title; + if (response.getVorDemodSettings()->getTitle()) { + *response.getVorDemodSettings()->getTitle() = settings.m_title; } else { - response.getVorDemodScSettings()->setTitle(new QString(settings.m_title)); + response.getVorDemodSettings()->setTitle(new QString(settings.m_title)); } - if (response.getVorDemodScSettings()->getAudioDeviceName()) { - *response.getVorDemodScSettings()->getAudioDeviceName() = settings.m_audioDeviceName; + if (response.getVorDemodSettings()->getAudioDeviceName()) { + *response.getVorDemodSettings()->getAudioDeviceName() = settings.m_audioDeviceName; } else { - response.getVorDemodScSettings()->setAudioDeviceName(new QString(settings.m_audioDeviceName)); + response.getVorDemodSettings()->setAudioDeviceName(new QString(settings.m_audioDeviceName)); } - response.getVorDemodScSettings()->setStreamIndex(settings.m_streamIndex); - response.getVorDemodScSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + response.getVorDemodSettings()->setStreamIndex(settings.m_streamIndex); + response.getVorDemodSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); - if (response.getVorDemodScSettings()->getReverseApiAddress()) { - *response.getVorDemodScSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + if (response.getVorDemodSettings()->getReverseApiAddress()) { + *response.getVorDemodSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; } else { - response.getVorDemodScSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + response.getVorDemodSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); } - response.getVorDemodScSettings()->setReverseApiPort(settings.m_reverseAPIPort); - response.getVorDemodScSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); - response.getVorDemodScSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); - response.getVorDemodScSettings()->setIdentThreshold(settings.m_identThreshold); + response.getVorDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getVorDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); + response.getVorDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); + response.getVorDemodSettings()->setIdentThreshold(settings.m_identThreshold); if (settings.m_channelMarker) { - if (response.getVorDemodScSettings()->getChannelMarker()) + if (response.getVorDemodSettings()->getChannelMarker()) { - settings.m_channelMarker->formatTo(response.getVorDemodScSettings()->getChannelMarker()); + settings.m_channelMarker->formatTo(response.getVorDemodSettings()->getChannelMarker()); } else { SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker(); settings.m_channelMarker->formatTo(swgChannelMarker); - response.getVorDemodScSettings()->setChannelMarker(swgChannelMarker); + response.getVorDemodSettings()->setChannelMarker(swgChannelMarker); } } if (settings.m_rollupState) { - if (response.getVorDemodScSettings()->getRollupState()) + if (response.getVorDemodSettings()->getRollupState()) { - settings.m_rollupState->formatTo(response.getVorDemodScSettings()->getRollupState()); + settings.m_rollupState->formatTo(response.getVorDemodSettings()->getRollupState()); } else { SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState(); settings.m_rollupState->formatTo(swgRollupState); - response.getVorDemodScSettings()->setRollupState(swgRollupState); + response.getVorDemodSettings()->setRollupState(swgRollupState); } } } @@ -510,25 +510,25 @@ void VORDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response int nbMagsqSamples; getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - response.getVorDemodScReport()->setChannelPowerDb(CalcDb::dbPower(magsqAvg)); - response.getVorDemodScReport()->setSquelch(m_basebandSink->getSquelchOpen() ? 1 : 0); - response.getVorDemodScReport()->setAudioSampleRate(m_basebandSink->getAudioSampleRate()); - response.getVorDemodScReport()->setNavId(m_settings.m_navId); - response.getVorDemodScReport()->setRadial(m_radial); - response.getVorDemodScReport()->setRefMag(m_refMag); - response.getVorDemodScReport()->setVarMag(m_varMag); + response.getVorDemodReport()->setChannelPowerDb(CalcDb::dbPower(magsqAvg)); + response.getVorDemodReport()->setSquelch(m_basebandSink->getSquelchOpen() ? 1 : 0); + response.getVorDemodReport()->setAudioSampleRate(m_basebandSink->getAudioSampleRate()); + response.getVorDemodReport()->setNavId(m_settings.m_navId); + response.getVorDemodReport()->setRadial(m_radial); + response.getVorDemodReport()->setRefMag(m_refMag); + response.getVorDemodReport()->setVarMag(m_varMag); float refMagDB = std::round(20.0*std::log10(m_refMag)); float varMagDB = std::round(20.0*std::log10(m_varMag)); bool validRefMag = refMagDB > m_settings.m_refThresholdDB; bool validVarMag = varMagDB > m_settings.m_varThresholdDB; - response.getVorDemodScReport()->setValidRadial(validRefMag && validVarMag ? 1 : 0); - response.getVorDemodScReport()->setValidRefMag(validRefMag ? 1 : 0); - response.getVorDemodScReport()->setValidVarMag(validVarMag ? 1 : 0); + response.getVorDemodReport()->setValidRadial(validRefMag && validVarMag ? 1 : 0); + response.getVorDemodReport()->setValidRefMag(validRefMag ? 1 : 0); + response.getVorDemodReport()->setValidVarMag(validVarMag ? 1 : 0); - if (response.getVorDemodScReport()->getMorseIdent()) { - *response.getVorDemodScReport()->getMorseIdent() = m_morseIdent; + if (response.getVorDemodReport()->getMorseIdent()) { + *response.getVorDemodReport()->getMorseIdent() = m_morseIdent; } else { - response.getVorDemodScReport()->setMorseIdent(new QString(m_morseIdent)); + response.getVorDemodReport()->setMorseIdent(new QString(m_morseIdent)); } } @@ -593,7 +593,7 @@ void VORDemod::sendChannelReport(QList& messagePipes) SWGSDRangel::SWGChannelReport *swgChannelReport = new SWGSDRangel::SWGChannelReport(); swgChannelReport->setDirection(0); swgChannelReport->setChannelType(new QString(m_channelId)); - swgChannelReport->setVorDemodScReport(new SWGSDRangel::SWGVORDemodSCReport()); + swgChannelReport->setVorDemodReport(new SWGSDRangel::SWGVORDemodReport()); webapiFormatChannelReport(*swgChannelReport); MainCore::MsgChannelReport *msg = MainCore::MsgChannelReport::create(this, swgChannelReport); messageQueue->push(msg); @@ -612,54 +612,54 @@ void VORDemod::webapiFormatChannelSettings( swgChannelSettings->setOriginatorChannelIndex(getIndexInDeviceSet()); swgChannelSettings->setOriginatorDeviceSetIndex(getDeviceSetIndex()); swgChannelSettings->setChannelType(new QString("VORDemod")); - swgChannelSettings->setVorDemodScSettings(new SWGSDRangel::SWGVORDemodSCSettings()); - SWGSDRangel::SWGVORDemodSCSettings *swgVORDemodSCSettings = swgChannelSettings->getVorDemodScSettings(); + swgChannelSettings->setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings()); + SWGSDRangel::SWGVORDemodSettings *swgVORDemodSettings = swgChannelSettings->getVorDemodSettings(); // transfer data that has been modified. When force is on transfer all data except reverse API data if (channelSettingsKeys.contains("inputFrequencyOffset") || force) { - swgVORDemodSCSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset); + swgVORDemodSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset); } if (channelSettingsKeys.contains("navId") || force) { - swgVORDemodSCSettings->setNavId(settings.m_navId); + swgVORDemodSettings->setNavId(settings.m_navId); } if (channelSettingsKeys.contains("audioMute") || force) { - swgVORDemodSCSettings->setAudioMute(settings.m_audioMute ? 1 : 0); + swgVORDemodSettings->setAudioMute(settings.m_audioMute ? 1 : 0); } if (channelSettingsKeys.contains("rgbColor") || force) { - swgVORDemodSCSettings->setRgbColor(settings.m_rgbColor); + swgVORDemodSettings->setRgbColor(settings.m_rgbColor); } if (channelSettingsKeys.contains("squelch") || force) { - swgVORDemodSCSettings->setSquelch(settings.m_squelch); + swgVORDemodSettings->setSquelch(settings.m_squelch); } if (channelSettingsKeys.contains("title") || force) { - swgVORDemodSCSettings->setTitle(new QString(settings.m_title)); + swgVORDemodSettings->setTitle(new QString(settings.m_title)); } if (channelSettingsKeys.contains("volume") || force) { - swgVORDemodSCSettings->setVolume(settings.m_volume); + swgVORDemodSettings->setVolume(settings.m_volume); } if (channelSettingsKeys.contains("audioDeviceName") || force) { - swgVORDemodSCSettings->setAudioDeviceName(new QString(settings.m_audioDeviceName)); + swgVORDemodSettings->setAudioDeviceName(new QString(settings.m_audioDeviceName)); } if (channelSettingsKeys.contains("streamIndex") || force) { - swgVORDemodSCSettings->setStreamIndex(settings.m_streamIndex); + swgVORDemodSettings->setStreamIndex(settings.m_streamIndex); } if (channelSettingsKeys.contains("identThreshold") || force) { - swgVORDemodSCSettings->setAudioMute(settings.m_identThreshold); + swgVORDemodSettings->setAudioMute(settings.m_identThreshold); } if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force)) { SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker(); settings.m_channelMarker->formatTo(swgChannelMarker); - swgVORDemodSCSettings->setChannelMarker(swgChannelMarker); + swgVORDemodSettings->setChannelMarker(swgChannelMarker); } if (settings.m_rollupState && (channelSettingsKeys.contains("rollupState") || force)) { SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState(); settings.m_rollupState->formatTo(swgRollupState); - swgVORDemodSCSettings->setRollupState(swgRollupState); + swgVORDemodSettings->setRollupState(swgRollupState); } } diff --git a/plugins/channelrx/demodvorsc/vordemodscplugin.h b/plugins/channelrx/demodvorsc/vordemodscplugin.h index 122af6fab..1519a9067 100644 --- a/plugins/channelrx/demodvorsc/vordemodscplugin.h +++ b/plugins/channelrx/demodvorsc/vordemodscplugin.h @@ -28,7 +28,7 @@ class BasebandSampleSink; class VORDemodPlugin : public QObject, PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "sdrangel.channel.vordemodsc") + Q_PLUGIN_METADATA(IID "sdrangel.channel.vordemod") public: explicit VORDemodPlugin(QObject* parent = NULL); diff --git a/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp b/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp index 117654b64..864984ad2 100644 --- a/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp +++ b/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp @@ -31,8 +31,8 @@ int VORDemodSCWebAPIAdapter::webapiSettingsGet( QString& errorMessage) { (void) errorMessage; - response.setVorDemodScSettings(new SWGSDRangel::SWGVORDemodSCSettings()); - response.getVorDemodScSettings()->init(); + response.setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings()); + response.getVorDemodSettings()->init(); VORDemod::webapiFormatChannelSettings(response, m_settings); return 200; diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp index 49f200264..30d8d5d58 100644 --- a/plugins/feature/vorlocalizer/vorlocalizer.cpp +++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp @@ -154,8 +154,8 @@ bool VORLocalizer::handleMessage(const Message& cmd) if (*channelType == "VORDemod") { - SWGSDRangel::SWGVORDemodSCReport *swgVORDemodSCReport = swgChannelReport->getVorDemodScReport(); - int navId = swgVORDemodSCReport->getNavId(); + SWGSDRangel::SWGVORDemodReport *swgVORDemodReport = swgChannelReport->getVorDemodReport(); + int navId = swgVORDemodReport->getNavId(); if (navId < 0) { // disregard message for unallocated channels return true; @@ -172,38 +172,38 @@ bool VORLocalizer::handleMessage(const Message& cmd) if (m_vorChannelReports.contains(navId)) { - m_vorChannelReports[navId].m_radial = swgVORDemodSCReport->getRadial(); - m_vorChannelReports[navId].m_refMag = swgVORDemodSCReport->getRefMag(); - m_vorChannelReports[navId].m_varMag = swgVORDemodSCReport->getVarMag(); - m_vorChannelReports[navId].m_validRadial = swgVORDemodSCReport->getValidRadial() != 0; - m_vorChannelReports[navId].m_validRefMag = swgVORDemodSCReport->getValidRefMag() != 0; - m_vorChannelReports[navId].m_validVarMag = swgVORDemodSCReport->getValidVarMag() != 0; - m_vorChannelReports[navId].m_morseIdent = *swgVORDemodSCReport->getMorseIdent(); + m_vorChannelReports[navId].m_radial = swgVORDemodReport->getRadial(); + m_vorChannelReports[navId].m_refMag = swgVORDemodReport->getRefMag(); + m_vorChannelReports[navId].m_varMag = swgVORDemodReport->getVarMag(); + m_vorChannelReports[navId].m_validRadial = swgVORDemodReport->getValidRadial() != 0; + m_vorChannelReports[navId].m_validRefMag = swgVORDemodReport->getValidRefMag() != 0; + m_vorChannelReports[navId].m_validVarMag = swgVORDemodReport->getValidVarMag() != 0; + m_vorChannelReports[navId].m_morseIdent = *swgVORDemodReport->getMorseIdent(); } else { m_vorChannelReports[navId] = VORChannelReport{ - swgVORDemodSCReport->getRadial(), - swgVORDemodSCReport->getRefMag(), - swgVORDemodSCReport->getVarMag(), + swgVORDemodReport->getRadial(), + swgVORDemodReport->getRefMag(), + swgVORDemodReport->getVarMag(), AverageUtil(), AverageUtil(), AverageUtil(), - swgVORDemodSCReport->getValidRadial() != 0, - swgVORDemodSCReport->getValidRefMag() != 0, - swgVORDemodSCReport->getValidVarMag() != 0, - *swgVORDemodSCReport->getMorseIdent() + swgVORDemodReport->getValidRadial() != 0, + swgVORDemodReport->getValidRefMag() != 0, + swgVORDemodReport->getValidVarMag() != 0, + *swgVORDemodReport->getMorseIdent() }; } if (m_vorChannelReports[navId].m_validRadial) { - m_vorChannelReports[navId].m_radialAvg(swgVORDemodSCReport->getRadial()); + m_vorChannelReports[navId].m_radialAvg(swgVORDemodReport->getRadial()); } if (m_vorChannelReports[navId].m_validRefMag) { - m_vorChannelReports[navId].m_refMagAvg(swgVORDemodSCReport->getRefMag()); + m_vorChannelReports[navId].m_refMagAvg(swgVORDemodReport->getRefMag()); } if (m_vorChannelReports[navId].m_validVarMag) { - m_vorChannelReports[navId].m_varMagAvg(swgVORDemodSCReport->getVarMag()); + m_vorChannelReports[navId].m_varMagAvg(swgVORDemodReport->getVarMag()); } if (getMessageQueueToGUI()) @@ -373,7 +373,7 @@ void VORLocalizer::updateChannels() { ChannelAPI *channel = deviceSet->getChannelAt(chi); - if (channel->getURI() == "sdrangel.channel.vordemodsc") + if (channel->getURI() == "sdrangel.channel.vordemod") { if (!m_availableChannels.contains(channel)) { @@ -667,7 +667,7 @@ void VORLocalizer::handleChannelAdded(int deviceSetIndex, ChannelAPI *channel) DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex]; DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine; - if (deviceSourceEngine && (channel->getURI() == "sdrangel.channel.vordemodsc")) + if (deviceSourceEngine && (channel->getURI() == "sdrangel.channel.vordemod")) { DeviceSampleSource *deviceSource = deviceSourceEngine->getSource(); quint64 deviceCenterFrequency = deviceSource->getCenterFrequency(); diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 72adae4bc..6d00be163 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3380,8 +3380,8 @@ margin-bottom: 20px; "VORDemodMCReport" : { "$ref" : "#/definitions/VORDemodMCReport" }, - "VORDemodSCReport" : { - "$ref" : "#/definitions/VORDemodSCReport" + "VORDemodReport" : { + "$ref" : "#/definitions/VORDemodReport" }, "WFMDemodReport" : { "$ref" : "#/definitions/WFMDemodReport" @@ -3541,8 +3541,8 @@ margin-bottom: 20px; "VORDemodMCSettings" : { "$ref" : "#/definitions/VORDemodMCSettings" }, - "VORDemodSCSettings" : { - "$ref" : "#/definitions/VORDemodSCSettings" + "VORDemodSettings" : { + "$ref" : "#/definitions/VORDemodSettings" }, "WFMDemodSettings" : { "$ref" : "#/definitions/WFMDemodSettings" @@ -13693,7 +13693,7 @@ margin-bottom: 20px; }, "description" : "VORDemodMC" }; - defs.VORDemodSCReport = { + defs.VORDemodReport = { "properties" : { "channelPowerDB" : { "type" : "number", @@ -13747,9 +13747,9 @@ margin-bottom: 20px; "description" : "current identification morse code transcript" } }, - "description" : "VORDemodSC" + "description" : "VORDemod" }; - defs.VORDemodSCSettings = { + defs.VORDemodSettings = { "properties" : { "inputFrequencyOffset" : { "type" : "integer", @@ -13811,7 +13811,7 @@ margin-bottom: 20px; "$ref" : "#/definitions/RollupState" } }, - "description" : "VORDemodSC" + "description" : "VORDemod" }; defs.VORLocalizerActions = { "properties" : { @@ -52552,7 +52552,7 @@ except ApiException as e:
- Generated 2022-05-01T10:49:23.866+02:00 + Generated 2022-05-01T11:46:55.368+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml index 37d2961e2..ffe69ddeb 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml @@ -79,8 +79,8 @@ ChannelReport: $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkReport" VORDemodMCReport: $ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCReport" - VORDemodSCReport: - $ref: "/doc/swagger/include/VORDemodSC.yaml#/VORDemodSCReport" + VORDemodReport: + $ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodReport" WFMDemodReport: $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodReport" WFMModReport: diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index ddd206777..6bf8bb473 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -103,8 +103,8 @@ ChannelSettings: $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings" VORDemodMCSettings: $ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings" - VORDemodSCSettings: - $ref: "/doc/swagger/include/VORDemodSC.yaml#/VORDemodSCSettings" + VORDemodSettings: + $ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodSettings" WFMDemodSettings: $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodSettings" WFMModSettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml index 6dbc27998..5ca22187b 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml @@ -1,6 +1,12 @@ -VORDemodMCSettings: - description: VORDemodMC +VORDemodSettings: + description: VORDemod properties: + inputFrequencyOffset: + type: integer + format: int64 + navId: + description: VOR unique identifier when set by VOR localizer feature + type: integer squelch: description: power squelch threshold in decibels type: number @@ -33,16 +39,13 @@ VORDemodMCSettings: identThreshold: description: Morse code ident threshold (linear SNR) type: integer - magDecAdjust: - description: Adjust radial lines on map for magnetic declination of VOR - type: integer channelMarker: $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" rollupState: $ref: "/doc/swagger/include/RollupState.yaml#/RollupState" -VORDemodMCReport: - description: VORDemodMC +VORDemodReport: + description: VORDemod properties: channelPowerDB: description: power received in channel (dB) @@ -53,3 +56,42 @@ VORDemodMCReport: type: integer audioSampleRate: type: integer + volume: + type: number + format: float + navId: + description: VOR unique identifier when set by VOR localizer feature + type: integer + radial: + description: current detected radial (degrees) + type: number + format: float + refMag: + description: current reference signal magnitude (dB) + type: number + format: float + varMag: + description: current variable signal magnitude (dB) + type: number + format: float + validRadial: + type: integer + description: > + Radial validity estimation + * 0 - Radial is invalid + * 1 - Radial is valid + validRefMag: + type: integer + description: > + Reference signal magnitude validity + * 0 - Magnitude below threshold + * 1 - Magnitude above threshold + validVarMag: + type: integer + description: > + Variable signal magnitude validity + * 0 - Magnitude below threshold + * 1 - Magnitude above threshold + morseIdent: + description: current identification morse code transcript + type: string diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 206f09281..05694994b 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -4364,8 +4364,8 @@ bool WebAPIRequestMapper::getChannelSettings( } else if (channelSettingsKey == "VORDemodSettings") { - channelSettings->setVorDemodScSettings(new SWGSDRangel::SWGVORDemodSCSettings()); - channelSettings->getVorDemodScSettings()->fromJsonObject(settingsJsonObject); + channelSettings->setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings()); + channelSettings->getVorDemodSettings()->fromJsonObject(settingsJsonObject); } else if (channelSettingsKey == "WFMDemodSettings") { @@ -5083,7 +5083,7 @@ void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings& channelSettings.setUdpSourceSettings(nullptr); channelSettings.setUdpSinkSettings(nullptr); channelSettings.setVorDemodMcSettings(nullptr); - channelSettings.setVorDemodScSettings(nullptr); + channelSettings.setVorDemodSettings(nullptr); channelSettings.setWfmDemodSettings(nullptr); channelSettings.setWfmModSettings(nullptr); } @@ -5115,7 +5115,7 @@ void WebAPIRequestMapper::resetChannelReport(SWGSDRangel::SWGChannelReport& chan channelReport.setUdpSourceReport(nullptr); channelReport.setUdpSinkReport(nullptr); channelReport.setVorDemodMcReport(nullptr); - channelReport.setVorDemodScReport(nullptr); + channelReport.setVorDemodReport(nullptr); channelReport.setWfmDemodReport(nullptr); channelReport.setWfmModReport(nullptr); } diff --git a/swagger/sdrangel/api/swagger/include/ChannelReport.yaml b/swagger/sdrangel/api/swagger/include/ChannelReport.yaml index a8585f123..f4fc3ca98 100644 --- a/swagger/sdrangel/api/swagger/include/ChannelReport.yaml +++ b/swagger/sdrangel/api/swagger/include/ChannelReport.yaml @@ -79,8 +79,8 @@ ChannelReport: $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkReport" VORDemodMCReport: $ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCReport" - VORDemodSCReport: - $ref: "http://swgserver:8081/api/swagger/include/VORDemodSC.yaml#/VORDemodSCReport" + VORDemodReport: + $ref: "http://swgserver:8081/api/swagger/include/VORDemod.yaml#/VORDemodReport" WFMDemodReport: $ref: "http://swgserver:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodReport" WFMModReport: diff --git a/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml b/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml index 59fd529a4..0f9648469 100644 --- a/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml +++ b/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml @@ -103,8 +103,8 @@ ChannelSettings: $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings" VORDemodMCSettings: $ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings" - VORDemodSCSettings: - $ref: "http://swgserver:8081/api/swagger/include/VORDemodSC.yaml#/VORDemodSCSettings" + VORDemodSettings: + $ref: "http://swgserver:8081/api/swagger/include/VORDemod.yaml#/VORDemodSettings" WFMDemodSettings: $ref: "http://swgserver:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodSettings" WFMModSettings: diff --git a/swagger/sdrangel/api/swagger/include/VORDemodSC.yaml b/swagger/sdrangel/api/swagger/include/VORDemod.yaml similarity index 96% rename from swagger/sdrangel/api/swagger/include/VORDemodSC.yaml rename to swagger/sdrangel/api/swagger/include/VORDemod.yaml index 6b675ec74..2c40fce37 100644 --- a/swagger/sdrangel/api/swagger/include/VORDemodSC.yaml +++ b/swagger/sdrangel/api/swagger/include/VORDemod.yaml @@ -1,5 +1,5 @@ -VORDemodSCSettings: - description: VORDemodSC +VORDemodSettings: + description: VORDemod properties: inputFrequencyOffset: type: integer @@ -44,8 +44,8 @@ VORDemodSCSettings: rollupState: $ref: "http://swgserver:8081/api/swagger/include/RollupState.yaml#/RollupState" -VORDemodSCReport: - description: VORDemodSC +VORDemodReport: + description: VORDemod properties: channelPowerDB: description: power received in channel (dB) diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 72adae4bc..6d00be163 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3380,8 +3380,8 @@ margin-bottom: 20px; "VORDemodMCReport" : { "$ref" : "#/definitions/VORDemodMCReport" }, - "VORDemodSCReport" : { - "$ref" : "#/definitions/VORDemodSCReport" + "VORDemodReport" : { + "$ref" : "#/definitions/VORDemodReport" }, "WFMDemodReport" : { "$ref" : "#/definitions/WFMDemodReport" @@ -3541,8 +3541,8 @@ margin-bottom: 20px; "VORDemodMCSettings" : { "$ref" : "#/definitions/VORDemodMCSettings" }, - "VORDemodSCSettings" : { - "$ref" : "#/definitions/VORDemodSCSettings" + "VORDemodSettings" : { + "$ref" : "#/definitions/VORDemodSettings" }, "WFMDemodSettings" : { "$ref" : "#/definitions/WFMDemodSettings" @@ -13693,7 +13693,7 @@ margin-bottom: 20px; }, "description" : "VORDemodMC" }; - defs.VORDemodSCReport = { + defs.VORDemodReport = { "properties" : { "channelPowerDB" : { "type" : "number", @@ -13747,9 +13747,9 @@ margin-bottom: 20px; "description" : "current identification morse code transcript" } }, - "description" : "VORDemodSC" + "description" : "VORDemod" }; - defs.VORDemodSCSettings = { + defs.VORDemodSettings = { "properties" : { "inputFrequencyOffset" : { "type" : "integer", @@ -13811,7 +13811,7 @@ margin-bottom: 20px; "$ref" : "#/definitions/RollupState" } }, - "description" : "VORDemodSC" + "description" : "VORDemod" }; defs.VORLocalizerActions = { "properties" : { @@ -52552,7 +52552,7 @@ except ApiException as e:
- Generated 2022-05-01T10:49:23.866+02:00 + Generated 2022-05-01T11:46:55.368+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp index aa0eaf3bc..e14c302eb 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp @@ -100,8 +100,8 @@ SWGChannelReport::SWGChannelReport() { m_udp_sink_report_isSet = false; vor_demod_mc_report = nullptr; m_vor_demod_mc_report_isSet = false; - vor_demod_sc_report = nullptr; - m_vor_demod_sc_report_isSet = false; + vor_demod_report = nullptr; + m_vor_demod_report_isSet = false; wfm_demod_report = nullptr; m_wfm_demod_report_isSet = false; wfm_mod_report = nullptr; @@ -186,8 +186,8 @@ SWGChannelReport::init() { m_udp_sink_report_isSet = false; vor_demod_mc_report = new SWGVORDemodMCReport(); m_vor_demod_mc_report_isSet = false; - vor_demod_sc_report = new SWGVORDemodSCReport(); - m_vor_demod_sc_report_isSet = false; + vor_demod_report = new SWGVORDemodReport(); + m_vor_demod_report_isSet = false; wfm_demod_report = new SWGWFMDemodReport(); m_wfm_demod_report_isSet = false; wfm_mod_report = new SWGWFMModReport(); @@ -302,8 +302,8 @@ SWGChannelReport::cleanup() { if(vor_demod_mc_report != nullptr) { delete vor_demod_mc_report; } - if(vor_demod_sc_report != nullptr) { - delete vor_demod_sc_report; + if(vor_demod_report != nullptr) { + delete vor_demod_report; } if(wfm_demod_report != nullptr) { delete wfm_demod_report; @@ -396,7 +396,7 @@ SWGChannelReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&vor_demod_mc_report, pJson["VORDemodMCReport"], "SWGVORDemodMCReport", "SWGVORDemodMCReport"); - ::SWGSDRangel::setValue(&vor_demod_sc_report, pJson["VORDemodSCReport"], "SWGVORDemodSCReport", "SWGVORDemodSCReport"); + ::SWGSDRangel::setValue(&vor_demod_report, pJson["VORDemodReport"], "SWGVORDemodReport", "SWGVORDemodReport"); ::SWGSDRangel::setValue(&wfm_demod_report, pJson["WFMDemodReport"], "SWGWFMDemodReport", "SWGWFMDemodReport"); @@ -526,8 +526,8 @@ SWGChannelReport::asJsonObject() { if((vor_demod_mc_report != nullptr) && (vor_demod_mc_report->isSet())){ toJsonValue(QString("VORDemodMCReport"), vor_demod_mc_report, obj, QString("SWGVORDemodMCReport")); } - if((vor_demod_sc_report != nullptr) && (vor_demod_sc_report->isSet())){ - toJsonValue(QString("VORDemodSCReport"), vor_demod_sc_report, obj, QString("SWGVORDemodSCReport")); + if((vor_demod_report != nullptr) && (vor_demod_report->isSet())){ + toJsonValue(QString("VORDemodReport"), vor_demod_report, obj, QString("SWGVORDemodReport")); } if((wfm_demod_report != nullptr) && (wfm_demod_report->isSet())){ toJsonValue(QString("WFMDemodReport"), wfm_demod_report, obj, QString("SWGWFMDemodReport")); @@ -899,14 +899,14 @@ SWGChannelReport::setVorDemodMcReport(SWGVORDemodMCReport* vor_demod_mc_report) this->m_vor_demod_mc_report_isSet = true; } -SWGVORDemodSCReport* -SWGChannelReport::getVorDemodScReport() { - return vor_demod_sc_report; +SWGVORDemodReport* +SWGChannelReport::getVorDemodReport() { + return vor_demod_report; } void -SWGChannelReport::setVorDemodScReport(SWGVORDemodSCReport* vor_demod_sc_report) { - this->vor_demod_sc_report = vor_demod_sc_report; - this->m_vor_demod_sc_report_isSet = true; +SWGChannelReport::setVorDemodReport(SWGVORDemodReport* vor_demod_report) { + this->vor_demod_report = vor_demod_report; + this->m_vor_demod_report_isSet = true; } SWGWFMDemodReport* @@ -1042,7 +1042,7 @@ SWGChannelReport::isSet(){ if(vor_demod_mc_report && vor_demod_mc_report->isSet()){ isObjectUpdated = true; break; } - if(vor_demod_sc_report && vor_demod_sc_report->isSet()){ + if(vor_demod_report && vor_demod_report->isSet()){ isObjectUpdated = true; break; } if(wfm_demod_report && wfm_demod_report->isSet()){ diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h index 87de98329..023ec6d43 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h @@ -56,7 +56,7 @@ #include "SWGUDPSinkReport.h" #include "SWGUDPSourceReport.h" #include "SWGVORDemodMCReport.h" -#include "SWGVORDemodSCReport.h" +#include "SWGVORDemodReport.h" #include "SWGWFMDemodReport.h" #include "SWGWFMModReport.h" #include @@ -187,8 +187,8 @@ public: SWGVORDemodMCReport* getVorDemodMcReport(); void setVorDemodMcReport(SWGVORDemodMCReport* vor_demod_mc_report); - SWGVORDemodSCReport* getVorDemodScReport(); - void setVorDemodScReport(SWGVORDemodSCReport* vor_demod_sc_report); + SWGVORDemodReport* getVorDemodReport(); + void setVorDemodReport(SWGVORDemodReport* vor_demod_report); SWGWFMDemodReport* getWfmDemodReport(); void setWfmDemodReport(SWGWFMDemodReport* wfm_demod_report); @@ -308,8 +308,8 @@ private: SWGVORDemodMCReport* vor_demod_mc_report; bool m_vor_demod_mc_report_isSet; - SWGVORDemodSCReport* vor_demod_sc_report; - bool m_vor_demod_sc_report_isSet; + SWGVORDemodReport* vor_demod_report; + bool m_vor_demod_report_isSet; SWGWFMDemodReport* wfm_demod_report; bool m_wfm_demod_report_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp index e396533bf..abc0dcd94 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp @@ -122,8 +122,8 @@ SWGChannelSettings::SWGChannelSettings() { m_udp_sink_settings_isSet = false; vor_demod_mc_settings = nullptr; m_vor_demod_mc_settings_isSet = false; - vor_demod_sc_settings = nullptr; - m_vor_demod_sc_settings_isSet = false; + vor_demod_settings = nullptr; + m_vor_demod_settings_isSet = false; wfm_demod_settings = nullptr; m_wfm_demod_settings_isSet = false; wfm_mod_settings = nullptr; @@ -230,8 +230,8 @@ SWGChannelSettings::init() { m_udp_sink_settings_isSet = false; vor_demod_mc_settings = new SWGVORDemodMCSettings(); m_vor_demod_mc_settings_isSet = false; - vor_demod_sc_settings = new SWGVORDemodSCSettings(); - m_vor_demod_sc_settings_isSet = false; + vor_demod_settings = new SWGVORDemodSettings(); + m_vor_demod_settings_isSet = false; wfm_demod_settings = new SWGWFMDemodSettings(); m_wfm_demod_settings_isSet = false; wfm_mod_settings = new SWGWFMModSettings(); @@ -375,8 +375,8 @@ SWGChannelSettings::cleanup() { if(vor_demod_mc_settings != nullptr) { delete vor_demod_mc_settings; } - if(vor_demod_sc_settings != nullptr) { - delete vor_demod_sc_settings; + if(vor_demod_settings != nullptr) { + delete vor_demod_settings; } if(wfm_demod_settings != nullptr) { delete wfm_demod_settings; @@ -491,7 +491,7 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&vor_demod_mc_settings, pJson["VORDemodMCSettings"], "SWGVORDemodMCSettings", "SWGVORDemodMCSettings"); - ::SWGSDRangel::setValue(&vor_demod_sc_settings, pJson["VORDemodSCSettings"], "SWGVORDemodSCSettings", "SWGVORDemodSCSettings"); + ::SWGSDRangel::setValue(&vor_demod_settings, pJson["VORDemodSettings"], "SWGVORDemodSettings", "SWGVORDemodSettings"); ::SWGSDRangel::setValue(&wfm_demod_settings, pJson["WFMDemodSettings"], "SWGWFMDemodSettings", "SWGWFMDemodSettings"); @@ -654,8 +654,8 @@ SWGChannelSettings::asJsonObject() { if((vor_demod_mc_settings != nullptr) && (vor_demod_mc_settings->isSet())){ toJsonValue(QString("VORDemodMCSettings"), vor_demod_mc_settings, obj, QString("SWGVORDemodMCSettings")); } - if((vor_demod_sc_settings != nullptr) && (vor_demod_sc_settings->isSet())){ - toJsonValue(QString("VORDemodSCSettings"), vor_demod_sc_settings, obj, QString("SWGVORDemodSCSettings")); + if((vor_demod_settings != nullptr) && (vor_demod_settings->isSet())){ + toJsonValue(QString("VORDemodSettings"), vor_demod_settings, obj, QString("SWGVORDemodSettings")); } if((wfm_demod_settings != nullptr) && (wfm_demod_settings->isSet())){ toJsonValue(QString("WFMDemodSettings"), wfm_demod_settings, obj, QString("SWGWFMDemodSettings")); @@ -1137,14 +1137,14 @@ SWGChannelSettings::setVorDemodMcSettings(SWGVORDemodMCSettings* vor_demod_mc_se this->m_vor_demod_mc_settings_isSet = true; } -SWGVORDemodSCSettings* -SWGChannelSettings::getVorDemodScSettings() { - return vor_demod_sc_settings; +SWGVORDemodSettings* +SWGChannelSettings::getVorDemodSettings() { + return vor_demod_settings; } void -SWGChannelSettings::setVorDemodScSettings(SWGVORDemodSCSettings* vor_demod_sc_settings) { - this->vor_demod_sc_settings = vor_demod_sc_settings; - this->m_vor_demod_sc_settings_isSet = true; +SWGChannelSettings::setVorDemodSettings(SWGVORDemodSettings* vor_demod_settings) { + this->vor_demod_settings = vor_demod_settings; + this->m_vor_demod_settings_isSet = true; } SWGWFMDemodSettings* @@ -1313,7 +1313,7 @@ SWGChannelSettings::isSet(){ if(vor_demod_mc_settings && vor_demod_mc_settings->isSet()){ isObjectUpdated = true; break; } - if(vor_demod_sc_settings && vor_demod_sc_settings->isSet()){ + if(vor_demod_settings && vor_demod_settings->isSet()){ isObjectUpdated = true; break; } if(wfm_demod_settings && wfm_demod_settings->isSet()){ diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h index 8f761dd7e..a87e34202 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h @@ -65,7 +65,7 @@ #include "SWGUDPSinkSettings.h" #include "SWGUDPSourceSettings.h" #include "SWGVORDemodMCSettings.h" -#include "SWGVORDemodSCSettings.h" +#include "SWGVORDemodSettings.h" #include "SWGWFMDemodSettings.h" #include "SWGWFMModSettings.h" #include @@ -229,8 +229,8 @@ public: SWGVORDemodMCSettings* getVorDemodMcSettings(); void setVorDemodMcSettings(SWGVORDemodMCSettings* vor_demod_mc_settings); - SWGVORDemodSCSettings* getVorDemodScSettings(); - void setVorDemodScSettings(SWGVORDemodSCSettings* vor_demod_sc_settings); + SWGVORDemodSettings* getVorDemodSettings(); + void setVorDemodSettings(SWGVORDemodSettings* vor_demod_settings); SWGWFMDemodSettings* getWfmDemodSettings(); void setWfmDemodSettings(SWGWFMDemodSettings* wfm_demod_settings); @@ -383,8 +383,8 @@ private: SWGVORDemodMCSettings* vor_demod_mc_settings; bool m_vor_demod_mc_settings_isSet; - SWGVORDemodSCSettings* vor_demod_sc_settings; - bool m_vor_demod_sc_settings_isSet; + SWGVORDemodSettings* vor_demod_settings; + bool m_vor_demod_settings_isSet; SWGWFMDemodSettings* wfm_demod_settings; bool m_wfm_demod_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index b237ccd2c..e5f64bc64 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -304,8 +304,8 @@ #include "SWGUSRPOutputSettings.h" #include "SWGVORDemodMCReport.h" #include "SWGVORDemodMCSettings.h" -#include "SWGVORDemodSCReport.h" -#include "SWGVORDemodSCSettings.h" +#include "SWGVORDemodReport.h" +#include "SWGVORDemodSettings.h" #include "SWGVORLocalizerActions.h" #include "SWGVORLocalizerReport.h" #include "SWGVORLocalizerSettings.h" @@ -1773,13 +1773,13 @@ namespace SWGSDRangel { obj->init(); return obj; } - if(QString("SWGVORDemodSCReport").compare(type) == 0) { - SWGVORDemodSCReport *obj = new SWGVORDemodSCReport(); + if(QString("SWGVORDemodReport").compare(type) == 0) { + SWGVORDemodReport *obj = new SWGVORDemodReport(); obj->init(); return obj; } - if(QString("SWGVORDemodSCSettings").compare(type) == 0) { - SWGVORDemodSCSettings *obj = new SWGVORDemodSCSettings(); + if(QString("SWGVORDemodSettings").compare(type) == 0) { + SWGVORDemodSettings *obj = new SWGVORDemodSettings(); obj->init(); return obj; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.cpp index b94efbd83..8d3af8628 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.cpp @@ -34,6 +34,24 @@ SWGVORDemodReport::SWGVORDemodReport() { m_squelch_isSet = false; audio_sample_rate = 0; m_audio_sample_rate_isSet = false; + volume = 0.0f; + m_volume_isSet = false; + nav_id = 0; + m_nav_id_isSet = false; + radial = 0.0f; + m_radial_isSet = false; + ref_mag = 0.0f; + m_ref_mag_isSet = false; + var_mag = 0.0f; + m_var_mag_isSet = false; + valid_radial = 0; + m_valid_radial_isSet = false; + valid_ref_mag = 0; + m_valid_ref_mag_isSet = false; + valid_var_mag = 0; + m_valid_var_mag_isSet = false; + morse_ident = nullptr; + m_morse_ident_isSet = false; } SWGVORDemodReport::~SWGVORDemodReport() { @@ -48,6 +66,24 @@ SWGVORDemodReport::init() { m_squelch_isSet = false; audio_sample_rate = 0; m_audio_sample_rate_isSet = false; + volume = 0.0f; + m_volume_isSet = false; + nav_id = 0; + m_nav_id_isSet = false; + radial = 0.0f; + m_radial_isSet = false; + ref_mag = 0.0f; + m_ref_mag_isSet = false; + var_mag = 0.0f; + m_var_mag_isSet = false; + valid_radial = 0; + m_valid_radial_isSet = false; + valid_ref_mag = 0; + m_valid_ref_mag_isSet = false; + valid_var_mag = 0; + m_valid_var_mag_isSet = false; + morse_ident = new QString(""); + m_morse_ident_isSet = false; } void @@ -55,6 +91,17 @@ SWGVORDemodReport::cleanup() { + + + + + + + + + if(morse_ident != nullptr) { + delete morse_ident; + } } SWGVORDemodReport* @@ -74,6 +121,24 @@ SWGVORDemodReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&audio_sample_rate, pJson["audioSampleRate"], "qint32", ""); + ::SWGSDRangel::setValue(&volume, pJson["volume"], "float", ""); + + ::SWGSDRangel::setValue(&nav_id, pJson["navId"], "qint32", ""); + + ::SWGSDRangel::setValue(&radial, pJson["radial"], "float", ""); + + ::SWGSDRangel::setValue(&ref_mag, pJson["refMag"], "float", ""); + + ::SWGSDRangel::setValue(&var_mag, pJson["varMag"], "float", ""); + + ::SWGSDRangel::setValue(&valid_radial, pJson["validRadial"], "qint32", ""); + + ::SWGSDRangel::setValue(&valid_ref_mag, pJson["validRefMag"], "qint32", ""); + + ::SWGSDRangel::setValue(&valid_var_mag, pJson["validVarMag"], "qint32", ""); + + ::SWGSDRangel::setValue(&morse_ident, pJson["morseIdent"], "QString", "QString"); + } QString @@ -99,6 +164,33 @@ SWGVORDemodReport::asJsonObject() { if(m_audio_sample_rate_isSet){ obj->insert("audioSampleRate", QJsonValue(audio_sample_rate)); } + if(m_volume_isSet){ + obj->insert("volume", QJsonValue(volume)); + } + if(m_nav_id_isSet){ + obj->insert("navId", QJsonValue(nav_id)); + } + if(m_radial_isSet){ + obj->insert("radial", QJsonValue(radial)); + } + if(m_ref_mag_isSet){ + obj->insert("refMag", QJsonValue(ref_mag)); + } + if(m_var_mag_isSet){ + obj->insert("varMag", QJsonValue(var_mag)); + } + if(m_valid_radial_isSet){ + obj->insert("validRadial", QJsonValue(valid_radial)); + } + if(m_valid_ref_mag_isSet){ + obj->insert("validRefMag", QJsonValue(valid_ref_mag)); + } + if(m_valid_var_mag_isSet){ + obj->insert("validVarMag", QJsonValue(valid_var_mag)); + } + if(morse_ident != nullptr && *morse_ident != QString("")){ + toJsonValue(QString("morseIdent"), morse_ident, obj, QString("QString")); + } return obj; } @@ -133,6 +225,96 @@ SWGVORDemodReport::setAudioSampleRate(qint32 audio_sample_rate) { this->m_audio_sample_rate_isSet = true; } +float +SWGVORDemodReport::getVolume() { + return volume; +} +void +SWGVORDemodReport::setVolume(float volume) { + this->volume = volume; + this->m_volume_isSet = true; +} + +qint32 +SWGVORDemodReport::getNavId() { + return nav_id; +} +void +SWGVORDemodReport::setNavId(qint32 nav_id) { + this->nav_id = nav_id; + this->m_nav_id_isSet = true; +} + +float +SWGVORDemodReport::getRadial() { + return radial; +} +void +SWGVORDemodReport::setRadial(float radial) { + this->radial = radial; + this->m_radial_isSet = true; +} + +float +SWGVORDemodReport::getRefMag() { + return ref_mag; +} +void +SWGVORDemodReport::setRefMag(float ref_mag) { + this->ref_mag = ref_mag; + this->m_ref_mag_isSet = true; +} + +float +SWGVORDemodReport::getVarMag() { + return var_mag; +} +void +SWGVORDemodReport::setVarMag(float var_mag) { + this->var_mag = var_mag; + this->m_var_mag_isSet = true; +} + +qint32 +SWGVORDemodReport::getValidRadial() { + return valid_radial; +} +void +SWGVORDemodReport::setValidRadial(qint32 valid_radial) { + this->valid_radial = valid_radial; + this->m_valid_radial_isSet = true; +} + +qint32 +SWGVORDemodReport::getValidRefMag() { + return valid_ref_mag; +} +void +SWGVORDemodReport::setValidRefMag(qint32 valid_ref_mag) { + this->valid_ref_mag = valid_ref_mag; + this->m_valid_ref_mag_isSet = true; +} + +qint32 +SWGVORDemodReport::getValidVarMag() { + return valid_var_mag; +} +void +SWGVORDemodReport::setValidVarMag(qint32 valid_var_mag) { + this->valid_var_mag = valid_var_mag; + this->m_valid_var_mag_isSet = true; +} + +QString* +SWGVORDemodReport::getMorseIdent() { + return morse_ident; +} +void +SWGVORDemodReport::setMorseIdent(QString* morse_ident) { + this->morse_ident = morse_ident; + this->m_morse_ident_isSet = true; +} + bool SWGVORDemodReport::isSet(){ @@ -147,6 +329,33 @@ SWGVORDemodReport::isSet(){ if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break; } + if(m_volume_isSet){ + isObjectUpdated = true; break; + } + if(m_nav_id_isSet){ + isObjectUpdated = true; break; + } + if(m_radial_isSet){ + isObjectUpdated = true; break; + } + if(m_ref_mag_isSet){ + isObjectUpdated = true; break; + } + if(m_var_mag_isSet){ + isObjectUpdated = true; break; + } + if(m_valid_radial_isSet){ + isObjectUpdated = true; break; + } + if(m_valid_ref_mag_isSet){ + isObjectUpdated = true; break; + } + if(m_valid_var_mag_isSet){ + isObjectUpdated = true; break; + } + if(morse_ident && *morse_ident != QString("")){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.h index b66202648..c231977e0 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodReport.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -50,6 +51,33 @@ public: qint32 getAudioSampleRate(); void setAudioSampleRate(qint32 audio_sample_rate); + float getVolume(); + void setVolume(float volume); + + qint32 getNavId(); + void setNavId(qint32 nav_id); + + float getRadial(); + void setRadial(float radial); + + float getRefMag(); + void setRefMag(float ref_mag); + + float getVarMag(); + void setVarMag(float var_mag); + + qint32 getValidRadial(); + void setValidRadial(qint32 valid_radial); + + qint32 getValidRefMag(); + void setValidRefMag(qint32 valid_ref_mag); + + qint32 getValidVarMag(); + void setValidVarMag(qint32 valid_var_mag); + + QString* getMorseIdent(); + void setMorseIdent(QString* morse_ident); + virtual bool isSet() override; @@ -63,6 +91,33 @@ private: qint32 audio_sample_rate; bool m_audio_sample_rate_isSet; + float volume; + bool m_volume_isSet; + + qint32 nav_id; + bool m_nav_id_isSet; + + float radial; + bool m_radial_isSet; + + float ref_mag; + bool m_ref_mag_isSet; + + float var_mag; + bool m_var_mag_isSet; + + qint32 valid_radial; + bool m_valid_radial_isSet; + + qint32 valid_ref_mag; + bool m_valid_ref_mag_isSet; + + qint32 valid_var_mag; + bool m_valid_var_mag_isSet; + + QString* morse_ident; + bool m_morse_ident_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp index af4fc8e3f..b70af3b6a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp @@ -28,6 +28,10 @@ SWGVORDemodSettings::SWGVORDemodSettings(QString* json) { } SWGVORDemodSettings::SWGVORDemodSettings() { + input_frequency_offset = 0L; + m_input_frequency_offset_isSet = false; + nav_id = 0; + m_nav_id_isSet = false; squelch = 0.0f; m_squelch_isSet = false; volume = 0.0f; @@ -54,8 +58,6 @@ SWGVORDemodSettings::SWGVORDemodSettings() { m_reverse_api_channel_index_isSet = false; ident_threshold = 0; m_ident_threshold_isSet = false; - mag_dec_adjust = 0; - m_mag_dec_adjust_isSet = false; channel_marker = nullptr; m_channel_marker_isSet = false; rollup_state = nullptr; @@ -68,6 +70,10 @@ SWGVORDemodSettings::~SWGVORDemodSettings() { void SWGVORDemodSettings::init() { + input_frequency_offset = 0L; + m_input_frequency_offset_isSet = false; + nav_id = 0; + m_nav_id_isSet = false; squelch = 0.0f; m_squelch_isSet = false; volume = 0.0f; @@ -94,8 +100,6 @@ SWGVORDemodSettings::init() { m_reverse_api_channel_index_isSet = false; ident_threshold = 0; m_ident_threshold_isSet = false; - mag_dec_adjust = 0; - m_mag_dec_adjust_isSet = false; channel_marker = new SWGChannelMarker(); m_channel_marker_isSet = false; rollup_state = new SWGRollupState(); @@ -108,6 +112,8 @@ SWGVORDemodSettings::cleanup() { + + if(title != nullptr) { delete title; } @@ -123,7 +129,6 @@ SWGVORDemodSettings::cleanup() { - if(channel_marker != nullptr) { delete channel_marker; } @@ -143,6 +148,10 @@ SWGVORDemodSettings::fromJson(QString &json) { void SWGVORDemodSettings::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); + + ::SWGSDRangel::setValue(&nav_id, pJson["navId"], "qint32", ""); + ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "float", ""); ::SWGSDRangel::setValue(&volume, pJson["volume"], "float", ""); @@ -169,8 +178,6 @@ SWGVORDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&ident_threshold, pJson["identThreshold"], "qint32", ""); - ::SWGSDRangel::setValue(&mag_dec_adjust, pJson["magDecAdjust"], "qint32", ""); - ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); ::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState"); @@ -191,6 +198,12 @@ SWGVORDemodSettings::asJson () QJsonObject* SWGVORDemodSettings::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_input_frequency_offset_isSet){ + obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset)); + } + if(m_nav_id_isSet){ + obj->insert("navId", QJsonValue(nav_id)); + } if(m_squelch_isSet){ obj->insert("squelch", QJsonValue(squelch)); } @@ -230,9 +243,6 @@ SWGVORDemodSettings::asJsonObject() { if(m_ident_threshold_isSet){ obj->insert("identThreshold", QJsonValue(ident_threshold)); } - if(m_mag_dec_adjust_isSet){ - obj->insert("magDecAdjust", QJsonValue(mag_dec_adjust)); - } if((channel_marker != nullptr) && (channel_marker->isSet())){ toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); } @@ -243,6 +253,26 @@ SWGVORDemodSettings::asJsonObject() { return obj; } +qint64 +SWGVORDemodSettings::getInputFrequencyOffset() { + return input_frequency_offset; +} +void +SWGVORDemodSettings::setInputFrequencyOffset(qint64 input_frequency_offset) { + this->input_frequency_offset = input_frequency_offset; + this->m_input_frequency_offset_isSet = true; +} + +qint32 +SWGVORDemodSettings::getNavId() { + return nav_id; +} +void +SWGVORDemodSettings::setNavId(qint32 nav_id) { + this->nav_id = nav_id; + this->m_nav_id_isSet = true; +} + float SWGVORDemodSettings::getSquelch() { return squelch; @@ -373,16 +403,6 @@ SWGVORDemodSettings::setIdentThreshold(qint32 ident_threshold) { this->m_ident_threshold_isSet = true; } -qint32 -SWGVORDemodSettings::getMagDecAdjust() { - return mag_dec_adjust; -} -void -SWGVORDemodSettings::setMagDecAdjust(qint32 mag_dec_adjust) { - this->mag_dec_adjust = mag_dec_adjust; - this->m_mag_dec_adjust_isSet = true; -} - SWGChannelMarker* SWGVORDemodSettings::getChannelMarker() { return channel_marker; @@ -408,6 +428,12 @@ bool SWGVORDemodSettings::isSet(){ bool isObjectUpdated = false; do{ + if(m_input_frequency_offset_isSet){ + isObjectUpdated = true; break; + } + if(m_nav_id_isSet){ + isObjectUpdated = true; break; + } if(m_squelch_isSet){ isObjectUpdated = true; break; } @@ -447,9 +473,6 @@ SWGVORDemodSettings::isSet(){ if(m_ident_threshold_isSet){ isObjectUpdated = true; break; } - if(m_mag_dec_adjust_isSet){ - isObjectUpdated = true; break; - } if(channel_marker && channel_marker->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h index 5801c69ea..234111ee1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h @@ -44,6 +44,12 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGVORDemodSettings* fromJson(QString &jsonString) override; + qint64 getInputFrequencyOffset(); + void setInputFrequencyOffset(qint64 input_frequency_offset); + + qint32 getNavId(); + void setNavId(qint32 nav_id); + float getSquelch(); void setSquelch(float squelch); @@ -83,9 +89,6 @@ public: qint32 getIdentThreshold(); void setIdentThreshold(qint32 ident_threshold); - qint32 getMagDecAdjust(); - void setMagDecAdjust(qint32 mag_dec_adjust); - SWGChannelMarker* getChannelMarker(); void setChannelMarker(SWGChannelMarker* channel_marker); @@ -96,6 +99,12 @@ public: virtual bool isSet() override; private: + qint64 input_frequency_offset; + bool m_input_frequency_offset_isSet; + + qint32 nav_id; + bool m_nav_id_isSet; + float squelch; bool m_squelch_isSet; @@ -135,9 +144,6 @@ private: qint32 ident_threshold; bool m_ident_threshold_isSet; - qint32 mag_dec_adjust; - bool m_mag_dec_adjust_isSet; - SWGChannelMarker* channel_marker; bool m_channel_marker_isSet;