VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-03 21:20:31 -05:00
Code Issues Projects Releases Wiki Activity

Remote Input: multicast: REST API implementation

Browse Source
This commit is contained in:
f4exb 2020-08-26 21:46:21 +02:00
parent 2e2160facc
commit e03be9d6f4
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/samplesource/remoteinput/remoteinput.cpp
View File

@ -233,6 +233,12 @@ void RemoteInput::applySettings(const RemoteInputSettings& settings, bool force)
if ((m_settings.m_apiPort != settings.m_apiPort) || force) { if ((m_settings.m_apiPort != settings.m_apiPort) || force) {
reverseAPIKeys.append("apiPort"); reverseAPIKeys.append("apiPort");
} }
if ((m_settings.m_multicastAddress != settings.m_multicastAddress) || force) {
reverseAPIKeys.append("multicastAddress");
}
if ((m_settings.m_multicastJoin != settings.m_multicastJoin) || force) {
reverseAPIKeys.append("multicastJoin");
}
if ((m_settings.m_dcBlock != settings.m_dcBlock) || (m_settings.m_iqCorrection != settings.m_iqCorrection) || force) if ((m_settings.m_dcBlock != settings.m_dcBlock) || (m_settings.m_iqCorrection != settings.m_iqCorrection) || force)
{ {
@ -268,6 +274,8 @@ void RemoteInput::applySettings(const RemoteInputSettings& settings, bool force)
qDebug() << "RemoteInput::applySettings: " qDebug() << "RemoteInput::applySettings: "
<< " m_dataAddress: " << m_settings.m_dataAddress << " m_dataAddress: " << m_settings.m_dataAddress
<< " m_dataPort: " << m_settings.m_dataPort << " m_dataPort: " << m_settings.m_dataPort
<< " m_multicastAddress: " << m_settings.m_multicastAddress
<< " m_multicastJoin: " << m_settings.m_multicastJoin
<< " m_apiAddress: " << m_settings.m_apiAddress << " m_apiAddress: " << m_settings.m_apiAddress
<< " m_apiPort: " << m_settings.m_apiPort << " m_apiPort: " << m_settings.m_apiPort
<< " m_remoteAddress: " << m_remoteAddress; << " m_remoteAddress: " << m_remoteAddress;
@ -352,6 +360,12 @@ void RemoteInput::webapiUpdateDeviceSettings(
if (deviceSettingsKeys.contains("dataPort")) { if (deviceSettingsKeys.contains("dataPort")) {
settings.m_dataPort = response.getRemoteInputSettings()->getDataPort(); settings.m_dataPort = response.getRemoteInputSettings()->getDataPort();
} }
if (deviceSettingsKeys.contains("multicastAddress")) {
settings.m_multicastAddress = *response.getRemoteInputSettings()->getMulticastAddress();
}
if (deviceSettingsKeys.contains("multicastAddress")) {
settings.m_multicastJoin = response.getRemoteInputSettings()->getMulticastJoin() != 0;
}
if (deviceSettingsKeys.contains("dcBlock")) { if (deviceSettingsKeys.contains("dcBlock")) {
settings.m_dcBlock = response.getRemoteInputSettings()->getDcBlock() != 0; settings.m_dcBlock = response.getRemoteInputSettings()->getDcBlock() != 0;
} }
@ -378,6 +392,8 @@ void RemoteInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
response.getRemoteInputSettings()->setApiPort(settings.m_apiPort); response.getRemoteInputSettings()->setApiPort(settings.m_apiPort);
response.getRemoteInputSettings()->setDataAddress(new QString(settings.m_dataAddress)); response.getRemoteInputSettings()->setDataAddress(new QString(settings.m_dataAddress));
response.getRemoteInputSettings()->setDataPort(settings.m_dataPort); response.getRemoteInputSettings()->setDataPort(settings.m_dataPort);
response.getRemoteInputSettings()->setMulticastAddress(new QString(settings.m_multicastAddress));
response.getRemoteInputSettings()->setMulticastJoin(settings.m_multicastJoin ? 1 : 0);
response.getRemoteInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0); response.getRemoteInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0);
response.getRemoteInputSettings()->setIqCorrection(settings.m_iqCorrection); response.getRemoteInputSettings()->setIqCorrection(settings.m_iqCorrection);
@ -440,6 +456,12 @@ void RemoteInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys,
if (deviceSettingsKeys.contains("dataPort") || force) { if (deviceSettingsKeys.contains("dataPort") || force) {
swgRemoteInputSettings->setDataPort(settings.m_dataPort); swgRemoteInputSettings->setDataPort(settings.m_dataPort);
} }
if (deviceSettingsKeys.contains("multicastAddress") || force) {
swgRemoteInputSettings->setMulticastAddress(new QString(settings.m_multicastAddress));
}
if (deviceSettingsKeys.contains("multicastJoin") || force) {
swgRemoteInputSettings->setMulticastJoin(settings.m_multicastJoin ? 1 : 0);
}
if (deviceSettingsKeys.contains("dcBlock") || force) { if (deviceSettingsKeys.contains("dcBlock") || force) {
swgRemoteInputSettings->setDcBlock(settings.m_dcBlock ? 1 : 0); swgRemoteInputSettings->setDcBlock(settings.m_dcBlock ? 1 : 0);
} }