g4klx/MMDVM
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM.git synced 2026-04-05 22:46:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add an optional RSSI input.

Browse source
This commit is contained in:
Jonathan Naylor 2016-08-08 20:38:58 +01:00
parent b96413c5af
commit eafc329cc9
9 changed files with 115 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
DStarRX.cpp
View file

@ -260,7 +260,8 @@ m_pathMemory2(),
m_pathMemory3(),
m_fecOutput(),
m_samples(),
m_samplesPtr(0U)
m_samplesPtr(0U),
m_rssiCount(0U)
{
}
@ -273,6 +274,7 @@ void CDStarRX::reset()
m_rxBufferBits = 0U;
m_dataBits = 0U;
m_samplesPtr = 0U;
m_rssiCount = 0U;
}
void CDStarRX::samples(const q15_t* samples, uint8_t length)
@ -343,11 +345,12 @@ void CDStarRX::processNone(bool bit)
serial.writeDStarData(DSTAR_DATA_SYNC_BYTES, DSTAR_DATA_LENGTH_BYTES);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
m_rxBufferBits = 0U;
m_dataBits = 0U;
m_rxState = DSRXS_DATA;
m_dataBits = 0U;
m_rssiCount = 0U;
m_rxState = DSRXS_DATA;
return;
}
}
@ -372,11 +375,12 @@ void CDStarRX::processHeader(bool bit)
serial.writeDStarHeader(header, DSTAR_HEADER_LENGTH_BYTES);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
m_rxBufferBits = 0U;
m_rxState = DSRXS_DATA;
m_dataBits = SYNC_POS - DSTAR_DATA_LENGTH_BITS + 1U;
m_rxState = DSRXS_DATA;
m_rssiCount = 0U;
m_dataBits = SYNC_POS - DSTAR_DATA_LENGTH_BITS + 1U;
} else {
// The checksum failed, return to looking for syncs
m_rxState = DSRXS_NONE;
@ -459,10 +463,26 @@ void CDStarRX::processData(bool bit)
m_rxBuffer[11U] = DSTAR_DATA_SYNC_BYTES[11U];
}
#if defined(SEND_RSSI_DATA)
// Send RSSI data every 0.5 seconds
if (m_rssiCount == 0U) {
uint16_t rssi = io.getRSSIValue();
m_rxBuffer[12U] = (rssi >> 8) & 0xFFU;
m_rxBuffer[13U] = (rssi >> 0) & 0xFFU;
serial.writeDStarData(m_rxBuffer, DSTAR_DATA_LENGTH_BYTES + 2U);
} else {
serial.writeDStarData(m_rxBuffer, DSTAR_DATA_LENGTH_BYTES);
}
m_rssiCount++;
if (m_rssiCount >= 25U)
m_rssiCount = 0U;
#else
serial.writeDStarData(m_rxBuffer, DSTAR_DATA_LENGTH_BYTES);
#endif
// Start the next frame
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
m_rxBufferBits = 0U;
}
}