From 93a8e6323317a801dd87b34f7d48ccde6bb30cae Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 27 Apr 2020 11:26:19 +0200 Subject: [PATCH] Remove m_rxLevel --- FM.cpp | 6 ++---- FM.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/FM.cpp b/FM.cpp index 75e12b3..85f9fb5 100644 --- a/FM.cpp +++ b/FM.cpp @@ -41,8 +41,7 @@ m_filterStage2(32768, 0,-32768, 32768, -50339, 19052), m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460), m_blanking(), m_useCOS(true), -m_rxBoost(1U), -m_rxLevel(128 * 128) +m_rxBoost(1U) { } @@ -149,7 +148,6 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque { m_useCOS = useCOS; m_rxBoost = q15_t(rxBoost); - m_rxLevel = q15_t(rxLevel * 128); m_timeoutTimer.setTimeout(timeout, 0U); m_kerchunkTimer.setTimeout(kerchunkTime, 0U); @@ -158,7 +156,7 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque m_timeoutTone.setParams(timeoutLevel); m_blanking.setParams(maxDev, timeoutLevel); - uint8_t ret = m_ctcssRX.setParams(ctcssFrequency, ctcssThreshold, m_rxLevel); + uint8_t ret = m_ctcssRX.setParams(ctcssFrequency, ctcssThreshold, q15_t(rxLevel * 128)); if (ret != 0U) return ret; diff --git a/FM.h b/FM.h index b9d6469..c56d462 100644 --- a/FM.h +++ b/FM.h @@ -78,7 +78,6 @@ private: CFMBlanking m_blanking; bool m_useCOS; q15_t m_rxBoost; - q15_t m_rxLevel; void stateMachine(bool validSignal, uint8_t length); void listeningState(bool validSignal);