From ed6bd66fab50367f54e0a06733fa781570b8363a Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 6 Sep 2021 21:53:01 +0100 Subject: [PATCH] Rename SimpleMode to LinkMode. --- FM.cpp | 12 ++++++------ FM.h | 6 +++--- SerialPort.cpp | 4 ++-- Version.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FM.cpp b/FM.cpp index fa32526..86f9c9e 100644 --- a/FM.cpp +++ b/FM.cpp @@ -56,7 +56,7 @@ m_filterStage2(32768, 0,-32768, 32768, -50339, 19052), m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460), m_blanking(), m_accessMode(1U), -m_simpleMode(false), +m_linkMode(false), m_cosInvert(false), m_noiseSquelch(false), m_rfAudioBoost(1U), @@ -311,10 +311,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 ctcssHighThreshold, uint8_t ctcssLowThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, uint8_t accessMode, bool simpleMode, bool cosInvert, bool noiseSquelch, uint8_t squelchHighThreshold, uint8_t squelchLowThreshold, 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, uint8_t accessMode, bool linkMode, bool cosInvert, bool noiseSquelch, uint8_t squelchHighThreshold, uint8_t squelchLowThreshold, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel) { m_accessMode = accessMode; - m_simpleMode = simpleMode; + m_linkMode = linkMode; m_cosInvert = cosInvert; m_noiseSquelch = noiseSquelch; @@ -351,8 +351,8 @@ uint8_t CFM::setExt(const char* ack, uint8_t audioBoost, uint8_t speed, uint16_t void CFM::stateMachine(bool validRFSignal, bool validExtSignal) { - if (m_simpleMode) { - simpleStateMachine(validRFSignal, validExtSignal); + if (m_linkMode) { + linkStateMachine(validRFSignal, validExtSignal); } else { if (m_duplex) duplexStateMachine(validRFSignal, validExtSignal); @@ -1008,7 +1008,7 @@ void CFM::timeoutExtWaitStateSimplex(bool validSignal) } } -void CFM::simpleStateMachine(bool validRFSignal, bool validExtSignal) +void CFM::linkStateMachine(bool validRFSignal, bool validExtSignal) { switch (m_state) { case FS_LISTENING: diff --git a/FM.h b/FM.h index 0b19540..dd88571 100644 --- a/FM.h +++ b/FM.h @@ -63,7 +63,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, uint8_t accessMode, bool simpleMode, bool cosInvert, bool noiseSquelch, uint8_t squelchHighThreshold, uint8_t squelchLowThreshold, 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, uint8_t accessMode, bool linkMode, bool cosInvert, bool noiseSquelch, uint8_t squelchHighThreshold, uint8_t squelchLowThreshold, 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; @@ -97,7 +97,7 @@ private: CFMDirectFormI m_filterStage3; CFMBlanking m_blanking; uint8_t m_accessMode; - bool m_simpleMode; + bool m_linkMode; bool m_cosInvert; bool m_noiseSquelch; q15_t m_rfAudioBoost; @@ -136,7 +136,7 @@ private: void timeoutExtStateSimplex(bool validSignal); void timeoutExtWaitStateSimplex(bool validSignal); - void simpleStateMachine(bool validRFSignal, bool validExtSignal); + void linkStateMachine(bool validRFSignal, bool validExtSignal); void clock(uint8_t length); diff --git a/SerialPort.cpp b/SerialPort.cpp index 5482797..bde5a4d 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -652,7 +652,7 @@ uint8_t CSerialPort::setFMParams3(const uint8_t* data, uint16_t length) uint8_t hangTime = data[7U]; uint8_t accessMode = data[8U] & 0x0FU; - bool simpleMode = (data[8U] & 0x20U) == 0x20U; + bool linkMode = (data[8U] & 0x20U) == 0x20U; bool noiseSquelch = (data[8U] & 0x40U) == 0x40U; bool cosInvert = (data[8U] & 0x80U) == 0x80U; @@ -663,7 +663,7 @@ uint8_t CSerialPort::setFMParams3(const uint8_t* data, uint16_t length) uint8_t squelchHighThreshold = data[12U]; uint8_t squelchLowThreshold = data[13U]; - return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, hangTime, accessMode, simpleMode, cosInvert, noiseSquelch, squelchHighThreshold, squelchLowThreshold, rfAudioBoost, maxDev, rxLevel); + return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, hangTime, accessMode, linkMode, cosInvert, noiseSquelch, squelchHighThreshold, squelchLowThreshold, rfAudioBoost, maxDev, rxLevel); } uint8_t CSerialPort::setFMParams4(const uint8_t* data, uint16_t length) diff --git a/Version.h b/Version.h index c753f45..28fabf2 100644 --- a/Version.h +++ b/Version.h @@ -19,7 +19,7 @@ #if !defined(VERSION_H) #define VERSION_H -#define VERSION "20210905" +#define VERSION "20210906" #endif