diff --git a/debian/changelog b/debian/changelog index ce6c5765b..cf78aa0a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,11 @@ sdrangel (4.0.6-1) unstable; urgency=medium * Web API: RTL-SDR: fixed RF bandwidth setting * Web API: enhanced DV serial and AM demod interfaces + * Web API: fixed bug in PUT/PATCH of modulators not setting differentially * Fixed power display going to floor value in some demods + * SSB modulator: fixed sample not reset when no modulation is present - -- Edouard Griffiths, F4EXB Sun, 05 Aug 2018 19:14:18 +0200 + -- Edouard Griffiths, F4EXB Tue, 07 Aug 2018 19:14:18 +0200 sdrangel (4.0.5-1) unstable; urgency=medium diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp index 4992632e2..8fed8d862 100644 --- a/plugins/channeltx/modam/ammod.cpp +++ b/plugins/channeltx/modam/ammod.cpp @@ -527,7 +527,7 @@ int AMMod::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage __attribute__((unused))) { - AMModSettings settings; + AMModSettings settings = m_settings; bool frequencyOffsetChanged = false; if (channelSettingsKeys.contains("channelMute")) { diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index a6a629378..cd356c0ab 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -25,7 +25,7 @@ const PluginDescriptor AMModPlugin::m_pluginDescriptor = { QString("AM Modulator"), - QString("3.14.5"), + QString("4.0.6"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index 285802bb2..6c98853dd 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -1199,7 +1199,7 @@ int ATVMod::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage __attribute__((unused))) { - ATVModSettings settings; + ATVModSettings settings = m_settings; bool frequencyOffsetChanged = false; if (channelSettingsKeys.contains("inputFrequencyOffset")) diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 8a99fe362..b5bbab39f 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -25,7 +25,7 @@ const PluginDescriptor ATVModPlugin::m_pluginDescriptor = { QString("ATV Modulator"), - QString("3.14.5"), + QString("4.0.6"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index 545ac693b..6dc2c7b1e 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -567,7 +567,7 @@ int NFMMod::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage __attribute__((unused))) { - NFMModSettings settings; + NFMModSettings settings = m_settings; bool frequencyOffsetChanged = false; // for (int i = 0; i < channelSettingsKeys.size(); i++) { diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 24694c679..7498fb2c6 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -25,7 +25,7 @@ const PluginDescriptor NFMModPlugin::m_pluginDescriptor = { QString("NFM Modulator"), - QString("3.14.5"), + QString("4.0.6"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index 4b44a4a20..501575ac7 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -881,7 +881,7 @@ int SSBMod::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage __attribute__((unused))) { - SSBModSettings settings; + SSBModSettings settings = m_settings; bool frequencyOffsetChanged = false; if (channelSettingsKeys.contains("inputFrequencyOffset")) diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index f4a5fd5cb..228ce21cd 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -25,7 +25,7 @@ const PluginDescriptor SSBModPlugin::m_pluginDescriptor = { QString("SSB Modulator"), - QString("3.14.5"), + QString("4.0.6"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp index 6aa022f28..5f7660f5c 100644 --- a/plugins/channeltx/modwfm/wfmmod.cpp +++ b/plugins/channeltx/modwfm/wfmmod.cpp @@ -559,7 +559,7 @@ int WFMMod::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage __attribute__((unused))) { - WFMModSettings settings; + WFMModSettings settings = m_settings; bool channelizerChange = false; if (channelSettingsKeys.contains("channelMute")) { diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 9c723b505..7a818e78e 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -25,7 +25,7 @@ const PluginDescriptor WFMModPlugin::m_pluginDescriptor = { QString("WFM Modulator"), - QString("3.14.5"), + QString("4.0.6"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/udpsink/udpsink.cpp b/plugins/channeltx/udpsink/udpsink.cpp index 9e18c5f22..d076f1a19 100644 --- a/plugins/channeltx/udpsink/udpsink.cpp +++ b/plugins/channeltx/udpsink/udpsink.cpp @@ -611,7 +611,7 @@ int UDPSink::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage __attribute__((unused))) { - UDPSinkSettings settings; + UDPSinkSettings settings = m_settings; bool frequencyOffsetChanged = false; if (channelSettingsKeys.contains("sampleFormat")) { diff --git a/plugins/channeltx/udpsink/udpsinkplugin.cpp b/plugins/channeltx/udpsink/udpsinkplugin.cpp index fa9453341..0f144ef1a 100644 --- a/plugins/channeltx/udpsink/udpsinkplugin.cpp +++ b/plugins/channeltx/udpsink/udpsinkplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = { QString("UDP Channel Sink"), - QString("4.0.2"), + QString("4.0.6"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,