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

Small tidy-ups.

This commit is contained in:
Jonathan Naylor 2020-04-22 14:08:34 +01:00
parent 7940025095
commit 3f1f1d1586
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FM.cpp
View File

@ -60,36 +60,31 @@ m_hangTimer()
void CFM::samples(q15_t* samples, uint8_t length)
{
CTCSSState ctcssState;
bool validCTCSS = false;
q15_t currentSample;
uint8_t i = 0;
for (; i < length; i++) {
currentSample = samples[i];//save to a local variable to avoid indirection on every access
q15_t currentSample = samples[i];//save to a local variable to avoid indirection on every access
ctcssState = m_ctcssRX.process(currentSample);
CTCSSState ctcssState = m_ctcssRX.process(currentSample);
if(CTCSS_NOT_READY(ctcssState) && m_modemState != STATE_FM) {
if (CTCSS_NOT_READY(ctcssState) && m_modemState != STATE_FM) {
//Not enough samples to determine if you have CTCSS, just carry on
continue;
} else if(CTCSS_READY(ctcssState) && m_modemState != STATE_FM) {
} else if (CTCSS_READY(ctcssState) && m_modemState != STATE_FM) {
//we had enough samples for CTCSS and we are in some other mode than FM
validCTCSS = CTCSS_VALID(ctcssState);
bool validCTCSS = CTCSS_VALID(ctcssState);
stateMachine(validCTCSS, i + 1U);
if (m_modemState != STATE_FM)
continue;
} else if(CTCSS_READY(ctcssState) && m_modemState == STATE_FM) {
} else if (CTCSS_READY(ctcssState) && m_modemState == STATE_FM) {
//We had enough samples for CTCSS and we are in FM mode, trigger the state machine
validCTCSS = CTCSS_VALID(ctcssState);
bool validCTCSS = CTCSS_VALID(ctcssState);
stateMachine(validCTCSS, i + 1U);
if (m_modemState != STATE_FM)
break;
} else if(CTCSS_NOT_READY(ctcssState) && m_modemState == STATE_FM && i == length - 1) {
} else if (CTCSS_NOT_READY(ctcssState) && m_modemState == STATE_FM && i == length - 1) {
//Not enough samples for CTCSS but we already are in FM, trigger the state machine
//but do not trigger the state machine on every single sample, save CPU!
validCTCSS = CTCSS_VALID(ctcssState);
bool validCTCSS = CTCSS_VALID(ctcssState);
stateMachine(validCTCSS, i + 1U);
}
@ -114,7 +109,7 @@ void CFM::samples(q15_t* samples, uint8_t length)
samples[i] = currentSample;
}
if(m_modemState == STATE_FM)
if (m_modemState == STATE_FM)
io.write(STATE_FM, samples, i);//only write the actual number of processed samples to IO
}

6
FMCTCSSRX.cpp
View File

@ -86,7 +86,7 @@ m_threshold(0.0F),
m_count(0U),
m_q0(0.0F),
m_q1(0.0F),
m_result((CTCSSState)0U)
m_result(CTS_NONE)
{
}
@ -118,7 +118,7 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
if (m_count == N) {
float32_t value = m_q0 * m_q0 + m_q1 * m_q1 - m_q0 * m_q1 * m_coeff;
m_result = m_result | CTS_READY;
if(value >= m_threshold)
if (value >= m_threshold)
m_result = m_result | CTS_VALID;
else
m_result = m_result & ~CTS_VALID;
@ -140,6 +140,6 @@ void CFMCTCSSRX::reset()
{
m_q0 = 0.0F;
m_q1 = 0.0F;
m_result = (CTCSSState)0U;
m_result = CTS_NONE;
m_count = 0U;
}

3
FMCTCSSRX.h
View File

@ -21,8 +21,9 @@
#include "Config.h"
enum CTCSSState : uint8_t
enum CTCSSState
{
CTS_NONE = 0,
CTS_READY = 1,
CTS_VALID = 2,
CTS_READY_VALID = CTS_READY | CTS_VALID