Merge branch 'AX25' into AX25_FM

This commit is contained in:
Jonathan Naylor 2020-07-12 15:28:00 +01:00
commit 5960fb97f3
3 changed files with 7 additions and 7 deletions

4
FM.cpp
View file

@ -149,11 +149,11 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
currentSample += m_callsign.getLowAudio();
}
currentSample = m_filterStage3.filter(m_filterStage2.filter(m_filterStage1.filter(currentSample)));
if (!m_callsign.isRunning() && !m_rfAck.isRunning() && !m_extAck.isRunning())
currentSample += m_timeoutTone.getAudio();
currentSample = m_filterStage3.filter(m_filterStage2.filter(m_filterStage1.filter(currentSample)));
currentSample += m_ctcssTX.getAudio();
m_outputRFRB.put(currentSample);