VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-03 14:32:25 -04:00
Code Issues Projects Releases Wiki Activity

FT8 Demod: limit upper bandwidth to 5.8 kHz

Browse Source
This commit is contained in:
f4exb 2024-12-02 13:01:22 +01:00
parent 1f0a8e3690
commit ec4d14be3f
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channelrx/demodft8/ft8demod.cpp
View File

@ -484,8 +484,10 @@ void FT8Demod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("spanLog2")) { if (channelSettingsKeys.contains("spanLog2")) {
settings.m_filterBank[settings.m_filterIndex].m_spanLog2 = response.getFt8DemodSettings()->getSpanLog2(); settings.m_filterBank[settings.m_filterIndex].m_spanLog2 = response.getFt8DemodSettings()->getSpanLog2();
} }
if (channelSettingsKeys.contains("rfBandwidth")) { if (channelSettingsKeys.contains("rfBandwidth"))
settings.m_filterBank[settings.m_filterIndex].m_rfBandwidth = response.getFt8DemodSettings()->getRfBandwidth(); {
float bw = response.getFt8DemodSettings()->getRfBandwidth();
settings.m_filterBank[settings.m_filterIndex].m_rfBandwidth = bw > 5800.0f ? 5800.0f : bw; // Hard limit upper bandwidth to 5800 Hx fixes #2339
} }
if (channelSettingsKeys.contains("lowCutoff")) { if (channelSettingsKeys.contains("lowCutoff")) {
settings.m_filterBank[settings.m_filterIndex].m_lowCutoff = response.getFt8DemodSettings()->getLowCutoff(); settings.m_filterBank[settings.m_filterIndex].m_lowCutoff = response.getFt8DemodSettings()->getLowCutoff();

4
plugins/channelrx/demodft8/ft8demodgui.cpp
View File

@ -667,7 +667,7 @@ FT8DemodGUI::FT8DemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_ft8Demod->setLevelMeter(ui->volumeMeter); m_ft8Demod->setLevelMeter(ui->volumeMeter);
ui->BW->setMaximum(60); ui->BW->setMaximum(58);
ui->BW->setMinimum(10); ui->BW->setMinimum(10);
ui->lowCut->setMaximum(50); ui->lowCut->setMaximum(50);
ui->lowCut->setMinimum(0); ui->lowCut->setMinimum(0);
@ -759,7 +759,7 @@ void FT8DemodGUI::applyBandwidths(unsigned int spanLog2, bool force)
ui->BW->blockSignals(true); ui->BW->blockSignals(true);
ui->lowCut->blockSignals(true); ui->lowCut->blockSignals(true);
ui->BW->setMaximum(bwMax); ui->BW->setMaximum(bwMax > 58 ? 58 : bwMax); // Cap to 5.8k fixes #2339
ui->BW->setMinimum(0); ui->BW->setMinimum(0);
ui->BW->setValue(bw); ui->BW->setValue(bw);

2
plugins/channelrx/demodft8/ft8demodgui.ui
View File

@ -516,7 +516,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>60</number> <number>58</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>

1
plugins/channelrx/demodft8/ft8demodsettings.cpp
View File

@ -219,6 +219,7 @@ bool FT8DemodSettings::deserialize(const QByteArray& data)
{ {
d.readS32(100 + 10*i, &m_filterBank[i].m_spanLog2, 3); d.readS32(100 + 10*i, &m_filterBank[i].m_spanLog2, 3);
d.readS32(101 + 10*i, &tmp, 30); d.readS32(101 + 10*i, &tmp, 30);
tmp = tmp > 58 ? 58 : tmp; // Hard limit upper bandwidth fixes #2339
m_filterBank[i].m_rfBandwidth = tmp * 100.0; m_filterBank[i].m_rfBandwidth = tmp * 100.0;
d.readS32(102+ 10*i, &tmp, 3); d.readS32(102+ 10*i, &tmp, 3);
m_filterBank[i].m_lowCutoff = tmp * 100.0; m_filterBank[i].m_lowCutoff = tmp * 100.0;

2
plugins/channelrx/demodft8/readme.md
View File

@ -85,7 +85,7 @@ Values are expressed in kHz and step is 100 Hz.
<h3>A.9: RF filter high cutoff</h3> <h3>A.9: RF filter high cutoff</h3>
Values are expressed in kHz and step is 100 Hz. Values are expressed in kHz and step is 100 Hz. This is limited to 5800 Hz,
<h3>A.10: Volume</h3> <h3>A.10: Volume</h3>