Remove m_rxLevel

This commit is contained in:
Geoffrey Merck 2020-04-27 11:26:19 +02:00
parent 4ffaa62855
commit 93a8e63233
2 changed files with 2 additions and 5 deletions

6
FM.cpp
View File

@ -41,8 +41,7 @@ m_filterStage2(32768, 0,-32768, 32768, -50339, 19052),
m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460), m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460),
m_blanking(), m_blanking(),
m_useCOS(true), m_useCOS(true),
m_rxBoost(1U), m_rxBoost(1U)
m_rxLevel(128 * 128)
{ {
} }
@ -149,7 +148,6 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque
{ {
m_useCOS = useCOS; m_useCOS = useCOS;
m_rxBoost = q15_t(rxBoost); m_rxBoost = q15_t(rxBoost);
m_rxLevel = q15_t(rxLevel * 128);
m_timeoutTimer.setTimeout(timeout, 0U); m_timeoutTimer.setTimeout(timeout, 0U);
m_kerchunkTimer.setTimeout(kerchunkTime, 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_timeoutTone.setParams(timeoutLevel);
m_blanking.setParams(maxDev, 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) if (ret != 0U)
return ret; return ret;

1
FM.h
View File

@ -78,7 +78,6 @@ private:
CFMBlanking m_blanking; CFMBlanking m_blanking;
bool m_useCOS; bool m_useCOS;
q15_t m_rxBoost; q15_t m_rxBoost;
q15_t m_rxLevel;
void stateMachine(bool validSignal, uint8_t length); void stateMachine(bool validSignal, uint8_t length);
void listeningState(bool validSignal); void listeningState(bool validSignal);