Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make CTCSS threshold RXLevel and RXBoost agnostic"

This commit is contained in:
Jonathan Naylor 2020-04-25 23:48:02 +01:00 committed by GitHub
parent f92d93772c
commit bd4096b6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FMCTCSSRX.cpp
View File

@ -113,15 +113,6 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
{ {
m_result = m_result & (~CTS_READY); m_result = m_result & (~CTS_READY);
// sample / rxLevel
q15_t rxLevel = io.getRxLevel();
q31_t sample31 = q31_t(sample) << 16;
if (((sample31 >> 31) & 1) == ((rxLevel >> 15) & 1))
sample31 += rxLevel >> 1;
else
sample31 -= rxLevel >> 1;
sample31 /= rxLevel;
q31_t q2 = m_q1; q31_t q2 = m_q1;
m_q1 = m_q0; m_q1 = m_q0;
@ -131,7 +122,7 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
q31_t t3 = t2 * 2; q31_t t3 = t2 * 2;
// m_q0 = m_coeffDivTwo * m_q1 * 2 - q2 + sample // m_q0 = m_coeffDivTwo * m_q1 * 2 - q2 + sample
m_q0 = t3 - q2 + sample31; m_q0 = t3 - q2 + q31_t(sample);
m_count++; m_count++;
if (m_count == N) { if (m_count == N) {
@ -152,6 +143,7 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
// value = m_q0 * m_q0 + m_q1 * m_q1 - m_q0 * m_q1 * m_coeffDivTwo * 2 // value = m_q0 * m_q0 + m_q1 * m_q1 - m_q0 * m_q1 * m_coeffDivTwo * 2
q31_t value = t2 + t4 - t9; q31_t value = t2 + t4 - t9;
m_result = m_result | CTS_READY; m_result = m_result | CTS_READY;
if (value >= m_threshold) if (value >= m_threshold)
m_result = m_result | CTS_VALID; m_result = m_result | CTS_VALID;

5
IO.cpp
View File

@ -592,8 +592,3 @@ bool CIO::hasLockout() const
{ {
return m_lockout; return m_lockout;
} }
q15_t CIO::getRxLevel() const
{
return m_rxLevel;
}

2
IO.h
View File

@ -56,8 +56,6 @@ public:
void selfTest(); void selfTest();
q15_t getRxLevel() const;
private: private:
bool m_started; bool m_started;