g4klx/MMDVM
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM.git synced 2026-04-05 06:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove dependency to IO in CTCSSRX

Browse source
This commit is contained in:
Geoffrey Merck 2020-04-26 12:24:05 +02:00
parent 1bc8726046
commit 6824d5662a
4 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
FM.cpp
View file

@ -54,7 +54,7 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
for (; i < length; i++) {
q15_t currentSample = samples[i];//save to a local variable to avoid indirection on every access
CTCSSState ctcssState = m_ctcssRX.process(currentSample);
CTCSSState ctcssState = m_ctcssRX.process(getUnscaledSample(currentSample));
if (CTCSS_NOT_READY(ctcssState) && m_modemState != STATE_FM) {
//Not enough samples to determine if you have CTCSS, just carry on
@ -397,3 +397,17 @@ void CFM::beginRelaying()
m_timeoutTimer.start();
m_ackMinTimer.start();
}
q15_t CFM::getUnscaledSample(q15_t sample)
{
// 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;
return q15_t(sample31);
}