VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 05:22:25 -04:00
Code Issues Projects Releases Wiki Activity

Reverse API: AM demod changes (2)

Browse Source
This commit is contained in:
f4exb 2018-12-15 03:42:58 +01:00
parent 0e75cc3709
commit 5b0a47c7c6
2 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
plugins/channelrx/demodam/amdemod.cpp
View File

@ -454,7 +454,7 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force)
if ((m_settings.m_squelch != settings.m_squelch) || force) if ((m_settings.m_squelch != settings.m_squelch) || force)
{ {
m_squelchLevel = CalcDb::powerFromdB(settings.m_squelch); m_squelchLevel = CalcDb::powerFromdB(settings.m_squelch);
reverseAPIKeys.append("squelchLevel"); reverseAPIKeys.append("squelch");
} }
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force) if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)
@ -493,11 +493,31 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force)
reverseAPIKeys.append("syncAMOperation"); reverseAPIKeys.append("syncAMOperation");
} }
if ((m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset) || force) {
reverseAPIKeys.append("inputFrequencyOffset");
}
if ((m_settings.m_audioMute != settings.m_audioMute) || force) {
reverseAPIKeys.append("audioMute");
}
if ((m_settings.m_volume != settings.m_volume) || force) {
reverseAPIKeys.append("volume");
}
if ((m_settings.m_useReverseAPI != settings.m_useReverseAPI))
{
if (settings.m_useReverseAPI) {
webapiReverseSendSettings(reverseAPIKeys, settings, true);
}
}
else if (m_settings.m_useReverseAPI)
{
webapiReverseSendSettings(reverseAPIKeys, settings, force);
}
m_settings = settings; m_settings = settings;
if (m_settings.m_useReverseAPI) {
webapiReverseSendSettings(reverseAPIKeys, m_settings, force);
}
} }
QByteArray AMDemod::serialize() const QByteArray AMDemod::serialize() const
@ -655,11 +675,51 @@ void AMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
response.getAmDemodReport()->setChannelSampleRate(m_inputSampleRate); response.getAmDemodReport()->setChannelSampleRate(m_inputSampleRate);
} }
void AMDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, AMDemodSettings& settings, bool force) void AMDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const AMDemodSettings& settings, bool force)
{ {
(void) channelSettingsKeys; SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings();
(void) settings; swgChannelSettings->setTx(0);
(void) force; swgChannelSettings->setChannelType(new QString("AMDemod"));
// TODO swgChannelSettings->setAmDemodSettings(new SWGSDRangel::SWGAMDemodSettings());
SWGSDRangel::SWGAMDemodSettings *swgAMDemodSettings = swgChannelSettings->getAmDemodSettings();
if (channelSettingsKeys.contains("audioMute") || force) {
swgAMDemodSettings->setAudioMute(settings.m_audioMute ? 1 : 0);
}
if (channelSettingsKeys.contains("inputFrequencyOffset") || force) {
qDebug() << "AMDemod::webapiReverseSendSettings: inputFrequencyOffset";
swgAMDemodSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
}
if (channelSettingsKeys.contains("rfBandwidth") || force) {
swgAMDemodSettings->setRfBandwidth(settings.m_rfBandwidth);
}
if (channelSettingsKeys.contains("rgbColor") || force) {
swgAMDemodSettings->setRgbColor(settings.m_rgbColor);
}
if (channelSettingsKeys.contains("squelch") || force) {
swgAMDemodSettings->setSquelch(settings.m_squelch);
}
if (channelSettingsKeys.contains("title") || force) {
swgAMDemodSettings->setTitle(new QString(settings.m_title));
}
if (channelSettingsKeys.contains("volume") || force) {
swgAMDemodSettings->setVolume(settings.m_volume);
}
if (channelSettingsKeys.contains("bandpassEnable") || force) {
swgAMDemodSettings->setBandpassEnable(settings.m_bandpassEnable ? 1 : 0);
}
if (channelSettingsKeys.contains("audioDeviceName") || force) {
swgAMDemodSettings->setAudioDeviceName(new QString(settings.m_audioDeviceName));
}
if (channelSettingsKeys.contains("pll") || force) {
swgAMDemodSettings->setPll(settings.m_pll);
}
if (channelSettingsKeys.contains("syncAMOperation") || force) {
swgAMDemodSettings->setSyncAmOperation((int) settings.m_syncAMOperation);
}
qDebug("AMDemod::webapiReverseSendSettings: \n%s", swgChannelSettings->asJson().toStdString().c_str());
delete swgChannelSettings;
} }

2
plugins/channelrx/demodam/amdemod.h
View File

@ -211,7 +211,7 @@ private:
void applyAudioSampleRate(int sampleRate); void applyAudioSampleRate(int sampleRate);
void webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const AMDemodSettings& settings); void webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const AMDemodSettings& settings);
void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response); void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response);
void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, AMDemodSettings& settings, bool force); void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const AMDemodSettings& settings, bool force);
void processOneSample(Complex &ci); void processOneSample(Complex &ci);
}; };