From 161736925ecdb31df19a3333369fb1ec332e4329 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 18 Aug 2017 10:55:32 +0100 Subject: [PATCH 1/7] Optimise the DC offset processing. --- DStarRX.cpp | 29 ++--------------------------- DStarRX.h | 2 -- IO.cpp | 40 +++++++++++++++++++++++++++++++++++----- IO.h | 3 +++ P25RX.cpp | 29 ++--------------------------- P25RX.h | 2 -- YSFRX.cpp | 29 ++--------------------------- YSFRX.h | 2 -- 8 files changed, 44 insertions(+), 92 deletions(-) diff --git a/DStarRX.cpp b/DStarRX.cpp index 519c23a..b7fea0c 100644 --- a/DStarRX.cpp +++ b/DStarRX.cpp @@ -233,10 +233,6 @@ const uint16_t CCITT_TABLE[] = { const uint16_t NOENDPTR = 9999U; -// Generated using [b, a] = butter(1, 0.001) in MATLAB -static q31_t DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, b1, b2, -a1, -a2} -const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage - CDStarRX::CDStarRX() : m_rxState(DSRXS_NONE), m_bitBuffer(), @@ -261,16 +257,8 @@ m_pathMemory2(), m_pathMemory3(), m_fecOutput(), m_rssiAccum(0U), -m_rssiCount(0U), -m_dcFilter(), -m_dcState() +m_rssiCount(0U) { - ::memset(m_dcState, 0x00U, 4U * sizeof(q31_t)); - - m_dcFilter.numStages = DC_FILTER_STAGES; - m_dcFilter.pState = m_dcState; - m_dcFilter.pCoeffs = DC_FILTER; - m_dcFilter.postShift = 0; } void CDStarRX::reset() @@ -293,24 +281,11 @@ void CDStarRX::reset() void CDStarRX::samples(q15_t* samples, const uint16_t* rssi, uint8_t length) { - q31_t dcLevel = 0; - q31_t dcVals[20U]; - q31_t q31Samples[20U]; - - ::arm_q15_to_q31(samples, q31Samples, length); - ::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Samples, dcVals, length); - - for (uint8_t i = 0U; i < length; i++) - dcLevel += dcVals[i]; - dcLevel /= length; - - q15_t offset = q15_t(__SSAT((dcLevel >> 16), 16)); - for (uint16_t i = 0U; i < length; i++) { m_rssiAccum += rssi[i]; m_rssiCount++; - q15_t sample = samples[i] - offset; + q15_t sample = samples[i]; m_bitBuffer[m_bitPtr] <<= 1; if (sample < 0) diff --git a/DStarRX.h b/DStarRX.h index ea473bf..4223974 100644 --- a/DStarRX.h +++ b/DStarRX.h @@ -61,8 +61,6 @@ private: uint8_t m_fecOutput[42U]; uint32_t m_rssiAccum; uint16_t m_rssiCount; - arm_biquad_casd_df1_inst_q31 m_dcFilter; - q31_t m_dcState[4]; void processNone(q15_t sample); void processHeader(q15_t sample); diff --git a/IO.cpp b/IO.cpp index 0188d62..f711172 100644 --- a/IO.cpp +++ b/IO.cpp @@ -22,6 +22,10 @@ #include "Globals.h" #include "IO.h" +// Generated using [b, a] = butter(1, 0.001) in MATLAB +static q31_t DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, b1, b2, -a1, -a2} +const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage + // Generated using rcosdesign(0.2, 8, 5, 'sqrt') in MATLAB static q15_t RRC_0_2_FILTER[] = {401, 104, -340, -731, -847, -553, 112, 909, 1472, 1450, 683, -675, -2144, -3040, -2706, -770, 2667, 6995, 11237, 14331, 15464, 14331, 11237, 6995, 2667, -770, -2706, -3040, -2144, -675, 683, 1450, 1472, 909, 112, @@ -43,6 +47,8 @@ m_started(false), m_rxBuffer(RX_RINGBUFFER_SIZE), m_txBuffer(TX_RINGBUFFER_SIZE), m_rssiBuffer(RX_RINGBUFFER_SIZE), +m_dcFilter(), +m_dcState(), m_rrcFilter(), m_gaussianFilter(), m_boxcarFilter(), @@ -67,6 +73,12 @@ m_lockout(false) ::memset(m_rrcState, 0x00U, 70U * sizeof(q15_t)); ::memset(m_gaussianState, 0x00U, 40U * sizeof(q15_t)); ::memset(m_boxcarState, 0x00U, 30U * sizeof(q15_t)); + ::memset(m_dcState, 0x00U, 4U * sizeof(q31_t)); + + m_dcFilter.numStages = DC_FILTER_STAGES; + m_dcFilter.pState = m_dcState; + m_dcFilter.pCoeffs = DC_FILTER; + m_dcFilter.postShift = 0; m_rrcFilter.numTaps = RRC_0_2_FILTER_LEN; m_rrcFilter.pState = m_rrcState; @@ -157,21 +169,39 @@ void CIO::process() if (m_lockout) return; + q31_t dcLevel = 0; + q31_t dcValues[RX_BLOCK_SIZE]; + q31_t q31Samples[RX_BLOCK_SIZE]; + + ::arm_q15_to_q31(samples, q31Samples, RX_BLOCK_SIZE); + ::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Samples, dcValues, RX_BLOCK_SIZE); + + for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++) + dcLevel += dcValues[i]; + dcLevel /= RX_BLOCK_SIZE; + + q15_t offset = q15_t(__SSAT((dcLevel >> 16), 16));; + + q15_t dcSamples[RX_BLOCK_SIZE]; + for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++) + dcSamples[i] = samples[i] - offset; + if (m_modemState == STATE_IDLE) { if (m_dstarEnable) { q15_t GMSKVals[RX_BLOCK_SIZE]; - ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE); + ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE); dstarRX.samples(GMSKVals, rssi, RX_BLOCK_SIZE); } if (m_p25Enable) { q15_t P25Vals[RX_BLOCK_SIZE]; - ::arm_fir_fast_q15(&m_boxcarFilter, samples, P25Vals, RX_BLOCK_SIZE); + ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, P25Vals, RX_BLOCK_SIZE); p25RX.samples(P25Vals, rssi, RX_BLOCK_SIZE); } + // XXX YSF should use dcSamples, but DMR not if (m_dmrEnable || m_ysfEnable) { q15_t C4FSKVals[RX_BLOCK_SIZE]; ::arm_fir_fast_q15(&m_rrcFilter, samples, C4FSKVals, RX_BLOCK_SIZE); @@ -189,7 +219,7 @@ void CIO::process() } else if (m_modemState == STATE_DSTAR) { if (m_dstarEnable) { q15_t GMSKVals[RX_BLOCK_SIZE]; - ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE); + ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE); dstarRX.samples(GMSKVals, rssi, RX_BLOCK_SIZE); } @@ -211,14 +241,14 @@ void CIO::process() } else if (m_modemState == STATE_YSF) { if (m_ysfEnable) { q15_t C4FSKVals[RX_BLOCK_SIZE]; - ::arm_fir_fast_q15(&m_rrcFilter, samples, C4FSKVals, RX_BLOCK_SIZE); + ::arm_fir_fast_q15(&m_rrcFilter, dcSamples, C4FSKVals, RX_BLOCK_SIZE); ysfRX.samples(C4FSKVals, rssi, RX_BLOCK_SIZE); } } else if (m_modemState == STATE_P25) { if (m_p25Enable) { q15_t P25Vals[RX_BLOCK_SIZE]; - ::arm_fir_fast_q15(&m_boxcarFilter, samples, P25Vals, RX_BLOCK_SIZE); + ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, P25Vals, RX_BLOCK_SIZE); p25RX.samples(P25Vals, rssi, RX_BLOCK_SIZE); } diff --git a/IO.h b/IO.h index 80a6d28..5421881 100644 --- a/IO.h +++ b/IO.h @@ -60,6 +60,9 @@ private: CSampleRB m_txBuffer; CRSSIRB m_rssiBuffer; + arm_biquad_casd_df1_inst_q31 m_dcFilter; + q31_t m_dcState[4]; + arm_fir_instance_q15 m_rrcFilter; arm_fir_instance_q15 m_gaussianFilter; arm_fir_instance_q15 m_boxcarFilter; diff --git a/P25RX.cpp b/P25RX.cpp index 6c1d0af..6b4cfd4 100644 --- a/P25RX.cpp +++ b/P25RX.cpp @@ -38,10 +38,6 @@ const uint16_t NOENDPTR = 9999U; const unsigned int MAX_SYNC_FRAMES = 4U + 1U; -// Generated using [b, a] = butter(1, 0.001) in MATLAB -static q31_t DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, b1, b2, -a1, -a2} -const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage - CP25RX::CP25RX() : m_state(P25RXS_NONE), m_bitBuffer(), @@ -64,16 +60,8 @@ m_threshold(), m_thresholdVal(0), m_averagePtr(NOAVEPTR), m_rssiAccum(0U), -m_rssiCount(0U), -m_dcFilter(), -m_dcState() +m_rssiCount(0U) { - ::memset(m_dcState, 0x00U, 4U * sizeof(q31_t)); - - m_dcFilter.numStages = DC_FILTER_STAGES; - m_dcFilter.pState = m_dcState; - m_dcFilter.pCoeffs = DC_FILTER; - m_dcFilter.postShift = 0; } void CP25RX::reset() @@ -100,21 +88,8 @@ void CP25RX::reset() void CP25RX::samples(q15_t* samples, uint16_t* rssi, uint8_t length) { - q31_t dcLevel = 0; - q31_t dcVals[20U]; - q31_t q31Samples[20U]; - - ::arm_q15_to_q31(samples, q31Samples, length); - ::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Samples, dcVals, length); - - for (uint8_t i = 0U; i < length; i++) - dcLevel += dcVals[i]; - dcLevel /= length; - - q15_t offset = q15_t(__SSAT((dcLevel >> 16), 16));; - for (uint8_t i = 0U; i < length; i++) { - q15_t sample = samples[i] - offset; + q15_t sample = samples[i]; m_rssiAccum += rssi[i]; m_rssiCount++; diff --git a/P25RX.h b/P25RX.h index 16f6cf3..48af4f9 100644 --- a/P25RX.h +++ b/P25RX.h @@ -59,8 +59,6 @@ private: uint8_t m_averagePtr; uint32_t m_rssiAccum; uint16_t m_rssiCount; - arm_biquad_casd_df1_inst_q31 m_dcFilter; - q31_t m_dcState[4]; void processNone(q15_t sample); void processHdr(q15_t sample); diff --git a/YSFRX.cpp b/YSFRX.cpp index f3be78c..3b156af 100644 --- a/YSFRX.cpp +++ b/YSFRX.cpp @@ -38,10 +38,6 @@ const uint16_t NOENDPTR = 9999U; const unsigned int MAX_SYNC_FRAMES = 4U + 1U; -// Generated using [b, a] = butter(1, 0.001) in MATLAB -static q31_t DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, b1, b2, -a1, -a2} -const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage - CYSFRX::CYSFRX() : m_state(YSFRXS_NONE), m_bitBuffer(), @@ -62,16 +58,8 @@ m_threshold(), m_thresholdVal(0), m_averagePtr(NOAVEPTR), m_rssiAccum(0U), -m_rssiCount(0U), -m_dcFilter(), -m_dcState() +m_rssiCount(0U) { - ::memset(m_dcState, 0x00U, 4U * sizeof(q31_t)); - - m_dcFilter.numStages = DC_FILTER_STAGES; - m_dcFilter.pState = m_dcState; - m_dcFilter.pCoeffs = DC_FILTER; - m_dcFilter.postShift = 0; } void CYSFRX::reset() @@ -96,21 +84,8 @@ void CYSFRX::reset() void CYSFRX::samples(q15_t* samples, uint16_t* rssi, uint8_t length) { - q31_t dcLevel = 0; - q31_t dcVals[20U]; - q31_t q31Samples[20U]; - - ::arm_q15_to_q31(samples, q31Samples, length); - ::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Samples, dcVals, length); - - for (uint8_t i = 0U; i < length; i++) - dcLevel += dcVals[i]; - dcLevel /= length; - - q15_t offset = q15_t(__SSAT((dcLevel >> 16), 16));; - for (uint8_t i = 0U; i < length; i++) { - q15_t sample = samples[i] - offset; + q15_t sample = samples[i]; m_rssiAccum += rssi[i]; m_rssiCount++; diff --git a/YSFRX.h b/YSFRX.h index f00d6c4..a4aea4a 100644 --- a/YSFRX.h +++ b/YSFRX.h @@ -56,8 +56,6 @@ private: uint8_t m_averagePtr; uint32_t m_rssiAccum; uint16_t m_rssiCount; - arm_biquad_casd_df1_inst_q31 m_dcFilter; - q31_t m_dcState[4]; void processNone(q15_t sample); void processData(q15_t sample); From 2a5690fd4d262cf493f7b4fa3c24863889fbda67 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 18 Aug 2017 11:02:33 +0100 Subject: [PATCH 2/7] Re-add the const qualifiers. --- DStarRX.cpp | 2 +- DStarRX.h | 2 +- P25RX.cpp | 2 +- P25RX.h | 2 +- YSFRX.cpp | 2 +- YSFRX.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DStarRX.cpp b/DStarRX.cpp index b7fea0c..4def275 100644 --- a/DStarRX.cpp +++ b/DStarRX.cpp @@ -279,7 +279,7 @@ void CDStarRX::reset() m_rssiCount = 0U; } -void CDStarRX::samples(q15_t* samples, const uint16_t* rssi, uint8_t length) +void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length) { for (uint16_t i = 0U; i < length; i++) { m_rssiAccum += rssi[i]; diff --git a/DStarRX.h b/DStarRX.h index 4223974..50ddf79 100644 --- a/DStarRX.h +++ b/DStarRX.h @@ -32,7 +32,7 @@ class CDStarRX { public: CDStarRX(); - void samples(q15_t* samples, const uint16_t* rssi, uint8_t length); + void samples(const q15_t* samples, const uint16_t* rssi, uint8_t length); void reset(); diff --git a/P25RX.cpp b/P25RX.cpp index 6b4cfd4..9228c5b 100644 --- a/P25RX.cpp +++ b/P25RX.cpp @@ -86,7 +86,7 @@ void CP25RX::reset() m_rssiCount = 0U; } -void CP25RX::samples(q15_t* samples, uint16_t* rssi, uint8_t length) +void CP25RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length) { for (uint8_t i = 0U; i < length; i++) { q15_t sample = samples[i]; diff --git a/P25RX.h b/P25RX.h index 48af4f9..0bdf3c5 100644 --- a/P25RX.h +++ b/P25RX.h @@ -32,7 +32,7 @@ class CP25RX { public: CP25RX(); - void samples(q15_t* samples, uint16_t* rssi, uint8_t length); + void samples(const q15_t* samples, uint16_t* rssi, uint8_t length); void reset(); diff --git a/YSFRX.cpp b/YSFRX.cpp index 3b156af..88c6f83 100644 --- a/YSFRX.cpp +++ b/YSFRX.cpp @@ -82,7 +82,7 @@ void CYSFRX::reset() m_rssiCount = 0U; } -void CYSFRX::samples(q15_t* samples, uint16_t* rssi, uint8_t length) +void CYSFRX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length) { for (uint8_t i = 0U; i < length; i++) { q15_t sample = samples[i]; diff --git a/YSFRX.h b/YSFRX.h index a4aea4a..556280a 100644 --- a/YSFRX.h +++ b/YSFRX.h @@ -31,7 +31,7 @@ class CYSFRX { public: CYSFRX(); - void samples(q15_t* samples, uint16_t* rssi, uint8_t length); + void samples(const q15_t* samples, uint16_t* rssi, uint8_t length); void reset(); From dc9d83f9f083141acb2a8d7d98731db024ec5e74 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 20 Aug 2017 12:19:04 +0100 Subject: [PATCH 3/7] Add optional TX DC offset. --- IO.cpp | 7 +++++-- IO.h | 4 +++- SerialPort.cpp | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/IO.cpp b/IO.cpp index f711172..9880ab4 100644 --- a/IO.cpp +++ b/IO.cpp @@ -62,6 +62,7 @@ m_dstarTXLevel(128 * 128), m_dmrTXLevel(128 * 128), m_ysfTXLevel(128 * 128), m_p25TXLevel(128 * 128), +m_txDCOffset(DC_OFFSET), m_ledCount(0U), m_ledValue(true), m_detect(false), @@ -299,7 +300,7 @@ void CIO::write(MMDVM_STATE mode, q15_t* samples, uint16_t length, const uint8_t for (uint16_t i = 0U; i < length; i++) { q31_t res1 = samples[i] * txLevel; q15_t res2 = q15_t(__SSAT((res1 >> 15), 16)); - uint16_t res3 = uint16_t(res2 + DC_OFFSET); + uint16_t res3 = uint16_t(res2 + m_txDCOffset); // Detect DAC overflow if (res3 > 4095U) @@ -340,7 +341,7 @@ void CIO::setMode() #endif } -void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel) +void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, int16_t txDCOffset) { m_pttInvert = pttInvert; @@ -350,6 +351,8 @@ void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rx m_dmrTXLevel = q15_t(dmrTXLevel * 128); m_ysfTXLevel = q15_t(ysfTXLevel * 128); m_p25TXLevel = q15_t(p25TXLevel * 128); + + m_txDCOffset = DC_OFFSET + txDCOffset; if (rxInvert) m_rxLevel = -m_rxLevel; diff --git a/IO.h b/IO.h index 5421881..19807b1 100644 --- a/IO.h +++ b/IO.h @@ -42,7 +42,7 @@ public: void interrupt(); - void setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel); + void setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, int16_t txDCOffset); void getOverflow(bool& adcOverflow, bool& dacOverflow); @@ -78,6 +78,8 @@ private: q15_t m_ysfTXLevel; q15_t m_p25TXLevel; + uint16_t m_txDCOffset; + uint32_t m_ledCount; bool m_ledValue; diff --git a/SerialPort.cpp b/SerialPort.cpp index 3ee2f21..235257d 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -221,7 +221,7 @@ void CSerialPort::getVersion() uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) { - if (length < 13U) + if (length < 14U) return 4U; bool rxInvert = (data[0U] & 0x01U) == 0x01U; @@ -268,6 +268,8 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) uint8_t ysfTXLevel = data[11U]; uint8_t p25TXLevel = data[12U]; + int16_t txDCOffset = int16_t(data[13U]) - 128; + m_modemState = modemState; m_dstarEnable = dstarEnable; @@ -289,7 +291,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) ysfTX.setLoDev(ysfLoDev); - io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel); + io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, txDCOffset); io.start(); From d91a1550843b4c5f5bcaac68c3c64b1c9399db8f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 20 Aug 2017 15:59:48 +0100 Subject: [PATCH 4/7] Add watchdog to host serial port. --- IO.cpp | 5 +++++ IO.h | 1 + IOSTM.cpp | 2 +- SerialPort.cpp | 42 +++++++++++++++++++++++++----------------- SerialSTM.cpp | 8 ++++---- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/IO.cpp b/IO.cpp index 9880ab4..d7a6ec9 100644 --- a/IO.cpp +++ b/IO.cpp @@ -389,6 +389,11 @@ void CIO::resetWatchdog() m_watchdog = 0U; } +uint32_t CIO::getWatchdog() +{ + return m_watchdog; +} + bool CIO::hasLockout() const { return m_lockout; diff --git a/IO.h b/IO.h index 19807b1..6c2fe7d 100644 --- a/IO.h +++ b/IO.h @@ -52,6 +52,7 @@ public: bool hasLockout() const; void resetWatchdog(); + uint32_t getWatchdog(); private: bool m_started; diff --git a/IOSTM.cpp b/IOSTM.cpp index 56826bb..f02c347 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -355,7 +355,7 @@ void CIO::initInt() { GPIO_InitTypeDef GPIO_InitStruct; GPIO_StructInit(&GPIO_InitStruct); - GPIO_InitStruct.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStruct.GPIO_Speed = GPIO_Fast_Speed; GPIO_InitStruct.GPIO_OType = GPIO_OType_PP; GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_DOWN; diff --git a/SerialPort.cpp b/SerialPort.cpp index 235257d..b707c36 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -422,6 +422,9 @@ void CSerialPort::process() m_buffer[0U] = c; m_ptr = 1U; m_len = 0U; + } else { + m_ptr = 0U; + m_len = 0U; } } else if (m_ptr == 1U) { // Handle the frame length @@ -647,9 +650,9 @@ void CSerialPort::process() #if defined(SERIAL_REPEATER) case MMDVM_SERIAL: { - for (uint8_t i = 3U; i < m_len; i++) - m_repeat.put(m_buffer[i]); - } + for (uint8_t i = 3U; i < m_len; i++) + m_repeat.put(m_buffer[i]); + } break; #endif @@ -665,23 +668,28 @@ void CSerialPort::process() } } + if (io.getWatchdog() >= 48000U) { + m_ptr = 0U; + m_len = 0U; + } + #if defined(SERIAL_REPEATER) - // Write any outgoing serial data - uint16_t space = m_repeat.getData(); - if (space > 0U) { - int avail = availableForWriteInt(3U); - if (avail < space) - space = avail; + // Write any outgoing serial data + uint16_t space = m_repeat.getData(); + if (space > 0U) { + int avail = availableForWriteInt(3U); + if (avail < space) + space = avail; - for (uint16_t i = 0U; i < space; i++) { - uint8_t c = m_repeat.get(); - writeInt(3U, &c, 1U); - } - } + for (uint16_t i = 0U; i < space; i++) { + uint8_t c = m_repeat.get(); + writeInt(3U, &c, 1U); + } + } - // Read any incoming serial data - while (availableInt(3U)) - readInt(3U); + // Read any incoming serial data + while (availableInt(3U)) + readInt(3U); #endif } diff --git a/SerialSTM.cpp b/SerialSTM.cpp index e2b128e..04531cd 100644 --- a/SerialSTM.cpp +++ b/SerialSTM.cpp @@ -184,7 +184,7 @@ void InitUSART1(int speed) GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9 | GPIO_Pin_10; // Tx | Rx - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Speed = GPIO_Fast_Speed_; GPIO_Init(GPIOA, &GPIO_InitStructure); // Configure USART baud rate @@ -375,7 +375,7 @@ void InitUSART2(int speed) GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2 | GPIO_Pin_3; // Tx | Rx - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Speed = GPIO_Fast_Speed; GPIO_Init(GPIOA, &GPIO_InitStructure); // Configure USART baud rate @@ -566,7 +566,7 @@ void InitUSART3(int speed) GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_10 | GPIO_Pin_11; // Tx | Rx - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Speed = GPIO_Fast_Speed; GPIO_Init(GPIOC, &GPIO_InitStructure); // Configure USART baud rate @@ -758,7 +758,7 @@ void InitUART5(int speed) GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12; // Tx - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Speed = GPIO_Fast_Speed; GPIO_Init(GPIOC, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2; // Rx From edbf2b3ec0b3fcd4850b1de00b0fcd257f404596 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 28 Aug 2017 23:02:28 -0300 Subject: [PATCH 5/7] Fix typo --- SerialPort.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index c174fc1..b707c36 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -426,10 +426,6 @@ void CSerialPort::process() m_ptr = 0U; m_len = 0U; } - else { - m_ptr = 0U; - m_len = 0U; - } } else if (m_ptr == 1U) { // Handle the frame length m_len = m_buffer[m_ptr] = c; From 551aa3bb204822bb00971ac2e4dc7ffebbadf158 Mon Sep 17 00:00:00 2001 From: F4FXL Date: Sat, 16 Dec 2017 09:02:15 +0100 Subject: [PATCH 6/7] Fixes erroneous end of frame seen on station having QSB --- DStarRX.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DStarRX.cpp b/DStarRX.cpp index 4def275..30cdab1 100644 --- a/DStarRX.cpp +++ b/DStarRX.cpp @@ -37,7 +37,7 @@ const uint8_t DATA_SYNC_ERRS = 2U; // D-Star bit order version of 0x55 0x55 0xC8 0x7A const uint32_t END_SYNC_DATA = 0xAAAA135EU; const uint32_t END_SYNC_MASK = 0xFFFFFFFFU; -const uint8_t END_SYNC_ERRS = 3U; +const uint8_t END_SYNC_ERRS = 1U; const uint8_t BIT_MASK_TABLE0[] = {0x7FU, 0xBFU, 0xDFU, 0xEFU, 0xF7U, 0xFBU, 0xFDU, 0xFEU}; const uint8_t BIT_MASK_TABLE1[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; From b846e5a7f3b1a5f0ffc7aab43a8e7b1d73e641c5 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 30 Dec 2017 20:47:48 -0300 Subject: [PATCH 7/7] Adding 80 Hz square wave test signal support --- DMRTX.cpp | 29 +++++++++++++++++++++++++---- Globals.h | 1 + MMDVM.cpp | 2 +- MMDVM.ino | 2 +- SerialPort.cpp | 16 +++++++++++++--- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/DMRTX.cpp b/DMRTX.cpp index 0c5d055..20b7b6d 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -302,12 +302,33 @@ void CDMRTX::createData(uint8_t slotIndex) void CDMRTX::createCal() { - for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) { - m_poBuffer[i] = 0x5FU; // +3, +3, -3, -3 pattern for deviation cal. - m_markBuffer[i] = MARK_NONE; + // 1.2 kHz sine wave generation + if (m_modemState == STATE_DMRCAL) { + for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) { + m_poBuffer[i] = 0x5FU; // +3, +3, -3, -3 pattern for deviation cal. + m_markBuffer[i] = MARK_NONE; + } + + m_poLen = DMR_FRAME_LENGTH_BYTES; + } + + // 80 Hz square wave generation + if (m_modemState == STATE_LFCAL) { + for (unsigned int i = 0U; i < 7U; i++) { + m_poBuffer[i] = 0x55U; // +3, +3, ... pattern + m_markBuffer[i] = MARK_NONE; + } + + m_poBuffer[7U] = 0x5FU; // +3, +3, -3, -3 pattern + + for (unsigned int i = 8U; i < 15U; i++) { + m_poBuffer[i] = 0xFFU; // -3, -3, ... pattern + m_markBuffer[i] = MARK_NONE; + } + + m_poLen = 15U; } - m_poLen = DMR_FRAME_LENGTH_BYTES; m_poPtr = 0U; } diff --git a/Globals.h b/Globals.h index 02c0502..e6aab33 100644 --- a/Globals.h +++ b/Globals.h @@ -50,6 +50,7 @@ enum MMDVM_STATE { STATE_P25 = 4, // Dummy states start at 90 + STATE_LFCAL = 95, STATE_RSSICAL = 96, STATE_CWID = 97, STATE_DMRCAL = 98, diff --git a/MMDVM.cpp b/MMDVM.cpp index 12673e4..879ea7e 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -93,7 +93,7 @@ void loop() if (m_modemState == STATE_DSTARCAL) calDStarTX.process(); - if (m_modemState == STATE_DMRCAL) + if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL) calDMR.process(); if (m_modemState == STATE_IDLE) diff --git a/MMDVM.ino b/MMDVM.ino index 0aaedb4..e476ea4 100644 --- a/MMDVM.ino +++ b/MMDVM.ino @@ -90,7 +90,7 @@ void loop() if (m_modemState == STATE_DSTARCAL) calDStarTX.process(); - if (m_modemState == STATE_DMRCAL) + if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL) calDMR.process(); if (m_modemState == STATE_IDLE) diff --git a/SerialPort.cpp b/SerialPort.cpp index e55769d..304409d 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -243,7 +243,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) MMDVM_STATE modemState = MMDVM_STATE(data[3U]); - if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL) + if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL) return 4U; if (modemState == STATE_DSTAR && !dstarEnable) return 4U; @@ -309,7 +309,7 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length) if (modemState == m_modemState) return 0U; - if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL) + if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL) return 4U; if (modemState == STATE_DSTAR && !m_dstarEnable) return 4U; @@ -392,6 +392,16 @@ void CSerialPort::setMode(MMDVM_STATE modemState) p25RX.reset(); cwIdTX.reset(); break; + case STATE_LFCAL: + DEBUG1("Mode set to 80 Hz Calibrate"); + dmrIdleRX.reset(); + dmrDMORX.reset(); + dmrRX.reset(); + dstarRX.reset(); + ysfRX.reset(); + p25RX.reset(); + cwIdTX.reset(); + break; default: DEBUG1("Mode set to Idle"); // STATE_IDLE @@ -473,7 +483,7 @@ void CSerialPort::process() case MMDVM_CAL_DATA: if (m_modemState == STATE_DSTARCAL) err = calDStarTX.write(m_buffer + 3U, m_len - 3U); - if (m_modemState == STATE_DMRCAL) + if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL) err = calDMR.write(m_buffer + 3U, m_len - 3U); if (err == 0U) { sendACK();