From 1777eab1e31324ef9d91390b2e8409b5b53c1c5c Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 18 May 2019 03:41:28 +0200 Subject: [PATCH] NFM demod: added REST API support for high pass filter setting --- plugins/channelrx/demodnfm/nfmdemod.cpp | 7 +++++++ swagger/sdrangel/api/swagger/include/NFMDemod.yaml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index bb9bd5573..7ce301dab 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -681,6 +681,9 @@ int NFMDemod::webapiSettingsPutPatch( if (channelSettingsKeys.contains("audioMute")) { settings.m_audioMute = response.getNfmDemodSettings()->getAudioMute() != 0; } + if (channelSettingsKeys.contains("highPass")) { + settings.m_highPass = response.getNfmDemodSettings()->getHighPass() != 0; + } if (channelSettingsKeys.contains("ctcssIndex")) { settings.m_ctcssIndex = response.getNfmDemodSettings()->getCtcssIndex(); } @@ -771,6 +774,7 @@ void NFMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp { response.getNfmDemodSettings()->setAfBandwidth(settings.m_afBandwidth); response.getNfmDemodSettings()->setAudioMute(settings.m_audioMute ? 1 : 0); + response.getNfmDemodSettings()->setHighPass(settings.m_highPass ? 1 : 0); response.getNfmDemodSettings()->setCtcssIndex(settings.m_ctcssIndex); response.getNfmDemodSettings()->setCtcssOn(settings.m_ctcssOn ? 1 : 0); response.getNfmDemodSettings()->setDeltaSquelch(settings.m_deltaSquelch ? 1 : 0); @@ -838,6 +842,9 @@ void NFMDemod::webapiReverseSendSettings(QList& channelSettingsKeys, co if (channelSettingsKeys.contains("audioMute") || force) { swgNFMDemodSettings->setAudioMute(settings.m_audioMute ? 1 : 0); } + if (channelSettingsKeys.contains("highPass") || force) { + swgNFMDemodSettings->setAudioMute(settings.m_highPass ? 1 : 0); + } if (channelSettingsKeys.contains("ctcssIndex") || force) { swgNFMDemodSettings->setCtcssIndex(settings.m_ctcssIndex); } diff --git a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml index 660d4201a..f1e6e43be 100644 --- a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml @@ -29,6 +29,8 @@ NFMDemodSettings: format: float ctcssOn: type: integer + highPass: + type: integer audioMute: type: integer ctcssIndex: