diff --git a/FM.cpp b/FM.cpp index 543c497..3bc0bbf 100644 --- a/FM.cpp +++ b/FM.cpp @@ -183,7 +183,7 @@ 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, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel) +uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssHighThreshold, uint8_t ctcssLowThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel) { m_useCOS = useCOS; m_cosInvert = cosInvert; @@ -199,7 +199,7 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque m_rxLevel = rxLevel; //q15_t(255)/q15_t(rxLevel >> 1); - uint8_t ret = m_ctcssRX.setParams(ctcssFrequency, ctcssThreshold); + uint8_t ret = m_ctcssRX.setParams(ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold); if (ret != 0U) return ret; diff --git a/FM.h b/FM.h index 29887a8..6411585 100644 --- a/FM.h +++ b/FM.h @@ -56,7 +56,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, bool callsignAtLatch); 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, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel); + uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssHighThreshold, uint8_t ctcssLowThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel); private: CFMKeyer m_callsign; diff --git a/FMCTCSSRX.cpp b/FMCTCSSRX.cpp index 8b22fcd..e88ff98 100644 --- a/FMCTCSSRX.cpp +++ b/FMCTCSSRX.cpp @@ -82,7 +82,8 @@ const uint16_t N = 24000U / 4U; CFMCTCSSRX::CFMCTCSSRX() : m_coeffDivTwo(0), -m_threshold(0), +m_highThreshold(0), +m_lowThreshold(0), m_count(0U), m_q0(0), m_q1(0), @@ -90,7 +91,7 @@ m_result(CTS_NONE) { } -uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t threshold) +uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t highThreshold, uint8_t lowThreshold) { m_coeffDivTwo = 0; @@ -104,7 +105,8 @@ uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t threshold) if (m_coeffDivTwo == 0) return 4U; - m_threshold = q31_t(threshold); + m_highThreshold = q31_t(highThreshold); + m_lowThreshold = q31_t(lowThreshold); return 0U; } @@ -148,14 +150,19 @@ uint8_t CFMCTCSSRX::process(q15_t sample) q31_t value = t2 + t4 - t9; bool previousCTCSSValid = CTCSS_VALID(m_result); + + q31_t threshold = m_highThreshold; + if (previousCTCSSValid) + threshold = m_lowThreshold; + m_result |= CTS_READY; - if (value >= m_threshold) + if (value >= threshold) m_result |= CTS_VALID; else m_result &= ~CTS_VALID; if (previousCTCSSValid != CTCSS_VALID(m_result)) - DEBUG4("CTCSS Value / Threshold / Valid", value, m_threshold, CTCSS_VALID(m_result)); + DEBUG4("CTCSS Value / Threshold / Valid", value, threshold, CTCSS_VALID(m_result)); m_count = 0U; m_q0 = 0; diff --git a/FMCTCSSRX.h b/FMCTCSSRX.h index 6b56ba4..eed82de 100644 --- a/FMCTCSSRX.h +++ b/FMCTCSSRX.h @@ -34,7 +34,7 @@ class CFMCTCSSRX { public: CFMCTCSSRX(); - uint8_t setParams(uint8_t frequency, uint8_t threshold); + uint8_t setParams(uint8_t frequency, uint8_t highThreshold, uint8_t lowThreshold); uint8_t process(q15_t sample); @@ -42,7 +42,8 @@ public: private: q63_t m_coeffDivTwo; - q31_t m_threshold; + q31_t m_highThreshold; + q31_t m_lowThreshold; uint16_t m_count; q31_t m_q0; q31_t m_q1; diff --git a/SerialPort.cpp b/SerialPort.cpp index 4910c10..fe899ec 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -101,7 +101,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U; #define HW_TYPE "MMDVM" #endif -#define DESCRIPTION "20200510 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" +#define DESCRIPTION "20200512 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #if defined(GITVERSION) #define concat(h, a, b, c) h " " a " " b " GitID #" c "" @@ -409,27 +409,28 @@ uint8_t CSerialPort::setFMParams2(const uint8_t* data, uint8_t length) uint8_t CSerialPort::setFMParams3(const uint8_t* data, uint8_t length) { - if (length < 11U) + if (length < 12U) return 4U; uint16_t timeout = data[0U] * 5U; uint8_t timeoutLevel = data[1U]; - uint8_t ctcssFrequency = data[2U]; - uint8_t ctcssThreshold = data[3U]; - uint8_t ctcssLevel = data[4U]; + uint8_t ctcssFrequency = data[2U]; + uint8_t ctcssHighThreshold = data[3U]; + uint8_t ctcssLowThreshold = data[4U]; + uint8_t ctcssLevel = data[5U]; - uint8_t kerchunkTime = data[5U]; - uint8_t hangTime = data[6U]; + uint8_t kerchunkTime = data[6U]; + uint8_t hangTime = data[7U]; - bool useCOS = (data[7U] & 0x01U) == 0x01U; - bool cosInvert = (data[7U] & 0x02U) == 0x02U; + bool useCOS = (data[8U] & 0x01U) == 0x01U; + bool cosInvert = (data[8U] & 0x02U) == 0x02U; - uint8_t rfAudioBoost = data[8U]; - uint8_t maxDev = data[9U]; - uint8_t rxLevel = data[10U]; + uint8_t rfAudioBoost = data[9U]; + uint8_t maxDev = data[10U]; + uint8_t rxLevel = data[11U]; - return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssThreshold, ctcssLevel, kerchunkTime, hangTime, useCOS, cosInvert, rfAudioBoost, maxDev, rxLevel); + return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, hangTime, useCOS, cosInvert, rfAudioBoost, maxDev, rxLevel); } uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)