From dac0f26e5dcf6092a7cb483b2dd483f8960a36b8 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 28 Apr 2020 14:43:40 +0100 Subject: [PATCH] Rename RXBoost to RFAudioBoost. --- FM.cpp | 10 +++++----- FM.h | 4 ++-- SerialPort.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FM.cpp b/FM.cpp index 4a2eb70..7c90e01 100644 --- a/FM.cpp +++ b/FM.cpp @@ -41,7 +41,7 @@ m_filterStage2(32768, 0,-32768, 32768, -50339, 19052), m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460), m_blanking(), m_useCOS(true), -m_rxBoost(1U) +m_rfAudioBoost(1U) { } @@ -84,7 +84,7 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length) else currentSample = 0U; - currentSample *= m_rxBoost; + currentSample *= m_rfAudioBoost; if (!m_callsign.isRunning()) currentSample += m_rfAck.getHighAudio(); @@ -144,10 +144,10 @@ uint8_t CFM::setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_ return m_rfAck.setParams(rfAck, speed, frequency, level, level); } -uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, uint8_t rxBoost, uint8_t maxDev, uint8_t rxLevel) +uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel) { - m_useCOS = useCOS; - m_rxBoost = q15_t(rxBoost); + m_useCOS = useCOS; + m_rfAudioBoost = q15_t(rfAudioBoost); m_timeoutTimer.setTimeout(timeout, 0U); m_kerchunkTimer.setTimeout(kerchunkTime, 0U); diff --git a/FM.h b/FM.h index c56d462..d66f2ab 100644 --- a/FM.h +++ b/FM.h @@ -54,7 +54,7 @@ public: uint8_t setCallsign(const char* callsign, uint8_t speed, uint16_t frequency, uint8_t time, uint8_t holdoff, uint8_t highLevel, uint8_t lowLevel, bool callsignAtStart, bool callsignAtEnd); uint8_t setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_t minTime, uint16_t delay, uint8_t level); - uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, uint8_t rxBoost, uint8_t maxDev, uint8_t rxLevel); + uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel); private: CFMKeyer m_callsign; @@ -77,7 +77,7 @@ private: CFMDirectFormI m_filterStage3; CFMBlanking m_blanking; bool m_useCOS; - q15_t m_rxBoost; + q15_t m_rfAudioBoost; void stateMachine(bool validSignal, uint8_t length); void listeningState(bool validSignal); diff --git a/SerialPort.cpp b/SerialPort.cpp index 84282d8..7150695 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -101,7 +101,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U; #define HW_TYPE "MMDVM" #endif -#define DESCRIPTION "20200427 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" +#define DESCRIPTION "20200428 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #if defined(GITVERSION) #define concat(h, a, b, c) h " " a " " b " GitID #" c "" @@ -423,11 +423,11 @@ uint8_t CSerialPort::setFMParams3(const uint8_t* data, uint8_t length) bool useCOS = (data[7U] & 0x01U) == 0x01U; - uint8_t rxBoost = data[8U]; + uint8_t rfAudioBoost = data[8U]; uint8_t maxDev = data[9U]; uint8_t rxLevel = data[10U]; - return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssThreshold, ctcssLevel, kerchunkTime, hangTime, useCOS, rxBoost, maxDev, rxLevel); + return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssThreshold, ctcssLevel, kerchunkTime, hangTime, useCOS, rfAudioBoost, maxDev, rxLevel); } uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)