VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 16:08:39 -05:00
Code Issues Projects Releases Wiki Activity

Avoid divide by 0 if symbol rate is 0.

Browse Source
This commit is contained in:
Jon Beniston 2021-04-17 12:55:30 +01:00
parent 76f09a17a7
commit 7e0903a722
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/channeltx/moddatv/datvmodgui.ui
View File

@ -272,6 +272,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Symbol rate</string> <string>Symbol rate</string>
</property> </property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum"> <property name="maximum">
<number>10000000</number> <number>10000000</number>
</property> </property>

64
plugins/channeltx/moddatv/datvmodsource.cpp
View File

@ -591,27 +591,31 @@ void DATVModSource::applyChannelSettings(int channelSampleRate, int channelFrequ
if ((channelSampleRate != m_channelSampleRate) || force) if ((channelSampleRate != m_channelSampleRate) || force)
{ {
m_sampleRate = (channelSampleRate/m_settings.m_symbolRate)*m_settings.m_symbolRate; if (m_settings.m_symbolRate > 0)
{
m_sampleRate = (channelSampleRate/m_settings.m_symbolRate)*m_settings.m_symbolRate;
// Create interpolator if not integer multiple // Create interpolator if not integer multiple
if (m_sampleRate != channelSampleRate) if (m_sampleRate != channelSampleRate)
{ {
m_interpolatorDistanceRemain = 0; m_interpolatorDistanceRemain = 0;
m_interpolatorDistance = (Real) m_sampleRate / (Real) channelSampleRate; m_interpolatorDistance = (Real) m_sampleRate / (Real) channelSampleRate;
m_interpolator.create(32, m_sampleRate, m_settings.m_rfBandwidth / 2.2f, 3.0); m_interpolator.create(32, m_sampleRate, m_settings.m_rfBandwidth / 2.2f, 3.0);
} }
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())
{ {
getMessageQueueToGUI()->push(DATVModReport::MsgReportRates::create( getMessageQueueToGUI()->push(DATVModReport::MsgReportRates::create(
channelSampleRate, m_sampleRate, channelSampleRate, m_sampleRate,
getDVBSDataBitrate(m_settings))); getDVBSDataBitrate(m_settings)));
}
} }
} }
m_channelSampleRate = channelSampleRate; m_channelSampleRate = channelSampleRate;
m_channelFrequencyOffset = channelFrequencyOffset; m_channelFrequencyOffset = channelFrequencyOffset;
m_samplesPerSymbol = m_channelSampleRate/m_settings.m_symbolRate; if (m_settings.m_symbolRate > 0)
m_samplesPerSymbol = m_channelSampleRate/m_settings.m_symbolRate;
m_pulseShapeI.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false); m_pulseShapeI.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false);
m_pulseShapeQ.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false); m_pulseShapeQ.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false);
@ -640,20 +644,25 @@ void DATVModSource::applySettings(const DATVModSettings& settings, bool force)
|| (settings.m_symbolRate != m_settings.m_symbolRate) || (settings.m_symbolRate != m_settings.m_symbolRate)
|| force) || force)
{ {
m_sampleRate = (m_channelSampleRate/settings.m_symbolRate)*settings.m_symbolRate; if (settings.m_symbolRate > 0)
{
m_sampleRate = (m_channelSampleRate/settings.m_symbolRate)*settings.m_symbolRate;
if (m_sampleRate != m_channelSampleRate) if (m_sampleRate != m_channelSampleRate)
{ {
m_interpolatorDistanceRemain = 0; m_interpolatorDistanceRemain = 0;
m_interpolatorDistance = (Real) m_sampleRate / (Real) m_channelSampleRate; m_interpolatorDistance = (Real) m_sampleRate / (Real) m_channelSampleRate;
m_interpolator.create(32, m_sampleRate, settings.m_rfBandwidth / 2.2f, 3.0); m_interpolator.create(32, m_sampleRate, settings.m_rfBandwidth / 2.2f, 3.0);
} }
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())
{ {
getMessageQueueToGUI()->push(DATVModReport::MsgReportRates::create( getMessageQueueToGUI()->push(DATVModReport::MsgReportRates::create(
m_channelSampleRate, m_sampleRate, m_channelSampleRate, m_sampleRate,
getDVBSDataBitrate(settings))); getDVBSDataBitrate(settings)));
}
} }
else
qWarning() << "DATVModSource::applySettings: symbolRate must be greater than 0.";
} }
if ((settings.m_source != m_settings.m_source) if ((settings.m_source != m_settings.m_source)
@ -804,7 +813,8 @@ void DATVModSource::applySettings(const DATVModSettings& settings, bool force)
m_settings = settings; m_settings = settings;
m_samplesPerSymbol = m_channelSampleRate/m_settings.m_symbolRate; if (m_settings.m_symbolRate > 0)
m_samplesPerSymbol = m_channelSampleRate/m_settings.m_symbolRate;
m_pulseShapeI.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false); m_pulseShapeI.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false);
m_pulseShapeQ.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false); m_pulseShapeQ.create(m_settings.m_rollOff, 8, m_samplesPerSymbol, false);