Superminaren/MMDVM
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM.git synced 2026-08-21 14:36:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small code cleanups.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-04-21 22:30:28 +01:00
parent 23ff29c8f1
commit 03f5056236
7 changed files with 11 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FM.cpp
+7 -8
View File
@@ -58,28 +58,27 @@ m_hangTimer()
m_filter.pCoeffs = FILTER_COEFFS;
}
void CFM::samples(bool cos, q15_t* samples, uint8_t length)
void CFM::samples(q15_t* samples, uint8_t length)
{
bool validCTCSS = m_ctcssRX.process(samples, length);
stateMachine(validCTCSS /*&& cos*/, length);
stateMachine(validCTCSS, length);
if (m_modemState != STATE_FM)
return;
q15_t currentSample;
for(uint8_t i = 0U; i < length; i++) {
for (uint8_t i = 0U; i < length; i++) {
currentSample = samples[i];//save to a local variable to avoid indirection on every access
// Only let audio through when relaying audio
if (m_state != FS_RELAYING && m_state != FS_KERCHUNK) {
if (m_state != FS_RELAYING && m_state != FS_KERCHUNK)
currentSample = 0U;
}
if(!m_callsign.isRunning())
if (!m_callsign.isRunning())
currentSample += m_rfAck.getAudio();
if(!m_rfAck.isRunning())
if (!m_rfAck.isRunning())
currentSample += m_callsign.getAudio();
if (!m_callsign.isRunning() && !m_rfAck.isRunning())
@@ -197,7 +196,7 @@ void CFM::stateMachine(bool validSignal, uint8_t length)
void CFM::listeningState(bool validSignal)
{
if(validSignal) {
if (validSignal) {
if (m_kerchunkTimer.getTimeout() > 0U) {
DEBUG1("State to KERCHUNK");
m_state = FS_KERCHUNK;