From 9fab1e08230cfddc4f57b8379c296035b2ff14c6 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 24 Apr 2020 13:13:25 +0100 Subject: [PATCH] Rescale some of the tone levels. --- FM.h | 8 +++----- FMCTCSSTX.cpp | 2 +- FMKeyer.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/FM.h b/FM.h index 77a3d81..9bf4997 100644 --- a/FM.h +++ b/FM.h @@ -71,9 +71,9 @@ private: CFMTimer m_ackMinTimer; CFMTimer m_ackDelayTimer; CFMTimer m_hangTimer; - CFMDirectFormI m_filterStage1; - CFMDirectFormI m_filterStage2; - CFMDirectFormI m_filterStage3; + CFMDirectFormI m_filterStage1; + CFMDirectFormI m_filterStage2; + CFMDirectFormI m_filterStage3; void stateMachine(bool validSignal, uint8_t length); void listeningState(bool validSignal); @@ -86,8 +86,6 @@ private: void sendCallsign(); void beginRelaying(); - - q15_t filter(q15_t sample); }; #endif diff --git a/FMCTCSSTX.cpp b/FMCTCSSTX.cpp index fb5a997..ce11d9f 100644 --- a/FMCTCSSTX.cpp +++ b/FMCTCSSTX.cpp @@ -106,7 +106,7 @@ uint8_t CFMCTCSSTX::setParams(uint8_t frequency, uint8_t level) q15_t arg = 0; for (uint16_t i = 0U; i < m_length; i++) { - q31_t value = ::arm_sin_q15(arg) * q15_t(level * 128); + q31_t value = ::arm_sin_q15(arg) * q15_t(level * 1280); m_values[i] = q15_t(__SSAT((value >> 15), 16)); arg += entry->increment; diff --git a/FMKeyer.cpp b/FMKeyer.cpp index 70beea4..2b49dac 100644 --- a/FMKeyer.cpp +++ b/FMKeyer.cpp @@ -111,8 +111,8 @@ uint8_t CFMKeyer::setParams(const char* text, uint8_t speed, uint16_t frequency, } } - m_highLevel = q15_t(highLevel * 128); - m_lowLevel = q15_t(lowLevel * 128); + m_highLevel = q15_t(highLevel); + m_lowLevel = q15_t(lowLevel); m_dotLen = 24000U / speed; // In samples