Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Last minute tidy-ups.

This commit is contained in:
Jonathan Naylor 2020-05-02 14:47:43 +01:00
parent de3c257f79
commit baa4f7aa4c
5 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CalFM.cpp
View File

@ -38,13 +38,13 @@ const struct TONE_TABLE {
const uint8_t TONE_TABLE_DATA_LEN = 6U; const uint8_t TONE_TABLE_DATA_LEN = 6U;
CCalFM::CCalFM() : CCalFM::CCalFM() :
m_tone(NULL),
m_frequency(0), m_frequency(0),
m_length(0), m_length(0),
m_tone(NULL),
m_level(128*32), m_level(128*32),
m_transmit(false), m_transmit(false),
m_lastState(STATE_IDLE), m_audioSeq(0),
m_audioSeq(0) m_lastState(STATE_IDLE)
{ {
} }

12
FM.cpp
View File

@ -123,7 +123,19 @@ void CFM::process()
void CFM::reset() void CFM::reset()
{ {
m_state = FS_LISTENING;
m_callsignTimer.stop();
m_timeoutTimer.stop();
m_kerchunkTimer.stop();
m_ackMinTimer.stop();
m_ackDelayTimer.stop();
m_hangTimer.stop();
m_ctcssRX.reset(); m_ctcssRX.reset();
m_rfAck.stop();
m_callsign.stop();
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)

9
FMCTCSSRX.cpp
View File

@ -116,7 +116,7 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
{ {
q31_t sample31 = q31_t(sample) * m_rxLevelInverse; q31_t sample31 = q31_t(sample) * m_rxLevelInverse;
m_result = m_result & (~CTS_READY); m_result &= ~CTS_READY;
q31_t q2 = m_q1; q31_t q2 = m_q1;
m_q1 = m_q0; m_q1 = m_q0;
@ -150,11 +150,11 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
q31_t value = t2 + t4 - t9; q31_t value = t2 + t4 - t9;
bool previousCTCSSValid = CTCSS_VALID(m_result); bool previousCTCSSValid = CTCSS_VALID(m_result);
m_result = m_result | CTS_READY; m_result |= CTS_READY;
if (value >= m_threshold) if (value >= m_threshold)
m_result = m_result | CTS_VALID; m_result |= CTS_VALID;
else else
m_result = m_result & ~CTS_VALID; m_result &= ~CTS_VALID;
if (previousCTCSSValid != CTCSS_VALID(m_result)) if (previousCTCSSValid != CTCSS_VALID(m_result))
DEBUG4("CTCSS Value / Threshold / Valid", value, m_threshold, CTCSS_VALID(m_result)); DEBUG4("CTCSS Value / Threshold / Valid", value, m_threshold, CTCSS_VALID(m_result));
@ -192,4 +192,3 @@ q15_t CFMCTCSSRX::q15Division(q15_t a, q15_t divisor)
return a31 / divisor; return a31 / divisor;
} }

26
FMCTCSSRX.h
View File

@ -23,27 +23,11 @@
enum CTCSSState enum CTCSSState
{ {
CTS_NONE = 0, CTS_NONE,
CTS_READY = 1, CTS_READY,
CTS_VALID = 2, CTS_VALID
CTS_READY_VALID = CTS_READY | CTS_VALID
}; };
inline CTCSSState operator|(CTCSSState a, CTCSSState b)
{
return static_cast<CTCSSState>(static_cast<uint8_t>(a) | static_cast<uint8_t>(b));
}
inline CTCSSState operator&(CTCSSState a, CTCSSState b)
{
return static_cast<CTCSSState>(static_cast<uint8_t>(a) & static_cast<uint8_t>(b));
}
inline CTCSSState operator~(CTCSSState a)
{
return static_cast<CTCSSState>(~(static_cast<uint8_t>(a)));
}
#define CTCSS_READY(a) ((a & CTS_READY) != 0) #define CTCSS_READY(a) ((a & CTS_READY) != 0)
#define CTCSS_NOT_READY(a) ((a & CTS_READY) == 0) #define CTCSS_NOT_READY(a) ((a & CTS_READY) == 0)
#define CTCSS_VALID(a) ((a & CTS_VALID) != 0) #define CTCSS_VALID(a) ((a & CTS_VALID) != 0)
@ -62,8 +46,6 @@ public:
void reset(); void reset();
private: private:
q15_t q15Division(q15_t a, q15_t divisor);
q63_t m_coeffDivTwo; q63_t m_coeffDivTwo;
q31_t m_threshold; q31_t m_threshold;
uint16_t m_count; uint16_t m_count;
@ -71,6 +53,8 @@ private:
q31_t m_q1; q31_t m_q1;
CTCSSState m_result; CTCSSState m_result;
q15_t m_rxLevelInverse; q15_t m_rxLevelInverse;
q15_t q15Division(q15_t a, q15_t divisor);
}; };
#endif #endif

2
SerialPort.cpp
View File

@ -101,7 +101,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define HW_TYPE "MMDVM" #define HW_TYPE "MMDVM"
#endif #endif
#define DESCRIPTION "20200501 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #define DESCRIPTION "20200502 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)"
#if defined(GITVERSION) #if defined(GITVERSION)
#define concat(h, a, b, c) h " " a " " b " GitID #" c "" #define concat(h, a, b, c) h " " a " " b " GitID #" c ""