From b99afedc4af6dabef752e30eec36deb0b585d72e Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 11 Oct 2018 08:52:50 +0200 Subject: [PATCH] NFM demod: changed squelch 0.1 dB steps to 1 dB steps --- plugins/channelrx/demodnfm/nfmdemod.cpp | 8 ++++---- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 8 ++++---- plugins/channelrx/demodnfm/nfmdemodgui.ui | 14 ++++---------- plugins/channelrx/demodnfm/nfmdemodsettings.cpp | 6 +++--- plugins/channelrx/demodnfm/nfmdemodsettings.h | 2 +- plugins/channelrx/demodnfm/nfmplugin.cpp | 2 +- plugins/channelrx/demodnfm/readme.md | 2 +- plugins/samplesource/perseus/perseusplugin.cpp | 2 +- sdrbase/resources/webapi/doc/html2/index.html | 4 ++-- .../webapi/doc/swagger/include/NFMDemod.yaml | 2 +- swagger/sdrangel/api/swagger/include/NFMDemod.yaml | 2 +- swagger/sdrangel/code/html2/index.html | 4 ++-- swagger/sdrangel/examples/rx_test.py | 2 +- swagger/sdrangel/examples/rx_tx_test.py | 2 +- swagger/sdrangel/examples/scanner.py | 2 +- 15 files changed, 28 insertions(+), 34 deletions(-) diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 85a6e9263..2002d2463 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -523,14 +523,14 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force) (settings.m_deltaSquelch != m_settings.m_deltaSquelch) || force) { if (settings.m_deltaSquelch) - { // input is a value in negative millis - m_squelchLevel = (- settings.m_squelch) / 1000.0; + { // input is a value in negative centis + m_squelchLevel = (- settings.m_squelch) / 100.0; m_afSquelch.setThreshold(m_squelchLevel); m_afSquelch.reset(); } else - { // input is a value in centi-Bels - m_squelchLevel = std::pow(10.0, settings.m_squelch / 100.0); + { // input is a value in deci-Bels + m_squelchLevel = std::pow(10.0, settings.m_squelch / 10.0); m_movingAverage.reset(); } diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 3f4ba6f45..57e062311 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -182,12 +182,12 @@ void NFMDemodGUI::on_squelch_valueChanged(int value) { if (ui->deltaSquelch->isChecked()) { - ui->squelchText->setText(QString("%1").arg(-value / 10.0, 0, 'f', 1)); + ui->squelchText->setText(QString("%1").arg(-value / 1.0, 0, 'f', 0)); ui->squelchText->setToolTip(tr("Squelch deviation threshold (%)")); } else { - ui->squelchText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1)); + ui->squelchText->setText(QString("%1").arg(value / 1.0, 0, 'f', 0)); ui->squelchText->setToolTip(tr("Squelch power threshold (dB)")); } m_settings.m_squelch = value * 1.0; @@ -368,13 +368,13 @@ void NFMDemodGUI::displaySettings() if (m_settings.m_deltaSquelch) { - ui->squelchText->setText(QString("%1").arg((-m_settings.m_squelch) / 10.0, 0, 'f', 1)); + ui->squelchText->setText(QString("%1").arg((-m_settings.m_squelch) / 1.0, 0, 'f', 0)); ui->squelchText->setToolTip(tr("Squelch AF balance threshold (%)")); ui->squelch->setToolTip(tr("Squelch AF balance threshold (%)")); } else { - ui->squelchText->setText(QString("%1").arg(m_settings.m_squelch / 10.0, 0, 'f', 1)); + ui->squelchText->setText(QString("%1").arg(m_settings.m_squelch / 1.0, 0, 'f', 0)); ui->squelchText->setToolTip(tr("Squelch power threshold (dB)")); ui->squelch->setToolTip(tr("Squelch AF balance threshold (%)")); } diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui index 070458b1c..fc8fe0075 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.ui +++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui @@ -428,7 +428,7 @@ Squelch threshold (dB) - -1000 + -100 0 @@ -440,7 +440,7 @@ 1 - -150 + -100 @@ -448,21 +448,15 @@ - 40 + 28 0 - - - 16777215 - 16777215 - - Squelch threshold (dB) - -15.0 + -100 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp index 718404ecd..49740e21a 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp @@ -44,7 +44,7 @@ void NFMDemodSettings::resetToDefaults() m_fmDeviation = 2000; m_squelchGate = 5; // 10s of ms at 48000 Hz sample rate. Corresponds to 2400 for AGC attack m_deltaSquelch = false; - m_squelch = -300.0; + m_squelch = -30.0; m_volume = 1.0; m_ctcssOn = false; m_audioMute = false; @@ -109,8 +109,8 @@ bool NFMDemodSettings::deserialize(const QByteArray& data) m_afBandwidth = tmp * 1000.0; d.readS32(4, &tmp, 20); m_volume = tmp / 10.0; - d.readS32(5, &tmp, -300); - m_squelch = tmp * 1.0; + d.readS32(5, &tmp, -30); + m_squelch = (tmp < -100 ? -100 : tmp) * 1.0; d.readU32(7, &m_rgbColor, QColor(255, 0, 0).rgb()); d.readS32(8, &m_ctcssIndex, 0); d.readBool(9, &m_ctcssOn, false); diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.h b/plugins/channelrx/demodnfm/nfmdemodsettings.h index 6fef3d3ee..285735674 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.h +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.h @@ -33,7 +33,7 @@ struct NFMDemodSettings int m_fmDeviation; int m_squelchGate; bool m_deltaSquelch; - Real m_squelch; //!< centi-Bels + Real m_squelch; //!< deci-Bels Real m_volume; bool m_ctcssOn; bool m_audioMute; diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 97ef60aae..53b5f8357 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -9,7 +9,7 @@ const PluginDescriptor NFMPlugin::m_pluginDescriptor = { QString("NFM Demodulator"), - QString("4.1.0"), + QString("4.2.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channelrx/demodnfm/readme.md b/plugins/channelrx/demodnfm/readme.md index 9f1bdfb14..aa3fff81b 100644 --- a/plugins/channelrx/demodnfm/readme.md +++ b/plugins/channelrx/demodnfm/readme.md @@ -46,7 +46,7 @@ Use this button to toggle between AF (on) and RF power (off) based squelch.

Power threshold mode

-Case when the delta/Level squelch control (7) is off (power). This is the squelch threshold in dB. The average total power received in the signal bandwidth before demodulation is compared to this value and the squelch input is open above this value. It can be varied continuously in 0.1 dB steps from 0.0 to -100.0 dB using the dial button. +Case when the delta/Level squelch control (7) is off (power). This is the squelch threshold in dB. The average total power received in the signal bandwidth before demodulation is compared to this value and the squelch input is open above this value. It can be varied continuously in 1 dB steps from 0 to -100 dB using the dial button.

Audio frequency delta mode

diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp index f51ee3005..f4e5e6276 100644 --- a/plugins/samplesource/perseus/perseusplugin.cpp +++ b/plugins/samplesource/perseus/perseusplugin.cpp @@ -81,7 +81,7 @@ PluginInterface::SamplingDevices PerseusPlugin::enumSampleSources() 1, 0)); - qDebug("PerseusPlugin::enumSampleSources: enumerated PlutoSDR device #%d", i); + qDebug("PerseusPlugin::enumSampleSources: enumerated Perseus device #%d", i); } return result; diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index fe31a31c5..9f2c3c342 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -2802,7 +2802,7 @@ margin-bottom: 20px; "squelch" : { "type" : "number", "format" : "float", - "description" : "power squelch threshold in centi-bels" + "description" : "power squelch threshold in deci-bels" }, "volume" : { "type" : "number", @@ -23242,7 +23242,7 @@ except ApiException as e:
- Generated 2018-10-03T06:02:12.961+02:00 + Generated 2018-10-11T08:49:05.249+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml index bdbdde412..5dc7129c3 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml @@ -21,7 +21,7 @@ NFMDemodSettings: deltaSquelch: type: integer squelch: - description: power squelch threshold in centi-bels + description: power squelch threshold in deci-bels type: number format: float volume: diff --git a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml index bdbdde412..5dc7129c3 100644 --- a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml @@ -21,7 +21,7 @@ NFMDemodSettings: deltaSquelch: type: integer squelch: - description: power squelch threshold in centi-bels + description: power squelch threshold in deci-bels type: number format: float volume: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index fe31a31c5..9f2c3c342 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -2802,7 +2802,7 @@ margin-bottom: 20px; "squelch" : { "type" : "number", "format" : "float", - "description" : "power squelch threshold in centi-bels" + "description" : "power squelch threshold in deci-bels" }, "volume" : { "type" : "number", @@ -23242,7 +23242,7 @@ except ApiException as e:
- Generated 2018-10-03T06:02:12.961+02:00 + Generated 2018-10-11T08:49:05.249+02:00
diff --git a/swagger/sdrangel/examples/rx_test.py b/swagger/sdrangel/examples/rx_test.py index 10b149872..dbf69fd5e 100755 --- a/swagger/sdrangel/examples/rx_test.py +++ b/swagger/sdrangel/examples/rx_test.py @@ -252,7 +252,7 @@ def setupChannel(deviceset_url, options): settings["NFMDemodSettings"]["afBandwidth"] = options.af_bw * 1000 settings["NFMDemodSettings"]["rfBandwidth"] = options.rf_bw settings["NFMDemodSettings"]["volume"] = options.volume - settings["NFMDemodSettings"]["squelch"] = options.squelch_db * 10 # centi-Bels + settings["NFMDemodSettings"]["squelch"] = options.squelch_db # deci-Bels settings["NFMDemodSettings"]["squelchGate"] = options.squelch_gate // 10 # 10's of ms settings["NFMDemodSettings"]["title"] = "Channel %d" % i elif options.channel_id == "BFMDemod": diff --git a/swagger/sdrangel/examples/rx_tx_test.py b/swagger/sdrangel/examples/rx_tx_test.py index 621a2eb0e..bb6516450 100644 --- a/swagger/sdrangel/examples/rx_tx_test.py +++ b/swagger/sdrangel/examples/rx_tx_test.py @@ -164,7 +164,7 @@ def main(): settings["NFMDemodSettings"]["rfBandwidth"] = 12500 settings["NFMDemodSettings"]["fmDeviation"] = 3000 settings["NFMDemodSettings"]["afBandwidth"] = 4000 - settings["NFMDemodSettings"]["squelch"] = -700 + settings["NFMDemodSettings"]["squelch"] = -70 settings["NFMDemodSettings"]["volume"] = 2.0 if options.udp_copy is not None: diff --git a/swagger/sdrangel/examples/scanner.py b/swagger/sdrangel/examples/scanner.py index 597332103..cd6e16634 100755 --- a/swagger/sdrangel/examples/scanner.py +++ b/swagger/sdrangel/examples/scanner.py @@ -191,7 +191,7 @@ def setupChannels(scan_control, options): settings["NFMDemodSettings"]["afBandwidth"] = options.af_bw * 1000 settings["NFMDemodSettings"]["rfBandwidth"] = options.rf_bw settings["NFMDemodSettings"]["volume"] = options.volume - settings["NFMDemodSettings"]["squelch"] = options.squelch_db * 10 # centi-Bels + settings["NFMDemodSettings"]["squelch"] = options.squelch_db # deci-Bels settings["NFMDemodSettings"]["squelchGate"] = options.squelch_gate / 10 # 10's of ms settings["NFMDemodSettings"]["title"] = "Channel %d" % i elif options.channel_id == "AMDemod":