From 0f4367006646d857a933523d55dd2820c960cf47 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 9 Apr 2017 20:00:00 +0100 Subject: [PATCH 1/2] Small reformatting. --- DStarRX.cpp | 22 ++++++++++++---------- DStarRX.h | 5 ++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/DStarRX.cpp b/DStarRX.cpp index d4178c0..97958b7 100644 --- a/DStarRX.cpp +++ b/DStarRX.cpp @@ -262,14 +262,16 @@ m_pathMemory2(), m_pathMemory3(), m_fecOutput(), m_rssiAccum(0U), -m_rssiCount(0U) +m_rssiCount(0U), +m_dcFilter(), +m_dcState() { - ::memset(m_DCState, 0x00U, 4U * sizeof(q15_t)); + ::memset(m_dcState, 0x00U, 4U * sizeof(q15_t)); - m_DCFilter.numStages = DC_FILTER_STAGES; - m_DCFilter.pState = m_DCState; - m_DCFilter.pCoeffs = DC_FILTER; - m_DCFilter.postShift = 0; + m_dcFilter.numStages = DC_FILTER_STAGES; + m_dcFilter.pState = m_dcState; + m_dcFilter.pCoeffs = DC_FILTER; + m_dcFilter.postShift = 0; } void CDStarRX::reset() @@ -287,12 +289,12 @@ void CDStarRX::reset() void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length) { q31_t dc_level = 0; - q15_t DCVals[20]; + q15_t dcVals[20]; - ::arm_biquad_cascade_df1_q15(&m_DCFilter, (q15_t*)samples, DCVals, length); + ::arm_biquad_cascade_df1_q15(&m_dcFilter, (q15_t*)samples, dcVals, length); for (uint8_t i = 0U; i < length; i++) - dc_level += (q31_t)DCVals[i]; + dc_level += q31_t(dcVals[i]); dc_level /= length; @@ -300,7 +302,7 @@ void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t lengt m_rssiAccum += rssi[i]; m_rssiCount++; - bool bit = samples[i] < (q15_t)dc_level; + bool bit = samples[i] < q15_t(dc_level); if (bit != m_prev) { if (m_pll < (PLLMAX / 2U)) diff --git a/DStarRX.h b/DStarRX.h index b374b44..6246978 100644 --- a/DStarRX.h +++ b/DStarRX.h @@ -53,9 +53,8 @@ private: uint8_t m_fecOutput[42U]; uint32_t m_rssiAccum; uint16_t m_rssiCount; - - arm_biquad_casd_df1_inst_q15 m_DCFilter; - q15_t m_DCState[4]; + arm_biquad_casd_df1_inst_q15 m_dcFilter; + q15_t m_dcState[4]; void processNone(bool bit); void processHeader(bool bit); From acb2004843cf87cbd4b9cd04640f561bc69191c9 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 9 Apr 2017 20:04:16 +0100 Subject: [PATCH 2/2] Convert the DMO idle frame to have an MS data sync. --- DMRDMOTX.cpp | 4 ++-- DMRTX.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp index 476fd42..72a1d7b 100644 --- a/DMRDMOTX.cpp +++ b/DMRDMOTX.cpp @@ -41,10 +41,10 @@ const q15_t DMR_LEVELB = 963; const q15_t DMR_LEVELC = -963; const q15_t DMR_LEVELD = -2889; -// The PR FILL and Data Sync pattern. +// The PR FILL and MS Data Sync pattern. const uint8_t IDLE_DATA[] = {0x53U, 0xC2U, 0x5EU, 0xABU, 0xA8U, 0x67U, 0x1DU, 0xC7U, 0x38U, 0x3BU, 0xD9U, - 0x36U, 0x00U, 0x0DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD0U, 0x03U, 0xF6U, + 0x36U, 0x00U, 0x0DU, 0x5DU, 0x7FU, 0x77U, 0xFDU, 0x75U, 0x70U, 0x03U, 0xF6U, 0xE4U, 0x65U, 0x17U, 0x1BU, 0x48U, 0xCAU, 0x6DU, 0x4FU, 0xC6U, 0x10U, 0xB4U}; const uint8_t CACH_INTERLEAVE[] = diff --git a/DMRTX.cpp b/DMRTX.cpp index e3568e4..22986cc 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -41,7 +41,7 @@ const q15_t DMR_LEVELB = 963; const q15_t DMR_LEVELC = -963; const q15_t DMR_LEVELD = -2889; -// The PR FILL and Data Sync pattern. +// The PR FILL and BS Data Sync pattern. const uint8_t IDLE_DATA[] = {0x53U, 0xC2U, 0x5EU, 0xABU, 0xA8U, 0x67U, 0x1DU, 0xC7U, 0x38U, 0x3BU, 0xD9U, 0x36U, 0x00U, 0x0DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD0U, 0x03U, 0xF6U,