From 442dbe0b6aab0a9bca1273a17a5492cdb6113e0c Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Tue, 27 Dec 2016 00:40:14 -0300 Subject: [PATCH] Adding RSSI samples averaging --- DMRDMORX.cpp | 39 +++++++++++++++++++++++++++++---------- DMRDMORX.h | 5 +++-- DMRSlotRX.cpp | 37 ++++++++++++++++++++++++++++--------- DMRSlotRX.h | 3 ++- 4 files changed, 62 insertions(+), 22 deletions(-) diff --git a/DMRDMORX.cpp b/DMRDMORX.cpp index 5eefa23..1677bbd 100644 --- a/DMRDMORX.cpp +++ b/DMRDMORX.cpp @@ -60,7 +60,7 @@ m_state(DMORXS_NONE), m_n(0U), m_type(0U), m_rssiCount(0U), -m_rssi(0U) +m_rssi() { } @@ -88,7 +88,10 @@ void CDMRDMORX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t leng bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) { + uint16_t rssi_avg; + m_buffer[m_dataPtr] = sample; + m_rssi[m_dataPtr] = rssi; m_bitBuffer[m_bitPtr] <<= 1; if (sample < 0) @@ -97,9 +100,6 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) if (m_state == DMORXS_NONE) { correlateSync(true); } else { - // Grab the RSSI data during the frame - if (m_state == DMORXS_VOICE && m_dataPtr == m_syncPtr) - m_rssi = rssi; uint16_t min = m_syncPtr + DMO_BUFFER_LENGTH_SAMPLES - 1U; uint16_t max = m_syncPtr + 1U; @@ -132,6 +132,10 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) samplesToBits(ptr, DMR_FRAME_LENGTH_SYMBOLS, frame, 8U, centre, threshold); +#if defined(SEND_RSSI_DATA) + rssi_avg = avgRSSI(m_startPtr+120, 420); +#endif + if (m_control == CONTROL_DATA) { // Data sync uint8_t colorCode; @@ -193,13 +197,13 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) #if defined(SEND_RSSI_DATA) // Send RSSI data approximately every second if (m_rssiCount == 2U) { - frame[34U] = (m_rssi >> 8) & 0xFFU; - frame[35U] = (m_rssi >> 0) & 0xFFU; + frame[34U] = (rssi_avg >> 8) & 0xFFU; + frame[35U] = (rssi_avg >> 0) & 0xFFU; serial.writeDMRData(true, frame, DMR_FRAME_LENGTH_BYTES + 3U); } else { serial.writeDMRData(true, frame, DMR_FRAME_LENGTH_BYTES + 1U); } - + m_rssiCount++; if (m_rssiCount >= 16U) m_rssiCount = 0U; @@ -228,13 +232,13 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) #if defined(SEND_RSSI_DATA) // Send RSSI data approximately every second if (m_rssiCount == 2U) { - frame[34U] = (m_rssi >> 8) & 0xFFU; - frame[35U] = (m_rssi >> 0) & 0xFFU; + frame[34U] = (rssi_avg >> 8) & 0xFFU; + frame[35U] = (rssi_avg >> 0) & 0xFFU; serial.writeDMRData(true, frame, DMR_FRAME_LENGTH_BYTES + 3U); } else { serial.writeDMRData(true, frame, DMR_FRAME_LENGTH_BYTES + 1U); } - + m_rssiCount++; if (m_rssiCount >= 16U) m_rssiCount = 0U; @@ -398,6 +402,21 @@ void CDMRDMORX::correlateSync(bool first) } } +uint16_t CDMRDMORX::avgRSSI(uint16_t start, uint16_t count) +{ + float rssi_tmp = 0; + + for (uint16_t i = 0U; i < count; i++) { + rssi_tmp += (float) m_rssi[start]; + + start++; + if (start >= DMO_BUFFER_LENGTH_SAMPLES) + start -= DMO_BUFFER_LENGTH_SAMPLES; + } + + return (uint16_t) (rssi_tmp / count); +} + void CDMRDMORX::samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold) { for (uint8_t i = 0U; i < count; i++) { diff --git a/DMRDMORX.h b/DMRDMORX.h index 1049fd1..e342348 100644 --- a/DMRDMORX.h +++ b/DMRDMORX.h @@ -59,11 +59,12 @@ private: uint8_t m_n; uint8_t m_type; uint16_t m_rssiCount; - uint16_t m_rssi; - + uint16_t m_rssi[DMO_BUFFER_LENGTH_SAMPLES]; + bool processSample(q15_t sample, uint16_t rssi); void correlateSync(bool first); void samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold); + uint16_t avgRSSI(uint16_t start, uint16_t count); }; #endif diff --git a/DMRSlotRX.cpp b/DMRSlotRX.cpp index 6abe38d..830b713 100644 --- a/DMRSlotRX.cpp +++ b/DMRSlotRX.cpp @@ -66,7 +66,7 @@ m_state(DMRRXS_NONE), m_n(0U), m_type(0U), m_rssiCount(0U), -m_rssi(0U) +m_rssi() { } @@ -96,6 +96,8 @@ void CDMRSlotRX::reset() bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) { + uint16_t rssi_avg; + m_delayPtr++; if (m_delayPtr < m_delay) return m_state != DMRRXS_NONE; @@ -105,7 +107,8 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) return m_state != DMRRXS_NONE; m_buffer[m_dataPtr] = sample; - + m_rssi[m_dataPtr] = rssi; + m_bitBuffer[m_bitPtr] <<= 1; if (sample < 0) m_bitBuffer[m_bitPtr] |= 0x01U; @@ -114,9 +117,6 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) if (m_dataPtr >= SCAN_START && m_dataPtr <= SCAN_END) correlateSync(true); } else { - // Grab the RSSI data during the frame - if (m_state == DMRRXS_VOICE && m_dataPtr == m_syncPtr) - m_rssi = rssi; uint16_t min = m_syncPtr - 1U; uint16_t max = m_syncPtr + 1U; @@ -134,6 +134,10 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) uint16_t ptr = m_endPtr - DMR_FRAME_LENGTH_SAMPLES + DMR_RADIO_SYMBOL_LENGTH + 1U; samplesToBits(ptr, DMR_FRAME_LENGTH_SYMBOLS, frame, 8U, centre, threshold); + +#if defined(SEND_RSSI_DATA) + rssi_avg = avgRSSI(m_startPtr+120, 420); +#endif if (m_control == CONTROL_DATA) { // Data sync @@ -198,8 +202,8 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) #if defined(SEND_RSSI_DATA) // Send RSSI data approximately every second if (m_rssiCount == 2U) { - frame[34U] = (m_rssi >> 8) & 0xFFU; - frame[35U] = (m_rssi >> 0) & 0xFFU; + frame[34U] = (rssi_avg >> 8) & 0xFFU; + frame[35U] = (rssi_avg >> 0) & 0xFFU; serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 3U); } else { serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 1U); @@ -234,8 +238,8 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) #if defined(SEND_RSSI_DATA) // Send RSSI data approximately every second if (m_rssiCount == 2U) { - frame[34U] = (m_rssi >> 8) & 0xFFU; - frame[35U] = (m_rssi >> 0) & 0xFFU; + frame[34U] = (rssi_avg >> 8) & 0xFFU; + frame[35U] = (rssi_avg >> 0) & 0xFFU; serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 3U); } else { serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 1U); @@ -364,6 +368,21 @@ void CDMRSlotRX::correlateSync(bool first) } } +uint16_t CDMRSlotRX::avgRSSI(uint16_t start, uint16_t count) +{ + float rssi_tmp = 0; + + for (uint16_t i = 0U; i < count; i++) { + rssi_tmp += (float) m_rssi[start]; + + start++; + if (start >= DMO_BUFFER_LENGTH_SAMPLES) + start -= DMO_BUFFER_LENGTH_SAMPLES; + } + + return (uint16_t) (rssi_tmp / count); +} + void CDMRSlotRX::samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold) { for (uint8_t i = 0U; i < count; i++, start += DMR_RADIO_SYMBOL_LENGTH) { diff --git a/DMRSlotRX.h b/DMRSlotRX.h index 7be5552..11629d3 100644 --- a/DMRSlotRX.h +++ b/DMRSlotRX.h @@ -63,10 +63,11 @@ private: uint8_t m_n; uint8_t m_type; uint16_t m_rssiCount; - uint16_t m_rssi; + uint16_t m_rssi[DMO_BUFFER_LENGTH_SAMPLES]; void correlateSync(bool first); void samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold); + uint16_t avgRSSI(uint16_t start, uint16_t count); }; #endif