From 4feca3c5b7d320200e6d35be6c7f4428990f304b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 3 May 2020 13:08:33 +0100 Subject: [PATCH 1/3] Clock the timers seperately. --- FM.cpp | 29 +++++++++++++++++------------ FM.h | 4 +++- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/FM.cpp b/FM.cpp index e843996..5a1ca00 100644 --- a/FM.cpp +++ b/FM.cpp @@ -53,6 +53,8 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length) if (!m_useCOS) cos = true; + clock(length); + uint8_t i = 0U; for (; i < length; i++) { q15_t currentSample = samples[i];//save to a local variable to avoid indirection on every access @@ -65,20 +67,20 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length) } else if (CTCSS_READY(ctcssState) && m_modemState != STATE_FM) { //we had enough samples for CTCSS and we are in some other mode than FM bool validCTCSS = CTCSS_VALID(ctcssState); - stateMachine(validCTCSS && cos, i + 1U); + stateMachine(validCTCSS && cos); if (m_modemState != STATE_FM) continue; } else if (CTCSS_READY(ctcssState) && m_modemState == STATE_FM) { //We had enough samples for CTCSS and we are in FM mode, trigger the state machine bool validCTCSS = CTCSS_VALID(ctcssState); - stateMachine(validCTCSS && cos, i + 1U); + stateMachine(validCTCSS && cos); if (m_modemState != STATE_FM) break; } else if (CTCSS_NOT_READY(ctcssState) && m_modemState == STATE_FM && i == length - 1) { //Not enough samples for CTCSS but we already are in FM, trigger the state machine //but do not trigger the state machine on every single sample, save CPU! bool validCTCSS = CTCSS_VALID(ctcssState); - stateMachine(validCTCSS && cos, i + 1U); + stateMachine(validCTCSS && cos); } // Only let audio through when relaying audio @@ -182,16 +184,8 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque return m_ctcssTX.setParams(ctcssFrequency, ctcssLevel); } -void CFM::stateMachine(bool validSignal, uint8_t length) +void CFM::stateMachine(bool validSignal) { - m_callsignTimer.clock(length); - m_timeoutTimer.clock(length); - m_holdoffTimer.clock(length); - m_kerchunkTimer.clock(length); - m_ackMinTimer.clock(length); - m_ackDelayTimer.clock(length); - m_hangTimer.clock(length); - switch (m_state) { case FS_LISTENING: listeningState(validSignal); @@ -232,6 +226,17 @@ void CFM::stateMachine(bool validSignal, uint8_t length) } } +void CFM::clock(uint8_t length) +{ + m_callsignTimer.clock(length); + m_timeoutTimer.clock(length); + m_holdoffTimer.clock(length); + m_kerchunkTimer.clock(length); + m_ackMinTimer.clock(length); + m_ackDelayTimer.clock(length); + m_hangTimer.clock(length); +} + void CFM::listeningState(bool validSignal) { if (validSignal) { diff --git a/FM.h b/FM.h index a852a80..9bf821c 100644 --- a/FM.h +++ b/FM.h @@ -83,7 +83,7 @@ private: q15_t m_rfAudioBoost; CFMDownsampler m_downsampler; - void stateMachine(bool validSignal, uint8_t length); + void stateMachine(bool validSignal); void listeningState(bool validSignal); void kerchunkState(bool validSignal); void relayingState(bool validSignal); @@ -92,6 +92,8 @@ private: void timeoutWaitState(bool validSignal); void hangState(bool validSignal); + void clock(uint8_t length); + void sendCallsign(); void beginRelaying(); }; From 915be8c27999f2cdcbd2e0b190f96b5f7086b53a Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 4 May 2020 22:06:57 +0100 Subject: [PATCH 2/3] Calculate the AckMinTime accurately. --- FM.cpp | 4 +++- SerialPort.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FM.cpp b/FM.cpp index 5a1ca00..d3fa0ab 100644 --- a/FM.cpp +++ b/FM.cpp @@ -160,7 +160,9 @@ uint8_t CFM::setCallsign(const char* callsign, uint8_t speed, uint16_t frequency uint8_t CFM::setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_t minTime, uint16_t delay, uint8_t level) { m_ackDelayTimer.setTimeout(0U, delay); - m_ackMinTimer.setTimeout(minTime, 0U); + + if (minTime > 0U) + m_ackMinTimer.setTimeout(minTime, delay); return m_rfAck.setParams(rfAck, speed, frequency, level, level); } diff --git a/SerialPort.cpp b/SerialPort.cpp index 8d6a6f9..2922b57 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -101,7 +101,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U; #define HW_TYPE "MMDVM" #endif -#define DESCRIPTION "20200502 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" +#define DESCRIPTION "20200504 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #if defined(GITVERSION) #define concat(h, a, b, c) h " " a " " b " GitID #" c "" From aa7a484c7a5bc38da9c10592798083510dcfaeb7 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 4 May 2020 22:18:51 +0100 Subject: [PATCH 3/3] Allow the start callsign to occur when the kerchunk timer has latched. --- FM.cpp | 10 +++++++++- FM.h | 3 ++- SerialPort.cpp | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/FM.cpp b/FM.cpp index d3fa0ab..8d31e37 100644 --- a/FM.cpp +++ b/FM.cpp @@ -29,6 +29,7 @@ m_timeoutTone(), m_state(FS_LISTENING), m_callsignAtStart(false), m_callsignAtEnd(false), +m_callsignAtLatch(false), m_callsignTimer(), m_timeoutTimer(), m_holdoffTimer(), @@ -140,10 +141,11 @@ void CFM::reset() m_timeoutTone.stop(); } -uint8_t CFM::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 CFM::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) { m_callsignAtStart = callsignAtStart; m_callsignAtEnd = callsignAtEnd; + m_callsignAtLatch = callsignAtLatch; uint16_t holdoffTime = holdoff * 60U; uint16_t callsignTime = time * 60U; @@ -246,6 +248,8 @@ void CFM::listeningState(bool validSignal) DEBUG1("State to KERCHUNK"); m_state = FS_KERCHUNK; m_kerchunkTimer.start(); + if (m_callsignAtStart && !m_callsignAtLatch) + sendCallsign(); } else { DEBUG1("State to RELAYING"); m_state = FS_RELAYING; @@ -269,6 +273,10 @@ void CFM::kerchunkState(bool validSignal) DEBUG1("State to RELAYING"); m_state = FS_RELAYING; m_kerchunkTimer.stop(); + if (m_callsignAtStart && m_callsignAtLatch) { + sendCallsign(); + m_callsignTimer.start(); + } } } else { DEBUG1("State to LISTENING"); diff --git a/FM.h b/FM.h index 9bf821c..7e2e79f 100644 --- a/FM.h +++ b/FM.h @@ -53,7 +53,7 @@ public: void reset(); - 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 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, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel); @@ -66,6 +66,7 @@ private: FM_STATE m_state; bool m_callsignAtStart; bool m_callsignAtEnd; + bool m_callsignAtLatch; CFMTimer m_callsignTimer; CFMTimer m_timeoutTimer; CFMTimer m_holdoffTimer; diff --git a/SerialPort.cpp b/SerialPort.cpp index 2922b57..190e105 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -376,6 +376,7 @@ uint8_t CSerialPort::setFMParams1(const uint8_t* data, uint8_t length) bool callAtStart = (data[6U] & 0x01U) == 0x01U; bool callAtEnd = (data[6U] & 0x02U) == 0x02U; + bool callAtLatch = (data[6U] & 0x04U) == 0x04U; char callsign[50U]; uint8_t n = 0U; @@ -383,7 +384,7 @@ uint8_t CSerialPort::setFMParams1(const uint8_t* data, uint8_t length) callsign[n] = data[i]; callsign[n] = '\0'; - return fm.setCallsign(callsign, speed, frequency, time, holdoff, highLevel, lowLevel, callAtStart, callAtEnd); + return fm.setCallsign(callsign, speed, frequency, time, holdoff, highLevel, lowLevel, callAtStart, callAtEnd, callAtLatch); } uint8_t CSerialPort::setFMParams2(const uint8_t* data, uint8_t length)