From 64993cfa2f44be8155ce177c39caa143cd601073 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 28 Feb 2019 13:59:38 +0100 Subject: [PATCH] FreeDV demod: removed SSB style AGC --- plugins/channelrx/demodfreedv/freedvdemod.cpp | 130 ++-------------- plugins/channelrx/demodfreedv/freedvdemod.h | 6 +- .../channelrx/demodfreedv/freedvdemodgui.cpp | 54 ------- .../channelrx/demodfreedv/freedvdemodgui.h | 6 - .../channelrx/demodfreedv/freedvdemodgui.ui | 142 ------------------ .../demodfreedv/freedvdemodsettings.cpp | 12 -- .../demodfreedv/freedvdemodsettings.h | 4 - sdrbase/resources/webapi/doc/html2/index.html | 18 +-- .../doc/swagger/include/FreeDVDemod.yaml | 14 +- .../api/swagger/include/FreeDVDemod.yaml | 14 +- swagger/sdrangel/code/html2/index.html | 18 +-- .../qt5/client/SWGFreeDVDemodSettings.cpp | 84 ----------- .../code/qt5/client/SWGFreeDVDemodSettings.h | 24 --- 13 files changed, 17 insertions(+), 509 deletions(-) diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp index d0020d501..6afd57c88 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp @@ -131,12 +131,8 @@ FreeDVDemod::FreeDVDemod(DeviceSourceAPI *deviceAPI) : m_speechSampleRate(8000), // fixed 8 kS/s m_inputFrequencyOffset(0), m_audioMute(false), - m_agc(12000, agcTarget, 1e-2), + m_simpleAGC(0.003f, 0.0f, 1e-6f), m_agcActive(false), - m_agcClamping(false), - m_agcNbSamples(12000), - m_agcPowerThreshold(1e-2), - m_agcThresholdGate(0), m_squelchDelayLine(2*48000), m_audioActive(false), m_sampleSink(0), @@ -165,8 +161,7 @@ FreeDVDemod::FreeDVDemod(DeviceSourceAPI *deviceAPI) : m_magsqPeak = 0.0f; m_magsqCount = 0; - m_agc.setClampMax(SDR_RX_SCALED/100.0); - m_agc.setClamping(m_agcClamping); + m_simpleAGC.resizeNew(m_modemSampleRate/10, 0.003); SSBFilter = new fftfilt(m_lowCutoff / m_modemSampleRate, m_hiCutoff / m_modemSampleRate, ssbFftLen); @@ -280,12 +275,16 @@ void FreeDVDemod::feed(const SampleVector::const_iterator& begin, const SampleVe m_sum.imag(0.0); } - float agcVal = m_agcActive ? m_agc.feedAndGetValue(sideband[i]) : 10.0; // 10.0 for 3276.8, 1.0 for 327.68 - fftfilt::cmplx& delayedSample = m_squelchDelayLine.readBack(m_agc.getStepDownDelay()); - m_audioActive = delayedSample.real() != 0.0; - m_squelchDelayLine.write(sideband[i]*agcVal); - fftfilt::cmplx z = delayedSample * m_agc.getStepValue(); + fftfilt::cmplx z = sideband[i]; Real demod = (z.real() + z.imag()) * 0.7; + if (m_agcActive) + { + m_simpleAGC.feed(demod); + demod *= 3276.8f / m_simpleAGC.getValue(); // provision for peak to average ratio (here 10) + // if (i == 0) { + // qDebug("FreeDVDemod::feed: m_simpleAGC: %f", m_simpleAGC.getValue()); + // } + } pushSampleToDV((qint16) demod); } @@ -499,24 +498,9 @@ void FreeDVDemod::applyFreeDVMode(FreeDVDemodSettings::FreeDVMode mode) //m_interpolatorConsumed = false; m_interpolatorDistance = (Real) m_inputSampleRate / (Real) modemSampleRate; m_interpolator.create(16, m_inputSampleRate, m_hiCutoff * 1.5f, 2.0f); - - int agcNbSamples = (modemSampleRate / 1000) * (1<getAgc() != 0; } - if (channelSettingsKeys.contains("agcClamping")) { - settings.m_agcClamping = response.getFreeDvDemodSettings()->getAgcClamping() != 0; - } - if (channelSettingsKeys.contains("agcTimeLog2")) { - settings.m_agcTimeLog2 = response.getFreeDvDemodSettings()->getAgcTimeLog2(); - } - if (channelSettingsKeys.contains("agcPowerThreshold")) { - settings.m_agcPowerThreshold = response.getFreeDvDemodSettings()->getAgcPowerThreshold(); - } - if (channelSettingsKeys.contains("agcThresholdGate")) { - settings.m_agcThresholdGate = response.getFreeDvDemodSettings()->getAgcThresholdGate(); - } if (channelSettingsKeys.contains("rgbColor")) { settings.m_rgbColor = response.getFreeDvDemodSettings()->getRgbColor(); } @@ -893,10 +803,6 @@ void FreeDVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r response.getFreeDvDemodSettings()->setSpanLog2(settings.m_spanLog2); response.getFreeDvDemodSettings()->setAudioMute(settings.m_audioMute ? 1 : 0); response.getFreeDvDemodSettings()->setAgc(settings.m_agc ? 1 : 0); - response.getFreeDvDemodSettings()->setAgcClamping(settings.m_agcClamping ? 1 : 0); - response.getFreeDvDemodSettings()->setAgcTimeLog2(settings.m_agcTimeLog2); - response.getFreeDvDemodSettings()->setAgcPowerThreshold(settings.m_agcPowerThreshold); - response.getFreeDvDemodSettings()->setAgcThresholdGate(settings.m_agcThresholdGate); response.getFreeDvDemodSettings()->setRgbColor(settings.m_rgbColor); if (response.getFreeDvDemodSettings()->getTitle()) { @@ -949,18 +855,6 @@ void FreeDVDemod::webapiReverseSendSettings(QList& channelSettingsKeys, if (channelSettingsKeys.contains("agc") || force) { swgFreeDVDemodSettings->setAgc(settings.m_agc ? 1 : 0); } - if (channelSettingsKeys.contains("agcClamping") || force) { - swgFreeDVDemodSettings->setAgcClamping(settings.m_agcClamping ? 1 : 0); - } - if (channelSettingsKeys.contains("agcTimeLog2") || force) { - swgFreeDVDemodSettings->setAgcTimeLog2(settings.m_agcTimeLog2); - } - if (channelSettingsKeys.contains("agcPowerThreshold") || force) { - swgFreeDVDemodSettings->setAgcPowerThreshold(settings.m_agcPowerThreshold); - } - if (channelSettingsKeys.contains("agcThresholdGate") || force) { - swgFreeDVDemodSettings->setAgcThresholdGate(settings.m_agcThresholdGate); - } if (channelSettingsKeys.contains("rgbColor") || force) { swgFreeDVDemodSettings->setRgbColor(settings.m_rgbColor); } diff --git a/plugins/channelrx/demodfreedv/freedvdemod.h b/plugins/channelrx/demodfreedv/freedvdemod.h index 9e8dd9939..c12f76014 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.h +++ b/plugins/channelrx/demodfreedv/freedvdemod.h @@ -340,12 +340,8 @@ private: double m_magsqPeak; int m_magsqCount; MagSqLevelsStore m_magSqLevelStore; - MagAGC m_agc; + SimpleAGC<4800> m_simpleAGC; bool m_agcActive; - bool m_agcClamping; - int m_agcNbSamples; //!< number of audio (48 kHz) samples for AGC averaging - double m_agcPowerThreshold; //!< AGC power threshold (linear) - int m_agcThresholdGate; //!< Gate length in number of samples befor threshold triggers DoubleBufferFIFO m_squelchDelayLine; bool m_audioActive; //!< True if an audio signal is produced (no AGC or AGC and above threshold) diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp index 63417adc8..c2e8feb96 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp @@ -180,35 +180,6 @@ void FreeDVDemodGUI::on_agc_toggled(bool checked) applySettings(); } -void FreeDVDemodGUI::on_agcClamping_toggled(bool checked) -{ - m_settings.m_agcClamping = checked; - applySettings(); -} - -void FreeDVDemodGUI::on_agcTimeLog2_valueChanged(int value) -{ - QString s = QString::number((1<agcTimeText->setText(s); - m_settings.m_agcTimeLog2 = value; - applySettings(); -} - -void FreeDVDemodGUI::on_agcPowerThreshold_valueChanged(int value) -{ - displayAGCPowerThreshold(value); - m_settings.m_agcPowerThreshold = value; - applySettings(); -} - -void FreeDVDemodGUI::on_agcThresholdGate_valueChanged(int value) -{ - QString s = QString::number(value, 'f', 0); - ui->agcThresholdGateText->setText(s); - m_settings.m_agcThresholdGate = value; - applySettings(); -} - void FreeDVDemodGUI::on_audioMute_toggled(bool checked) { m_audioMute = checked; @@ -397,7 +368,6 @@ void FreeDVDemodGUI::displaySettings() ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); ui->agc->setChecked(m_settings.m_agc); - ui->agcClamping->setChecked(m_settings.m_agcClamping); ui->audioMute->setChecked(m_settings.m_audioMute); ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); @@ -409,33 +379,9 @@ void FreeDVDemodGUI::displaySettings() ui->volume->setValue(m_settings.m_volume * 10.0); ui->volumeText->setText(QString("%1").arg(m_settings.m_volume, 0, 'f', 1)); - ui->agcTimeLog2->setValue(m_settings.m_agcTimeLog2); - QString s = QString::number((1<agcTimeLog2->value()), 'f', 0); - ui->agcTimeText->setText(s); - - ui->agcPowerThreshold->setValue(m_settings.m_agcPowerThreshold); - displayAGCPowerThreshold(ui->agcPowerThreshold->value()); - - ui->agcThresholdGate->setValue(m_settings.m_agcThresholdGate); - s = QString::number(ui->agcThresholdGate->value(), 'f', 0); - ui->agcThresholdGateText->setText(s); - blockApplySettings(false); } -void FreeDVDemodGUI::displayAGCPowerThreshold(int value) -{ - if (value == FreeDVDemodSettings::m_minPowerThresholdDB) - { - ui->agcPowerThresholdText->setText("---"); - } - else - { - QString s = QString::number(value, 'f', 0); - ui->agcPowerThresholdText->setText(s); - } -} - void FreeDVDemodGUI::leaveEvent(QEvent*) { m_channelMarker.setHighlighted(false); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h index 51a031ecd..dd0013f6a 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.h +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h @@ -89,8 +89,6 @@ private: void applyBandwidths(int spanLog2, bool force = false); void displaySettings(); - void displayAGCPowerThreshold(int value); - void leaveEvent(QEvent*); void enterEvent(QEvent*); @@ -100,10 +98,6 @@ private slots: void on_freeDVMode_currentIndexChanged(int index); void on_volume_valueChanged(int value); void on_agc_toggled(bool checked); - void on_agcClamping_toggled(bool checked); - void on_agcTimeLog2_valueChanged(int value); - void on_agcPowerThreshold_valueChanged(int value); - void on_agcThresholdGate_valueChanged(int value); void on_audioMute_toggled(bool checked); void on_spanLog2_valueChanged(int value); void onWidgetRolled(QWidget* widget, bool rollDown); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.ui b/plugins/channelrx/demodfreedv/freedvdemodgui.ui index 5e3c19b66..8bc67b24c 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.ui +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.ui @@ -334,148 +334,6 @@ - - - - Toggle AGC clamping to maximum allowable signal - - - CL - - - true - - - - - - - - 24 - 24 - - - - AGC time constant (ms in log2 steps) - - - 0 - - - 11 - - - 1 - - - 7 - - - - - - - - 35 - 0 - - - - AGC time constant (ms) - - - 0000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 24 - 24 - - - - Power threshold (dB) - - - -120 - - - 0 - - - 1 - - - -40 - - - - - - - - 26 - 0 - - - - Power threshold (dB) - - - -000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 24 - 24 - - - - Power threshold gate (ms) - - - 20 - - - 1 - - - 4 - - - - - - - - 16 - 0 - - - - Power threshold gate (ms) - - - 00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp index 553c1cd1e..45c54a33a 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp @@ -40,10 +40,6 @@ void FreeDVDemodSettings::resetToDefaults() { m_audioMute = false; m_agc = true; - m_agcClamping = false; - m_agcPowerThreshold = -100; - m_agcThresholdGate = 0; - m_agcTimeLog2 = 0; m_volume = 3.0; m_spanLog2 = 3; m_inputFrequencyOffset = 0; @@ -71,10 +67,6 @@ QByteArray FreeDVDemodSettings::serialize() const s.writeU32(5, m_rgbColor); s.writeS32(7, m_spanLog2); s.writeBool(11, m_agc); - s.writeS32(12, m_agcTimeLog2); - s.writeS32(13, m_agcPowerThreshold); - s.writeS32(14, m_agcThresholdGate); - s.writeBool(15, m_agcClamping); s.writeString(16, m_title); s.writeString(17, m_audioDeviceName); s.writeBool(18, m_useReverseAPI); @@ -118,10 +110,6 @@ bool FreeDVDemodSettings::deserialize(const QByteArray& data) d.readS32(6, &tmp, 30); d.readS32(7, &m_spanLog2, 3); d.readBool(11, &m_agc, false); - d.readS32(12, &m_agcTimeLog2, 7); - d.readS32(13, &m_agcPowerThreshold, -40); - d.readS32(14, &m_agcThresholdGate, 4); - d.readBool(15, &m_agcClamping, false); d.readString(16, &m_title, "SSB Demodulator"); d.readString(17, &m_audioDeviceName, AudioDeviceManager::m_defaultDeviceName); d.readBool(18, &m_useReverseAPI, false); diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.h b/plugins/channelrx/demodfreedv/freedvdemodsettings.h index 6da8782ef..ceb0fca35 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsettings.h +++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.h @@ -39,10 +39,6 @@ struct FreeDVDemodSettings int m_spanLog2; bool m_audioMute; bool m_agc; - bool m_agcClamping; - int m_agcTimeLog2; - int m_agcPowerThreshold; - int m_agcThresholdGate; quint32 m_rgbColor; QString m_title; QString m_audioDeviceName; diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 0c362b2ae..39712f9b7 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -2593,22 +2593,6 @@ margin-bottom: 20px; "type" : "integer", "description" : "AGC (1 if AGC active else 0)" }, - "agcClamping" : { - "type" : "integer", - "description" : "AGC clamping (1 if AGC clampingactive else 0)" - }, - "agcTimeLog2" : { - "type" : "integer", - "description" : "AGC averaging time log2 in milliseconds" - }, - "agcPowerThreshold" : { - "type" : "integer", - "description" : "Audio open RF threshold (dB)" - }, - "agcThresholdGate" : { - "type" : "integer", - "description" : "Audio squelch gate in ms" - }, "rgbColor" : { "type" : "integer" }, @@ -24544,7 +24528,7 @@ except ApiException as e:
- Generated 2019-02-25T02:04:30.288+01:00 + Generated 2019-02-28T13:56:13.268+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml index 775fc4e4b..4608b674d 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml @@ -15,18 +15,6 @@ FreeDVDemodSettings: agc: description: AGC (1 if AGC active else 0) type: integer - agcClamping: - description: AGC clamping (1 if AGC clampingactive else 0) - type: integer - agcTimeLog2: - description: AGC averaging time log2 in milliseconds - type: integer - agcPowerThreshold: - description: Audio open RF threshold (dB) - type: integer - agcThresholdGate: - description: Audio squelch gate in ms - type: integer rgbColor: type: integer title: @@ -35,7 +23,7 @@ FreeDVDemodSettings: type: string freeDVMode: type: integer - + FreeDVDemodReport: description: FreeDVDemod properties: diff --git a/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml b/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml index 775fc4e4b..4608b674d 100644 --- a/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml @@ -15,18 +15,6 @@ FreeDVDemodSettings: agc: description: AGC (1 if AGC active else 0) type: integer - agcClamping: - description: AGC clamping (1 if AGC clampingactive else 0) - type: integer - agcTimeLog2: - description: AGC averaging time log2 in milliseconds - type: integer - agcPowerThreshold: - description: Audio open RF threshold (dB) - type: integer - agcThresholdGate: - description: Audio squelch gate in ms - type: integer rgbColor: type: integer title: @@ -35,7 +23,7 @@ FreeDVDemodSettings: type: string freeDVMode: type: integer - + FreeDVDemodReport: description: FreeDVDemod properties: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 0c362b2ae..39712f9b7 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -2593,22 +2593,6 @@ margin-bottom: 20px; "type" : "integer", "description" : "AGC (1 if AGC active else 0)" }, - "agcClamping" : { - "type" : "integer", - "description" : "AGC clamping (1 if AGC clampingactive else 0)" - }, - "agcTimeLog2" : { - "type" : "integer", - "description" : "AGC averaging time log2 in milliseconds" - }, - "agcPowerThreshold" : { - "type" : "integer", - "description" : "Audio open RF threshold (dB)" - }, - "agcThresholdGate" : { - "type" : "integer", - "description" : "Audio squelch gate in ms" - }, "rgbColor" : { "type" : "integer" }, @@ -24544,7 +24528,7 @@ except ApiException as e:
- Generated 2019-02-25T02:04:30.288+01:00 + Generated 2019-02-28T13:56:13.268+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp index ae163c7db..9a552f906 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp @@ -38,14 +38,6 @@ SWGFreeDVDemodSettings::SWGFreeDVDemodSettings() { m_audio_mute_isSet = false; agc = 0; m_agc_isSet = false; - agc_clamping = 0; - m_agc_clamping_isSet = false; - agc_time_log2 = 0; - m_agc_time_log2_isSet = false; - agc_power_threshold = 0; - m_agc_power_threshold_isSet = false; - agc_threshold_gate = 0; - m_agc_threshold_gate_isSet = false; rgb_color = 0; m_rgb_color_isSet = false; title = nullptr; @@ -72,14 +64,6 @@ SWGFreeDVDemodSettings::init() { m_audio_mute_isSet = false; agc = 0; m_agc_isSet = false; - agc_clamping = 0; - m_agc_clamping_isSet = false; - agc_time_log2 = 0; - m_agc_time_log2_isSet = false; - agc_power_threshold = 0; - m_agc_power_threshold_isSet = false; - agc_threshold_gate = 0; - m_agc_threshold_gate_isSet = false; rgb_color = 0; m_rgb_color_isSet = false; title = new QString(""); @@ -98,10 +82,6 @@ SWGFreeDVDemodSettings::cleanup() { - - - - if(title != nullptr) { delete title; } @@ -132,14 +112,6 @@ SWGFreeDVDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&agc, pJson["agc"], "qint32", ""); - ::SWGSDRangel::setValue(&agc_clamping, pJson["agcClamping"], "qint32", ""); - - ::SWGSDRangel::setValue(&agc_time_log2, pJson["agcTimeLog2"], "qint32", ""); - - ::SWGSDRangel::setValue(&agc_power_threshold, pJson["agcPowerThreshold"], "qint32", ""); - - ::SWGSDRangel::setValue(&agc_threshold_gate, pJson["agcThresholdGate"], "qint32", ""); - ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); @@ -179,18 +151,6 @@ SWGFreeDVDemodSettings::asJsonObject() { if(m_agc_isSet){ obj->insert("agc", QJsonValue(agc)); } - if(m_agc_clamping_isSet){ - obj->insert("agcClamping", QJsonValue(agc_clamping)); - } - if(m_agc_time_log2_isSet){ - obj->insert("agcTimeLog2", QJsonValue(agc_time_log2)); - } - if(m_agc_power_threshold_isSet){ - obj->insert("agcPowerThreshold", QJsonValue(agc_power_threshold)); - } - if(m_agc_threshold_gate_isSet){ - obj->insert("agcThresholdGate", QJsonValue(agc_threshold_gate)); - } if(m_rgb_color_isSet){ obj->insert("rgbColor", QJsonValue(rgb_color)); } @@ -257,46 +217,6 @@ SWGFreeDVDemodSettings::setAgc(qint32 agc) { this->m_agc_isSet = true; } -qint32 -SWGFreeDVDemodSettings::getAgcClamping() { - return agc_clamping; -} -void -SWGFreeDVDemodSettings::setAgcClamping(qint32 agc_clamping) { - this->agc_clamping = agc_clamping; - this->m_agc_clamping_isSet = true; -} - -qint32 -SWGFreeDVDemodSettings::getAgcTimeLog2() { - return agc_time_log2; -} -void -SWGFreeDVDemodSettings::setAgcTimeLog2(qint32 agc_time_log2) { - this->agc_time_log2 = agc_time_log2; - this->m_agc_time_log2_isSet = true; -} - -qint32 -SWGFreeDVDemodSettings::getAgcPowerThreshold() { - return agc_power_threshold; -} -void -SWGFreeDVDemodSettings::setAgcPowerThreshold(qint32 agc_power_threshold) { - this->agc_power_threshold = agc_power_threshold; - this->m_agc_power_threshold_isSet = true; -} - -qint32 -SWGFreeDVDemodSettings::getAgcThresholdGate() { - return agc_threshold_gate; -} -void -SWGFreeDVDemodSettings::setAgcThresholdGate(qint32 agc_threshold_gate) { - this->agc_threshold_gate = agc_threshold_gate; - this->m_agc_threshold_gate_isSet = true; -} - qint32 SWGFreeDVDemodSettings::getRgbColor() { return rgb_color; @@ -347,10 +267,6 @@ SWGFreeDVDemodSettings::isSet(){ if(m_span_log2_isSet){ isObjectUpdated = true; break;} if(m_audio_mute_isSet){ isObjectUpdated = true; break;} if(m_agc_isSet){ isObjectUpdated = true; break;} - if(m_agc_clamping_isSet){ isObjectUpdated = true; break;} - if(m_agc_time_log2_isSet){ isObjectUpdated = true; break;} - if(m_agc_power_threshold_isSet){ isObjectUpdated = true; break;} - if(m_agc_threshold_gate_isSet){ isObjectUpdated = true; break;} if(m_rgb_color_isSet){ isObjectUpdated = true; break;} if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;} if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;} diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h index dcc7cae00..489902333 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h @@ -57,18 +57,6 @@ public: qint32 getAgc(); void setAgc(qint32 agc); - qint32 getAgcClamping(); - void setAgcClamping(qint32 agc_clamping); - - qint32 getAgcTimeLog2(); - void setAgcTimeLog2(qint32 agc_time_log2); - - qint32 getAgcPowerThreshold(); - void setAgcPowerThreshold(qint32 agc_power_threshold); - - qint32 getAgcThresholdGate(); - void setAgcThresholdGate(qint32 agc_threshold_gate); - qint32 getRgbColor(); void setRgbColor(qint32 rgb_color); @@ -100,18 +88,6 @@ private: qint32 agc; bool m_agc_isSet; - qint32 agc_clamping; - bool m_agc_clamping_isSet; - - qint32 agc_time_log2; - bool m_agc_time_log2_isSet; - - qint32 agc_power_threshold; - bool m_agc_power_threshold_isSet; - - qint32 agc_threshold_gate; - bool m_agc_threshold_gate_isSet; - qint32 rgb_color; bool m_rgb_color_isSet;