Browse Source

Merge pull request #3027 from AndrewNHS/fix/webapi-wrong-settings-type

Fix WebAPI settings read from the wrong plugin type
chirpmodem-v8.0.0
Edouard Griffiths 1 month ago committed by GitHub
parent
commit
58ce6ee639
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      plugins/channelrx/demodils/ilsdemod.cpp
  2. 4
      plugins/channelrx/demodnavtex/navtexdemod.cpp
  3. 4
      plugins/channelrx/demodrtty/rttydemod.cpp
  4. 2
      plugins/channeltx/modm17/m17mod.cpp
  5. 4
      plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
  6. 12
      plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
  7. 6
      plugins/samplesink/bladerf2output/bladerf2output.cpp

4
plugins/channelrx/demodils/ilsdemod.cpp

@ -536,10 +536,10 @@ void ILSDemod::webapiUpdateChannelSettings( @@ -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();

4
plugins/channelrx/demodnavtex/navtexdemod.cpp

@ -449,10 +449,10 @@ void NavtexDemod::webapiUpdateChannelSettings( @@ -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();

4
plugins/channelrx/demodrtty/rttydemod.cpp

@ -490,10 +490,10 @@ void RttyDemod::webapiUpdateChannelSettings( @@ -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();

2
plugins/channeltx/modm17/m17mod.cpp

@ -501,7 +501,7 @@ void M17Mod::webapiUpdateChannelSettings( @@ -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();

4
plugins/samplemimo/audiocatsiso/audiocatsiso.cpp

@ -695,8 +695,8 @@ int AudioCATSISO::webapiSettingsGet( @@ -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;

12
plugins/samplemimo/xtrxmimo/xtrxmimo.cpp

@ -1239,16 +1239,16 @@ void XTRXMIMO::webapiUpdateDeviceSettings( @@ -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( @@ -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;
}

6
plugins/samplesink/bladerf2output/bladerf2output.cpp

@ -1033,10 +1033,10 @@ int BladeRF2Output::webapiReportGet(SWGSDRangel::SWGDeviceReport& response, QStr @@ -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);

Loading…
Cancel
Save