From 9170c398be1f990f97d0e78c1b70e63f61e3d788 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 21 Apr 2020 21:36:30 +0200 Subject: [PATCH] Reenable CTCSS --- FM.cpp | 6 ++++-- FMCTCSSTX.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/FM.cpp b/FM.cpp index b64e52e..db339e6 100644 --- a/FM.cpp +++ b/FM.cpp @@ -75,14 +75,16 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length) currentSample = 0U; } - if(!m_callsign.isRunning()) + /*if(!m_callsign.isRunning()) currentSample = m_rfAck.getAudio(currentSample); if(!m_rfAck.isRunning()) currentSample = m_rfAck.getAudio(currentSample); if (!m_callsign.isRunning() && !m_rfAck.isRunning()) - currentSample = m_timeoutTone.getAudio(currentSample); + currentSample = m_timeoutTone.getAudio(currentSample);*/ + + currentSample = m_ctcssTX.getAudio(currentSample); samples[i] = currentSample; } diff --git a/FMCTCSSTX.h b/FMCTCSSTX.h index f8c5bf3..e72d654 100644 --- a/FMCTCSSTX.h +++ b/FMCTCSSTX.h @@ -28,7 +28,7 @@ public: uint8_t setParams(uint8_t frequency, uint8_t level); void getAudio(q15_t* samples, uint8_t length); - inline q15_t getAudio(q15_t sample); + q15_t getAudio(q15_t sample); private: q15_t* m_values;