Small tweaks.

This commit is contained in:
Jonathan Naylor 2016-12-30 11:34:31 +00:00
parent 52fbd4f6ce
commit fca53dc67e
4 changed files with 8 additions and 10 deletions

View file

@ -96,8 +96,6 @@ 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;
@ -199,7 +197,7 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi)
// Send RSSI data approximately every second
if (m_rssiCount == 2U) {
// Calculate RSSI average over a burst period. We don't take into account 2.5 ms at the beginning and 2.5 ms at the end
rssi_avg = avgRSSI(m_startPtr + DMR_SYNC_LENGTH_SAMPLES / 2U, DMR_FRAME_LENGTH_SAMPLES - DMR_SYNC_LENGTH_SAMPLES);
uint16_t rssi_avg = avgRSSI(m_startPtr + DMR_SYNC_LENGTH_SAMPLES / 2U, DMR_FRAME_LENGTH_SAMPLES - DMR_SYNC_LENGTH_SAMPLES);
frame[34U] = (rssi_avg >> 8) & 0xFFU;
frame[35U] = (rssi_avg >> 0) & 0xFFU;
serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 3U);