VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 05:22:25 -04:00
Code Issues Projects Releases Wiki Activity

FreeDV demod: default settings adjustments and minor fixes

Browse Source
This commit is contained in:
f4exb 2019-02-27 08:16:00 +01:00
parent 1acbda8659
commit b4bd35fc21
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/channelrx/demodfreedv/freedvdemod.cpp
View File

@ -76,7 +76,6 @@ FreeDVDemod::FreeDVDemod(DeviceSourceAPI *deviceAPI) :
m_iModem(0), m_iModem(0),
m_speechOut(0), m_speechOut(0),
m_modIn(0), m_modIn(0),
m_scaleFactor(SDR_RX_SCALEF),
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {
setObjectName(m_channelId); setObjectName(m_channelId);
@ -456,24 +455,19 @@ void FreeDVDemod::applyFreeDVMode(FreeDVDemodSettings::FreeDVMode mode)
{ {
case FreeDVDemodSettings::FreeDVMode700C: case FreeDVDemodSettings::FreeDVMode700C:
fdv_mode = FREEDV_MODE_700C; fdv_mode = FREEDV_MODE_700C;
m_scaleFactor = SDR_RX_SCALEF / 3.2f;
break; break;
case FreeDVDemodSettings::FreeDVMode700D: case FreeDVDemodSettings::FreeDVMode700D:
fdv_mode = FREEDV_MODE_700D; fdv_mode = FREEDV_MODE_700D;
m_scaleFactor = SDR_RX_SCALEF / 3.2f;
break; break;
case FreeDVDemodSettings::FreeDVMode800XA: case FreeDVDemodSettings::FreeDVMode800XA:
fdv_mode = FREEDV_MODE_800XA; fdv_mode = FREEDV_MODE_800XA;
m_scaleFactor = SDR_RX_SCALEF / 8.2f;
break; break;
case FreeDVDemodSettings::FreeDVMode1600: case FreeDVDemodSettings::FreeDVMode1600:
fdv_mode = FREEDV_MODE_1600; fdv_mode = FREEDV_MODE_1600;
m_scaleFactor = SDR_RX_SCALEF / 3.2f;
break; break;
case FreeDVDemodSettings::FreeDVMode2400A: case FreeDVDemodSettings::FreeDVMode2400A:
default: default:
fdv_mode = FREEDV_MODE_2400A; fdv_mode = FREEDV_MODE_2400A;
m_scaleFactor = SDR_RX_SCALEF / 8.2f;
break; break;
} }
@ -494,7 +488,6 @@ void FreeDVDemod::applyFreeDVMode(FreeDVDemodSettings::FreeDVMode mode)
freedv_set_snr_squelch_thresh(m_freeDV, -100.0); freedv_set_snr_squelch_thresh(m_freeDV, -100.0);
freedv_set_squelch_en(m_freeDV, 0); freedv_set_squelch_en(m_freeDV, 0);
freedv_set_clip(m_freeDV, 0); freedv_set_clip(m_freeDV, 0);
freedv_set_tx_bpf(m_freeDV, 1);
freedv_set_ext_vco(m_freeDV, 0); freedv_set_ext_vco(m_freeDV, 0);
int nSpeechSamples = freedv_get_n_speech_samples(m_freeDV); int nSpeechSamples = freedv_get_n_speech_samples(m_freeDV);

1
plugins/channelrx/demodfreedv/freedvdemod.h
View File

@ -325,7 +325,6 @@ private:
int m_iModem; int m_iModem;
int16_t *m_speechOut; int16_t *m_speechOut;
int16_t *m_modIn; int16_t *m_modIn;
float m_scaleFactor; //!< divide by this amount to scale from int16 to float in [-1.0, 1.0] interval
AudioResampler m_audioResampler; AudioResampler m_audioResampler;
QMutex m_settingsMutex; QMutex m_settingsMutex;

2
plugins/channelrx/demodfreedv/freedvdemodgui.ui
View File

@ -337,7 +337,7 @@
<string>AGC time constant (ms in log2 steps)</string> <string>AGC time constant (ms in log2 steps)</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>4</number> <number>0</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>11</number> <number>11</number>

8
plugins/channelrx/demodfreedv/freedvdemodsettings.cpp
View File

@ -39,11 +39,11 @@ FreeDVDemodSettings::FreeDVDemodSettings() :
void FreeDVDemodSettings::resetToDefaults() void FreeDVDemodSettings::resetToDefaults()
{ {
m_audioMute = false; m_audioMute = false;
m_agc = false; m_agc = true;
m_agcClamping = false; m_agcClamping = false;
m_agcPowerThreshold = -40; m_agcPowerThreshold = -100;
m_agcThresholdGate = 4; m_agcThresholdGate = 0;
m_agcTimeLog2 = 7; m_agcTimeLog2 = 0;
m_volume = 3.0; m_volume = 3.0;
m_spanLog2 = 3; m_spanLog2 = 3;
m_inputFrequencyOffset = 0; m_inputFrequencyOffset = 0;