From 1ad53cc953238b7ae949725deb434b7f67245b39 Mon Sep 17 00:00:00 2001 From: Andrew Hirst Date: Mon, 19 Oct 2026 21:10:05 +0100 Subject: [PATCH] Fix WebAPI settings read from the wrong plugin type. RTTY, NAVTEX and ILS demods read logFilename/logEnabled from getAdsbDemodSettings(), which is null for those channels, so a PATCH of either key crashes SDRangel. Also fix M17 Mod reverseAPIChannelIndex (read from NFM Mod settings), Audio CAT SISO settings get and XTRX MIMO reverse API settings and report (Input instead of MIMO types), and BladeRF2 Output title (BladeRF1 settings). --- plugins/channelrx/demodils/ilsdemod.cpp | 4 ++-- plugins/channelrx/demodnavtex/navtexdemod.cpp | 4 ++-- plugins/channelrx/demodrtty/rttydemod.cpp | 4 ++-- plugins/channeltx/modm17/m17mod.cpp | 2 +- plugins/samplemimo/audiocatsiso/audiocatsiso.cpp | 4 ++-- plugins/samplemimo/xtrxmimo/xtrxmimo.cpp | 12 ++++++------ plugins/samplesink/bladerf2output/bladerf2output.cpp | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/channelrx/demodils/ilsdemod.cpp b/plugins/channelrx/demodils/ilsdemod.cpp index 147aa8604..9c806b279 100644 --- a/plugins/channelrx/demodils/ilsdemod.cpp +++ b/plugins/channelrx/demodils/ilsdemod.cpp @@ -536,10 +536,10 @@ void ILSDemod::webapiUpdateChannelSettings( settings.m_udpPort = response.getIlsDemodSettings()->getUdpPort(); } if (channelSettingsKeys.contains("logFilename")) { - settings.m_logFilename = *response.getAdsbDemodSettings()->getLogFilename(); + settings.m_logFilename = *response.getIlsDemodSettings()->getLogFilename(); } if (channelSettingsKeys.contains("logEnabled")) { - settings.m_logEnabled = response.getAdsbDemodSettings()->getLogEnabled(); + settings.m_logEnabled = response.getIlsDemodSettings()->getLogEnabled(); } if (channelSettingsKeys.contains("rgbColor")) { settings.m_rgbColor = response.getIlsDemodSettings()->getRgbColor(); diff --git a/plugins/channelrx/demodnavtex/navtexdemod.cpp b/plugins/channelrx/demodnavtex/navtexdemod.cpp index 5f7fb4e37..93ad2a610 100644 --- a/plugins/channelrx/demodnavtex/navtexdemod.cpp +++ b/plugins/channelrx/demodnavtex/navtexdemod.cpp @@ -449,10 +449,10 @@ void NavtexDemod::webapiUpdateChannelSettings( settings.m_udpPort = response.getNavtexDemodSettings()->getUdpPort(); } if (channelSettingsKeys.contains("logFilename")) { - settings.m_logFilename = *response.getAdsbDemodSettings()->getLogFilename(); + settings.m_logFilename = *response.getNavtexDemodSettings()->getLogFilename(); } if (channelSettingsKeys.contains("logEnabled")) { - settings.m_logEnabled = response.getAdsbDemodSettings()->getLogEnabled(); + settings.m_logEnabled = response.getNavtexDemodSettings()->getLogEnabled(); } if (channelSettingsKeys.contains("rgbColor")) { settings.m_rgbColor = response.getNavtexDemodSettings()->getRgbColor(); diff --git a/plugins/channelrx/demodrtty/rttydemod.cpp b/plugins/channelrx/demodrtty/rttydemod.cpp index d08906664..765340004 100644 --- a/plugins/channelrx/demodrtty/rttydemod.cpp +++ b/plugins/channelrx/demodrtty/rttydemod.cpp @@ -490,10 +490,10 @@ void RttyDemod::webapiUpdateChannelSettings( settings.m_squelch = response.getRttyDemodSettings()->getSquelch(); } if (channelSettingsKeys.contains("logFilename")) { - settings.m_logFilename = *response.getAdsbDemodSettings()->getLogFilename(); + settings.m_logFilename = *response.getRttyDemodSettings()->getLogFilename(); } if (channelSettingsKeys.contains("logEnabled")) { - settings.m_logEnabled = response.getAdsbDemodSettings()->getLogEnabled(); + settings.m_logEnabled = response.getRttyDemodSettings()->getLogEnabled(); } if (channelSettingsKeys.contains("rgbColor")) { settings.m_rgbColor = response.getRttyDemodSettings()->getRgbColor(); diff --git a/plugins/channeltx/modm17/m17mod.cpp b/plugins/channeltx/modm17/m17mod.cpp index 0d7ea0645..52f796cd6 100644 --- a/plugins/channeltx/modm17/m17mod.cpp +++ b/plugins/channeltx/modm17/m17mod.cpp @@ -501,7 +501,7 @@ void M17Mod::webapiUpdateChannelSettings( settings.m_reverseAPIDeviceIndex = response.getM17ModSettings()->getReverseApiDeviceIndex(); } if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { - settings.m_reverseAPIChannelIndex = response.getNfmModSettings()->getReverseApiChannelIndex(); + settings.m_reverseAPIChannelIndex = response.getM17ModSettings()->getReverseApiChannelIndex(); } if (channelSettingsKeys.contains("sourceCall")) { settings.m_sourceCall = *response.getM17ModSettings()->getSourceCall(); diff --git a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp index f2f08092d..59bbd7e2d 100644 --- a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp +++ b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp @@ -695,8 +695,8 @@ int AudioCATSISO::webapiSettingsGet( ) { (void) errorMessage; - response.setAudioInputSettings(new SWGSDRangel::SWGAudioInputSettings()); - response.getAudioInputSettings()->init(); + response.setAudioCatsisoSettings(new SWGSDRangel::SWGAudioCATSISOSettings()); + response.getAudioCatsisoSettings()->init(); webapiFormatDeviceSettings(response, m_settings); return 200; diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp index f8c8fdb0e..d7d5893e3 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp @@ -1239,16 +1239,16 @@ void XTRXMIMO::webapiUpdateDeviceSettings( settings.m_gpioPins = response.getXtrxMimoSettings()->getGpioPins(); } if (deviceSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getXtrxInputSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getXtrxMimoSettings()->getUseReverseApi() != 0; } if (deviceSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getXtrxInputSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getXtrxMimoSettings()->getReverseApiAddress(); } if (deviceSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getXtrxInputSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getXtrxMimoSettings()->getReverseApiPort(); } if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getXtrxInputSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getXtrxMimoSettings()->getReverseApiDeviceIndex(); } // Rx if (deviceSettingsKeys.contains("rxDevSampleRate")) { @@ -1445,8 +1445,8 @@ int XTRXMIMO::webapiReportGet( QString& errorMessage) { (void) errorMessage; - response.setXtrxInputReport(new SWGSDRangel::SWGXtrxInputReport()); - response.getXtrxInputReport()->init(); + response.setXtrxMimoReport(new SWGSDRangel::SWGXtrxMIMOReport()); + response.getXtrxMimoReport()->init(); webapiFormatDeviceReport(response); return 200; } diff --git a/plugins/samplesink/bladerf2output/bladerf2output.cpp b/plugins/samplesink/bladerf2output/bladerf2output.cpp index c4ea05718..b603583f1 100644 --- a/plugins/samplesink/bladerf2output/bladerf2output.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2output.cpp @@ -1033,10 +1033,10 @@ int BladeRF2Output::webapiReportGet(SWGSDRangel::SWGDeviceReport& response, QStr void BladeRF2Output::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const BladeRF2OutputSettings& settings) { - if (response.getBladeRf1OutputSettings()->getTitle()) { - *response.getBladeRf1OutputSettings()->getTitle() = settings.m_title; + if (response.getBladeRf2OutputSettings()->getTitle()) { + *response.getBladeRf2OutputSettings()->getTitle() = settings.m_title; } else { - response.getBladeRf1OutputSettings()->setTitle(new QString(settings.m_title)); + response.getBladeRf2OutputSettings()->setTitle(new QString(settings.m_title)); } response.getBladeRf2OutputSettings()->setCenterFrequency(settings.m_centerFrequency);