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

NFM demod: adjusted deviations, scaling and audio volume

Browse Source
This commit is contained in:
f4exb 2018-04-14 04:45:22 +02:00
parent 2af885dcda
commit 9196c6f0c7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -414,7 +414,7 @@ void NFMDemod::applyAudioSampleRate(int sampleRate)
m_squelchCount = 0; // reset squelch open counter m_squelchCount = 0; // reset squelch open counter
m_ctcssDetector.setCoefficients(sampleRate/16, sampleRate/8.0f); // 0.5s / 2 Hz resolution m_ctcssDetector.setCoefficients(sampleRate/16, sampleRate/8.0f); // 0.5s / 2 Hz resolution
m_afSquelch.setCoefficients(sampleRate/2000, 600, sampleRate, 200, 0); // 0.5ms test period, 300ms average span, audio SR, 100ms attack, no decay m_afSquelch.setCoefficients(sampleRate/2000, 600, sampleRate, 200, 0); // 0.5ms test period, 300ms average span, audio SR, 100ms attack, no decay
m_phaseDiscri.setFMScaling((8.0f*sampleRate) / static_cast<float>(m_settings.m_fmDeviation)); // integrate 4x factor m_phaseDiscri.setFMScaling(sampleRate / static_cast<float>(m_settings.m_fmDeviation));
m_audioFifo.setSize(sampleRate); m_audioFifo.setSize(sampleRate);
m_settingsMutex.unlock(); m_settingsMutex.unlock();

2
plugins/channelrx/demodnfm/nfmdemodgui.ui
View File

@ -330,7 +330,7 @@
<string>Sound volume</string> <string>Sound volume</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>20</number> <number>40</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>

4
plugins/channelrx/demodnfm/nfmdemodsettings.cpp
View File

@ -25,8 +25,8 @@
const int NFMDemodSettings::m_rfBW[] = { const int NFMDemodSettings::m_rfBW[] = {
5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000 5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
}; };
const int NFMDemodSettings::m_fmDev[] = { // corresponding FM deviations const int NFMDemodSettings::m_fmDev[] = { // corresponding single side FM deviations at 0.4 * BW
1000, 1500, 2000, 2000, 2000, 2500, 3000, 3500, 5000 2000, 2500, 3330, 4000, 5000, 6000, 8000, 10000, 16000
}; };
const int NFMDemodSettings::m_nbRfBW = 9; const int NFMDemodSettings::m_nbRfBW = 9;