VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

BFM demod: implemented mono/stereo control button with stereo pilot lock indication (green)

Browse Source
This commit is contained in:
f4exb 2015-12-07 03:36:56 +01:00
parent baccaba2c8
commit cd31cc6c0e
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/channel/bfm/bfmdemod.cpp
View File

@ -119,10 +119,11 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
m_m2Sample = m_m1Sample; m_m2Sample = m_m1Sample;
m_m1Sample = rf[i]; m_m1Sample = rf[i];
// TODO: conditional to stereo mode selected
Real pilotSample; Real pilotSample;
m_pilotPLL.process(demod, pilotSample); m_pilotPLL.process(demod, pilotSample);
//m_sampleBuffer.push_back(Sample(demod * (1<<15), 0.0)); m_sampleBuffer.push_back(Sample(demod * (1<<15), 0.0));
m_sampleBuffer.push_back(Sample(pilotSample * (1<<15), 0.0)); //m_sampleBuffer.push_back(Sample(pilotSample * (1<<15), 0.0)); // debug pilot
Complex e(demod, 0); Complex e(demod, 0);
if(m_interpolator.interpolate(&m_interpolatorDistanceRemain, e, &ci)) if(m_interpolator.interpolate(&m_interpolatorDistanceRemain, e, &ci))

23
plugins/channel/bfm/bfmdemodgui.cpp
View File

@ -216,6 +216,13 @@ void BFMDemodGUI::on_squelch_valueChanged(int value)
applySettings(); applySettings();
} }
void BFMDemodGUI::on_audioStereo_toggled(bool stereo)
{
if (!stereo)
{
ui->audioStereo->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
}
}
void BFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) void BFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{ {
@ -334,5 +341,21 @@ void BFMDemodGUI::tick()
Real powDb = CalcDb::dbPower(m_bfmDemod->getMagSq()); Real powDb = CalcDb::dbPower(m_bfmDemod->getMagSq());
m_channelPowerDbAvg.feed(powDb); m_channelPowerDbAvg.feed(powDb);
ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1));
if (m_bfmDemod->getPilotLock())
{
if (ui->audioStereo->isChecked())
{
ui->audioStereo->setStyleSheet("QToolButton { background-color : green; }");
}
}
else
{
if (ui->audioStereo->isChecked())
{
ui->audioStereo->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
}
}
//qDebug() << "Pilot lock: " << m_bfmDemod->getPilotLock() << ":" << m_bfmDemod->getPilotLevel(); TODO: update a GUI item with status //qDebug() << "Pilot lock: " << m_bfmDemod->getPilotLock() << ":" << m_bfmDemod->getPilotLevel(); TODO: update a GUI item with status
} }

1
plugins/channel/bfm/bfmdemodgui.h
View File

@ -60,6 +60,7 @@ private slots:
void on_afBW_valueChanged(int value); void on_afBW_valueChanged(int value);
void on_volume_valueChanged(int value); void on_volume_valueChanged(int value);
void on_squelch_valueChanged(int value); void on_squelch_valueChanged(int value);
void on_audioStereo_toggled(bool stereo);
void onWidgetRolled(QWidget* widget, bool rollDown); void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked(); void onMenuDoubleClicked();
void tick(); void tick();

23
plugins/channel/bfm/bfmdemodgui.ui
View File

@ -19,7 +19,7 @@
<x>10</x> <x>10</x>
<y>20</y> <y>20</y>
<width>235</width> <width>235</width>
<height>121</height> <height>111</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -136,6 +136,27 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="audioStereo">
<property name="toolTip">
<string>Mono/Stereo toggle and pilot lock indicator</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>