From a6cb932ab9eab2a4b7062016f768a16992856aac Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 18 Nov 2015 23:01:56 -0500 Subject: [PATCH] ModemDigital cleanup --- src/modules/modem/ModemDigital.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/modules/modem/ModemDigital.cpp b/src/modules/modem/ModemDigital.cpp index f24baa4..ee5ba2d 100644 --- a/src/modules/modem/ModemDigital.cpp +++ b/src/modules/modem/ModemDigital.cpp @@ -1,10 +1,6 @@ #include "ModemDigital.h" ModemDigital::ModemDigital() { - demodulatorCons.store(2); - // Reset demodulator Constellations & Lock - updateDemodulatorCons(0); - currentDemodLock.store(false); } ModemKit *ModemDigital::buildKit(long long sampleRate, int audioSampleRate) { @@ -22,7 +18,6 @@ void ModemDigital::disposeKit(ModemKit *kit) { delete dkit; } - void ModemDigital::setDemodulatorLock(bool demod_lock_in) { currentDemodLock.store(demod_lock_in); } @@ -40,7 +35,7 @@ int ModemDigital::getDemodulatorCons() { } void ModemDigital::updateDemodulatorLock(modem mod, float sensitivity) { - modem_get_demodulator_evm(mod) <= sensitivity ? setDemodulatorLock(true) : setDemodulatorLock(false); + setDemodulatorLock(modem_get_demodulator_evm(mod) <= sensitivity); } void ModemDigital::updateDemodulatorCons(int cons) {