ModemDigital cleanup

This commit is contained in:
Charles J. Cliffe 2015-11-18 23:01:56 -05:00
parent f43abdddaf
commit a6cb932ab9

View File

@ -1,10 +1,6 @@
#include "ModemDigital.h" #include "ModemDigital.h"
ModemDigital::ModemDigital() { ModemDigital::ModemDigital() {
demodulatorCons.store(2);
// Reset demodulator Constellations & Lock
updateDemodulatorCons(0);
currentDemodLock.store(false);
} }
ModemKit *ModemDigital::buildKit(long long sampleRate, int audioSampleRate) { ModemKit *ModemDigital::buildKit(long long sampleRate, int audioSampleRate) {
@ -22,7 +18,6 @@ void ModemDigital::disposeKit(ModemKit *kit) {
delete dkit; delete dkit;
} }
void ModemDigital::setDemodulatorLock(bool demod_lock_in) { void ModemDigital::setDemodulatorLock(bool demod_lock_in) {
currentDemodLock.store(demod_lock_in); currentDemodLock.store(demod_lock_in);
} }
@ -40,7 +35,7 @@ int ModemDigital::getDemodulatorCons() {
} }
void ModemDigital::updateDemodulatorLock(modem mod, float sensitivity) { 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) { void ModemDigital::updateDemodulatorCons(int cons) {