comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-05 14:47:52 -04:00
Code Issues Projects Releases Wiki Activity

Only use audio signal level for AM based modems

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-08-13 14:50:20 -04:00
parent 9f5c674646
commit 6a9e60efa9
9 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/demod/DemodulatorThread.cpp
View File

@ -139,21 +139,22 @@ void DemodulatorThread::run() {
if (audioOutputQueue != nullptr && ati && ati->data.size()) { if (audioOutputQueue != nullptr && ati && ati->data.size()) {
float accum = 0; float accum = 0;
for (auto i : ati->data) { if (cModem->useSignalOutput()) {
accum += abMagnitude(0.948059448969, 0.392699081699, i, 0.0);
} for (auto i : ati->data) {
accum += abMagnitude(0.948059448969, 0.392699081699, i, 0.0);
}
float audioSignalLevel = linearToDb(accum / float(ati->data.size())); currentSignalLevel = linearToDb(accum / float(ati->data.size()));
accum = 0; } else {
for (auto i : inp->data) { for (auto i : inp->data) {
accum += abMagnitude(0.948059448969, 0.392699081699, i.real, i.imag); accum += abMagnitude(0.948059448969, 0.392699081699, i.real, i.imag);
} }
float iqSignalLevel = linearToDb(accum / float(inp->data.size())); currentSignalLevel = linearToDb(accum / float(inp->data.size()));
}
currentSignalLevel = iqSignalLevel>audioSignalLevel?iqSignalLevel:audioSignalLevel;
float sf = signalFloor.load(), sc = signalCeil.load(), sl = squelchLevel.load(); float sf = signalFloor.load(), sc = signalCeil.load(), sl = squelchLevel.load();

11
src/modules/modem/Modem.cpp
View File

@ -32,7 +32,7 @@ ModemArgInfo::ModemArgInfo(void) {
} }
Modem::Modem() { Modem::Modem() {
useSignalOutput(false);
} }
Modem::~Modem() { Modem::~Modem() {
@ -108,3 +108,12 @@ void Modem::rebuildKit() {
void Modem::clearRebuildKit() { void Modem::clearRebuildKit() {
refreshKit.store(false); refreshKit.store(false);
} }
bool Modem::useSignalOutput() {
return _useSignalOutput.load();
}
void Modem::useSignalOutput(bool useOutput) {
_useSignalOutput.store(useOutput);
}

5
src/modules/modem/Modem.h
View File

@ -152,8 +152,11 @@ public:
void rebuildKit(); void rebuildKit();
void clearRebuildKit(); void clearRebuildKit();
bool useSignalOutput();
void useSignalOutput(bool useOutput);
private: private:
static ModemFactoryList modemFactories; static ModemFactoryList modemFactories;
static DefaultRatesList modemDefaultRates; static DefaultRatesList modemDefaultRates;
std::atomic_bool refreshKit; std::atomic_bool refreshKit, _useSignalOutput;
}; };

2
src/modules/modem/ModemAnalog.cpp
View File

@ -1,6 +1,6 @@
#include "ModemAnalog.h" #include "ModemAnalog.h"
ModemAnalog::ModemAnalog() : aOutputCeil(1), aOutputCeilMA(1), aOutputCeilMAA(1) { ModemAnalog::ModemAnalog() : Modem(), aOutputCeil(1), aOutputCeilMA(1), aOutputCeilMAA(1) {
} }

2
src/modules/modem/ModemDigital.cpp
View File

@ -5,7 +5,7 @@ ModemDigitalOutput::ModemDigitalOutput() {
} }
ModemDigital::ModemDigital() { ModemDigital::ModemDigital() : Modem() {
#if ENABLE_DIGITAL_LAB #if ENABLE_DIGITAL_LAB
digitalOut = nullptr; digitalOut = nullptr;
#endif #endif

1
src/modules/modem/analog/ModemAM.cpp
View File

@ -2,6 +2,7 @@
ModemAM::ModemAM() : ModemAnalog() { ModemAM::ModemAM() : ModemAnalog() {
demodAM = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 0); demodAM = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 0);
useSignalOutput(true);
} }
ModemAM::~ModemAM() { ModemAM::~ModemAM() {

1
src/modules/modem/analog/ModemDSB.cpp
View File

@ -2,6 +2,7 @@
ModemDSB::ModemDSB() : ModemAnalog() { ModemDSB::ModemDSB() : ModemAnalog() {
demodAM_DSB = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 1); demodAM_DSB = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 1);
useSignalOutput(true);
} }
ModemDSB::~ModemDSB() { ModemDSB::~ModemDSB() {

1
src/modules/modem/analog/ModemLSB.cpp
View File

@ -11,6 +11,7 @@ ModemLSB::ModemLSB() : ModemAnalog() {
ssbShift = nco_crcf_create(LIQUID_NCO); ssbShift = nco_crcf_create(LIQUID_NCO);
nco_crcf_set_frequency(ssbShift, (2.0 * M_PI) * 0.25); nco_crcf_set_frequency(ssbShift, (2.0 * M_PI) * 0.25);
c2rFilt = firhilbf_create(5, 90.0); c2rFilt = firhilbf_create(5, 90.0);
useSignalOutput(true);
} }
ModemBase *ModemLSB::factory() { ModemBase *ModemLSB::factory() {

1
src/modules/modem/analog/ModemUSB.cpp
View File

@ -11,6 +11,7 @@ ModemUSB::ModemUSB() : ModemAnalog() {
ssbShift = nco_crcf_create(LIQUID_NCO); ssbShift = nco_crcf_create(LIQUID_NCO);
nco_crcf_set_frequency(ssbShift, (2.0f * M_PI) * 0.25f); nco_crcf_set_frequency(ssbShift, (2.0f * M_PI) * 0.25f);
c2rFilt = firhilbf_create(5, 90.0); c2rFilt = firhilbf_create(5, 90.0);
useSignalOutput(true);
} }
ModemBase *ModemUSB::factory() { ModemBase *ModemUSB::factory() {