VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 06:54:39 -04:00
Code Issues Projects Releases Wiki Activity

REST API: config (9): preset channel Tx adapters where there is CW keyer. Fixed the rest of the modulators

Browse Source
This commit is contained in:
f4exb
2019-08-03 01:47:36 +02:00
parent 68a4e23fb0
commit ae49f17484
13 changed files with 86 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp
+10 -25
View File
@@ -16,7 +16,6 @@
///////////////////////////////////////////////////////////////////////////////////
#include "SWGChannelSettings.h"
#include "settings/serializable.h"
#include "freedvmod.h"
#include "freedvmodwebapiadapter.h"
@@ -35,19 +34,11 @@ int FreeDVModWebAPIAdapter::webapiSettingsGet(
response.setFreeDvModSettings(new SWGSDRangel::SWGFreeDVModSettings());
response.getFreeDvModSettings()->init();
FreeDVMod::webapiFormatChannelSettings(response, m_settings);
Serializable *cwKeyerGUI = m_settings.m_cwKeyerGUI;
if (cwKeyerGUI)
{
const QByteArray& serializedCWKeyerSettings = cwKeyerGUI->serialize();
CWKeyerSettings cwKeyerSettings;
if (cwKeyerSettings.deserialize(serializedCWKeyerSettings))
{
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = response.getFreeDvModSettings()->getCwKeyer();
CWKeyer::webapiFormatChannelSettings(apiCwKeyerSettings, cwKeyerSettings);
}
}
const CWKeyerSettings& cwKeyerSettings = m_settings.getCWKeyerSettings();
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = response.getFreeDvModSettings()->getCwKeyer();
apiCwKeyerSettings->init();
CWKeyer::webapiFormatChannelSettings(apiCwKeyerSettings, cwKeyerSettings);
return 200;
}
@@ -60,20 +51,14 @@ int FreeDVModWebAPIAdapter::webapiSettingsPutPatch(
{
(void) errorMessage;
FreeDVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);
Serializable *cwKeyerGUI = m_settings.m_cwKeyerGUI;
if (channelSettingsKeys.contains("cwKeyer") && cwKeyerGUI)
if (channelSettingsKeys.contains("cwKeyer"))
{
const QByteArray& serializedCWKeyerSettings = cwKeyerGUI->serialize();
CWKeyerSettings cwKeyerSettings;
if (cwKeyerSettings.deserialize(serializedCWKeyerSettings))
{
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = response.getFreeDvModSettings()->getCwKeyer();
CWKeyer::webapiSettingsPutPatch(channelSettingsKeys, cwKeyerSettings, apiCwKeyerSettings);
const QByteArray& serializedNewCWKeyerSettings = cwKeyerSettings.serialize();
cwKeyerGUI->deserialize(serializedNewCWKeyerSettings);
}
CWKeyerSettings newCWKeyerSettings;
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = response.getFreeDvModSettings()->getCwKeyer();
CWKeyer::webapiSettingsPutPatch(channelSettingsKeys, newCWKeyerSettings, apiCwKeyerSettings);
m_settings.setCWKeyerSettings(newCWKeyerSettings);
const QByteArray& serializedNewSettings = m_settings.serialize(); // effectively update CW keyer settings
}
FreeDVMod::webapiFormatChannelSettings(response, m_settings);