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

SSB mod: use CW keyer's pulse smoother

Browse Source
This commit is contained in:
f4exb 2017-10-21 05:01:47 +02:00
parent 85c8129d9c
commit 7570a2f9d8
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/channeltx/modssb/ssbmod.cpp
View File

@ -95,7 +95,6 @@ SSBMod::SSBMod(BasebandSampleSink* sampleSink) :
m_cwKeyer.setWPM(13); m_cwKeyer.setWPM(13);
m_cwKeyer.setMode(CWKeyer::CWNone); m_cwKeyer.setMode(CWKeyer::CWNone);
m_cwSmoother.setNbFadeSamples(192); // 4 ms at 48 kHz
m_inAGC.setGate(m_config.m_agcThresholdGate); m_inAGC.setGate(m_config.m_agcThresholdGate);
m_inAGC.setStepDownDelay(m_config.m_agcThresholdDelay); m_inAGC.setStepDownDelay(m_config.m_agcThresholdDelay);
m_inAGC.setClamping(true); m_inAGC.setClamping(true);
@ -355,7 +354,7 @@ void SSBMod::pullAF(Complex& sample)
if (m_cwKeyer.getSample()) if (m_cwKeyer.getSample())
{ {
m_cwSmoother.getFadeSample(true, fadeFactor); m_cwKeyer.getCWSmoother().getFadeSample(true, fadeFactor);
if (m_running.m_dsb) if (m_running.m_dsb)
{ {
@ -374,7 +373,7 @@ void SSBMod::pullAF(Complex& sample)
} }
else else
{ {
if (m_cwSmoother.getFadeSample(false, fadeFactor)) if (m_cwKeyer.getCWSmoother().getFadeSample(false, fadeFactor))
{ {
if (m_running.m_dsb) if (m_running.m_dsb)
{ {
@ -627,13 +626,6 @@ bool SSBMod::handleMessage(const Message& cmd)
m_config.m_agcThresholdGate = cfg.getAGCThresholdGate(); // ms m_config.m_agcThresholdGate = cfg.getAGCThresholdGate(); // ms
m_config.m_agcThresholdDelay = cfg.getAGCThresholdDelay(); // ms m_config.m_agcThresholdDelay = cfg.getAGCThresholdDelay(); // ms
// m_config.m_agcTime = 48 * cfg.getAGCTime(); // ms
// m_config.m_agcOrder = cfg.getAGCOrder();
// m_config.m_agcThresholdEnable = cfg.getAGCThreshold() != -99;
// m_config.m_agcThreshold = CalcDb::powerFromdB(cfg.getAGCThreshold()); // power dB
// m_config.m_agcThresholdGate = 48 * cfg.getAGCThresholdGate(); // ms
// m_config.m_agcThresholdDelay = 48 * cfg.getAGCThresholdDelay(); // ms
apply(); apply();
m_settingsMutex.unlock(); m_settingsMutex.unlock();
@ -747,7 +739,6 @@ void SSBMod::apply()
{ {
m_settingsMutex.lock(); m_settingsMutex.lock();
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
m_settingsMutex.unlock(); m_settingsMutex.unlock();
} }

1
plugins/channeltx/modssb/ssbmod.h
View File

@ -435,7 +435,6 @@ private:
Real m_peakLevel; Real m_peakLevel;
Real m_levelSum; Real m_levelSum;
CWKeyer m_cwKeyer; CWKeyer m_cwKeyer;
CWSmoother m_cwSmoother;
MagAGC m_inAGC; MagAGC m_inAGC;