diff --git a/FM.cpp b/FM.cpp index 8449e23..01fa209 100644 --- a/FM.cpp +++ b/FM.cpp @@ -41,6 +41,7 @@ m_callsignTimer(), m_timeoutTimer(), m_holdoffTimer(), m_kerchunkTimer(), +m_kerchunkTX(true), m_ackMinTimer(), m_ackDelayTimer(), m_hangTimer(), @@ -109,10 +110,10 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length) } q15_t currentSample = currentRFSample; - q15_t currentBoost = m_rfAudioBoost; - if(m_state == FS_RELAYING_EXT || m_state == FS_KERCHUNK_EXT){ + q15_t currentBoost = m_rfAudioBoost; + if (m_state == FS_RELAYING_EXT || m_state == FS_KERCHUNK_EXT) { currentSample = currentExtSample; - currentBoost = m_extAudioBoost; + currentBoost = m_extAudioBoost; } // Only let RF audio through when relaying RF audio @@ -244,7 +245,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 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) +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, bool kerchunkTX, uint8_t hangTime, bool useCOS, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel) { m_useCOS = useCOS; m_cosInvert = cosInvert; @@ -252,7 +253,10 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque m_rfAudioBoost = q15_t(rfAudioBoost); m_timeoutTimer.setTimeout(timeout, 0U); + m_kerchunkTimer.setTimeout(kerchunkTime, 0U); + m_kerchunkTX = kerchunkTX; + m_hangTimer.setTimeout(hangTime, 0U); m_timeoutTone.setParams(timeoutLevel); @@ -358,17 +362,19 @@ void CFM::listeningState(bool validRFSignal, bool validExtSignal) sendCallsign(); } - insertSilence(50U); + if (m_state == FS_RELAYING_RF || (m_state == FS_KERCHUNK_RF && m_kerchunkTX)) { + insertSilence(50U); - beginRelaying(); + beginRelaying(); - m_callsignTimer.start(); + m_callsignTimer.start(); - io.setDecode(true); - io.setADCDetection(true); + io.setDecode(true); + io.setADCDetection(true); - m_statusTimer.start(); - serial.writeFMStatus(m_state); + m_statusTimer.start(); + serial.writeFMStatus(m_state); + } } else if (validExtSignal) { if (m_kerchunkTimer.getTimeout() > 0U) { DEBUG1("State to KERCHUNK_EXT"); @@ -383,14 +389,16 @@ void CFM::listeningState(bool validRFSignal, bool validExtSignal) sendCallsign(); } - insertSilence(50U); + if (m_state == FS_RELAYING_EXT || (m_state == FS_KERCHUNK_EXT && m_kerchunkTX)) { + insertSilence(50U); - beginRelaying(); + beginRelaying(); - m_callsignTimer.start(); + m_callsignTimer.start(); - m_statusTimer.start(); - serial.writeFMStatus(m_state); + m_statusTimer.start(); + serial.writeFMStatus(m_state); + } } } @@ -401,6 +409,19 @@ void CFM::kerchunkRFState(bool validSignal) DEBUG1("State to RELAYING_RF"); m_state = FS_RELAYING_RF; m_kerchunkTimer.stop(); + if (!m_kerchunkTX) { + insertSilence(50U); + + beginRelaying(); + + m_callsignTimer.start(); + + io.setDecode(true); + io.setADCDetection(true); + + m_statusTimer.start(); + serial.writeFMStatus(m_state); + } if (m_callsignAtStart && m_callsignAtLatch) { sendCallsign(); m_callsignTimer.start(); @@ -499,6 +520,16 @@ void CFM::kerchunkExtState(bool validSignal) DEBUG1("State to RELAYING_EXT"); m_state = FS_RELAYING_EXT; m_kerchunkTimer.stop(); + if (!m_kerchunkTX) { + insertSilence(50U); + + beginRelaying(); + + m_callsignTimer.start(); + + m_statusTimer.start(); + serial.writeFMStatus(m_state); + } if (m_callsignAtStart && m_callsignAtLatch) { sendCallsign(); m_callsignTimer.start(); diff --git a/FM.h b/FM.h index a179fd3..6b691c9 100644 --- a/FM.h +++ b/FM.h @@ -60,7 +60,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 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); + uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssHighThreshold, uint8_t ctcssLowThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, bool kerchunkTX, uint8_t hangTime, bool useCOS, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel); uint8_t setExt(const char* ack, uint8_t audioBoost, uint8_t speed, uint16_t frequency, uint8_t level); uint8_t getSpace() const; @@ -82,6 +82,7 @@ private: CFMTimer m_timeoutTimer; CFMTimer m_holdoffTimer; CFMTimer m_kerchunkTimer; + bool m_kerchunkTX; CFMTimer m_ackMinTimer; CFMTimer m_ackDelayTimer; CFMTimer m_hangTimer; diff --git a/SerialPort.cpp b/SerialPort.cpp index 3977b3a..fd5c188 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -107,7 +107,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U; #define HW_TYPE "MMDVM" #endif -#define DESCRIPTION "20200520 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" +#define DESCRIPTION "20200620 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #if defined(GITVERSION) #define concat(h, a, b, c) h " " a " " b " GitID #" c "" @@ -442,12 +442,13 @@ uint8_t CSerialPort::setFMParams3(const uint8_t* data, uint8_t length) bool useCOS = (data[8U] & 0x01U) == 0x01U; bool cosInvert = (data[8U] & 0x02U) == 0x02U; + bool kerchunkTX = (data[8U] & 0x04U) == 0x04U; uint8_t rfAudioBoost = data[9U]; uint8_t maxDev = data[10U]; uint8_t rxLevel = data[11U]; - return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, hangTime, useCOS, cosInvert, rfAudioBoost, maxDev, rxLevel); + return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, kerchunkTX, hangTime, useCOS, cosInvert, rfAudioBoost, maxDev, rxLevel); } uint8_t CSerialPort::setFMParams4(const uint8_t* data, uint8_t length)