Unsignedio
/
MMDVM
mirror of https://github.com/markqvist/MMDVM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Average the RSSI value for all modes.

c4fmdemod
Jonathan Naylor 2017-01-10 19:20:16 +00:00
parent 57fde3afcc
commit 3e937a71d9
6 changed files with 120 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
DStarRX.cpp
View File

@ -259,8 +259,8 @@ m_pathMemory1(),
m_pathMemory2(), m_pathMemory2(),
m_pathMemory3(), m_pathMemory3(),
m_fecOutput(), m_fecOutput(),
m_samples(), m_rssiAccum(0U),
m_samplesPtr(0U) m_rssiCount(0U)
{ {
} }
@ -272,13 +272,15 @@ void CDStarRX::reset()
m_patternBuffer = 0x00U; m_patternBuffer = 0x00U;
m_rxBufferBits = 0U; m_rxBufferBits = 0U;
m_dataBits = 0U; m_dataBits = 0U;
m_samplesPtr = 0U; m_rssiAccum = 0U;
m_rssiCount = 0U;
} }
void CDStarRX::samples(const 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++) { for (uint16_t i = 0U; i < length; i++) {
m_samples[m_samplesPtr] = samples[i]; m_rssiAccum += rssi[i];
m_rssiCount++;
bool bit = samples[i] < THRESHOLD; bool bit = samples[i] < THRESHOLD;
@ -298,26 +300,22 @@ void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t lengt
switch (m_rxState) { switch (m_rxState) {
case DSRXS_NONE: case DSRXS_NONE:
processNone(bit, rssi[i]); processNone(bit);
break; break;
case DSRXS_HEADER: case DSRXS_HEADER:
processHeader(bit, rssi[i]); processHeader(bit);
break; break;
case DSRXS_DATA: case DSRXS_DATA:
processData(bit, rssi[i]); processData(bit);
break; break;
default: default:
break; break;
} }
} }
m_samplesPtr++;
if (m_samplesPtr >= DSTAR_DATA_SYNC_LENGTH_BITS)
m_samplesPtr = 0U;
} }
} }
void CDStarRX::processNone(bool bit, uint16_t rssi) void CDStarRX::processNone(bool bit)
{ {
m_patternBuffer <<= 1; m_patternBuffer <<= 1;
if (bit) if (bit)
@ -330,6 +328,9 @@ void CDStarRX::processNone(bool bit, uint16_t rssi)
::memset(m_rxBuffer, 0x00U, DSTAR_FEC_SECTION_LENGTH_BYTES); ::memset(m_rxBuffer, 0x00U, DSTAR_FEC_SECTION_LENGTH_BYTES);
m_rxBufferBits = 0U; m_rxBufferBits = 0U;
m_rssiAccum = 0U;
m_rssiCount = 0U;
m_rxState = DSRXS_HEADER; m_rxState = DSRXS_HEADER;
return; return;
} }
@ -341,8 +342,12 @@ void CDStarRX::processNone(bool bit, uint16_t rssi)
io.setDecode(true); io.setDecode(true);
io.setADCDetection(true); io.setADCDetection(true);
// Suppress RSSI on the dummy sync message
m_rssiAccum = 0U;
m_rssiCount = 0U;
::memcpy(m_rxBuffer, DSTAR_DATA_SYNC_BYTES, DSTAR_DATA_LENGTH_BYTES); ::memcpy(m_rxBuffer, DSTAR_DATA_SYNC_BYTES, DSTAR_DATA_LENGTH_BYTES);
writeRSSIData(m_rxBuffer, rssi); writeRSSIData(m_rxBuffer);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U); ::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
m_rxBufferBits = 0U; m_rxBufferBits = 0U;
@ -353,7 +358,7 @@ void CDStarRX::processNone(bool bit, uint16_t rssi)
} }
} }
void CDStarRX::processHeader(bool bit, uint16_t rssi) void CDStarRX::processHeader(bool bit)
{ {
m_patternBuffer <<= 1; m_patternBuffer <<= 1;
if (bit) if (bit)
@ -371,7 +376,7 @@ void CDStarRX::processHeader(bool bit, uint16_t rssi)
io.setDecode(true); io.setDecode(true);
io.setADCDetection(true); io.setADCDetection(true);
writeRSSIHeader(header, rssi); writeRSSIHeader(header);
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U); ::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
m_rxBufferBits = 0U; m_rxBufferBits = 0U;
@ -385,7 +390,7 @@ void CDStarRX::processHeader(bool bit, uint16_t rssi)
} }
} }
void CDStarRX::processData(bool bit, uint16_t rssi) void CDStarRX::processData(bool bit)
{ {
m_patternBuffer <<= 1; m_patternBuffer <<= 1;
if (bit) if (bit)
@ -458,10 +463,10 @@ void CDStarRX::processData(bool bit, uint16_t rssi)
m_rxBuffer[9U] = DSTAR_DATA_SYNC_BYTES[9U]; m_rxBuffer[9U] = DSTAR_DATA_SYNC_BYTES[9U];
m_rxBuffer[10U] = DSTAR_DATA_SYNC_BYTES[10U]; m_rxBuffer[10U] = DSTAR_DATA_SYNC_BYTES[10U];
m_rxBuffer[11U] = DSTAR_DATA_SYNC_BYTES[11U]; m_rxBuffer[11U] = DSTAR_DATA_SYNC_BYTES[11U];
writeRSSIData(m_rxBuffer, rssi); writeRSSIData(m_rxBuffer);
} else { } else {
serial.writeDStarData(m_rxBuffer, DSTAR_DATA_LENGTH_BYTES); serial.writeDStarData(m_rxBuffer, DSTAR_DATA_LENGTH_BYTES);
} }
// Start the next frame // Start the next frame
::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U); ::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
@ -469,28 +474,46 @@ void CDStarRX::processData(bool bit, uint16_t rssi)
} }
} }
void CDStarRX::writeRSSIHeader(unsigned char* header, uint16_t rssi) void CDStarRX::writeRSSIHeader(unsigned char* header)
{ {
#if defined(SEND_RSSI_DATA) #if defined(SEND_RSSI_DATA)
header[41U] = (rssi >> 8) & 0xFFU; if (m_rssiCount > 0U) {
header[42U] = (rssi >> 0) & 0xFFU; uint16_t rssi = m_rssiAccum / m_rssiCount;
serial.writeDStarHeader(header, DSTAR_HEADER_LENGTH_BYTES + 2U); header[41U] = (rssi >> 8) & 0xFFU;
header[42U] = (rssi >> 0) & 0xFFU;
serial.writeDStarHeader(header, DSTAR_HEADER_LENGTH_BYTES + 2U);
} else {
serial.writeDStarHeader(header, DSTAR_HEADER_LENGTH_BYTES + 0U);
}
#else #else
serial.writeDStarHeader(header, DSTAR_HEADER_LENGTH_BYTES + 0U); serial.writeDStarHeader(header, DSTAR_HEADER_LENGTH_BYTES + 0U);
#endif #endif
m_rssiAccum = 0U;
m_rssiCount = 0U;
} }
void CDStarRX::writeRSSIData(unsigned char* data, uint16_t rssi) void CDStarRX::writeRSSIData(unsigned char* data)
{ {
#if defined(SEND_RSSI_DATA) #if defined(SEND_RSSI_DATA)
data[12U] = (rssi >> 8) & 0xFFU; if (m_rssiCount > 0U) {
data[13U] = (rssi >> 0) & 0xFFU; uint16_t rssi = m_rssiAccum / m_rssiCount;
serial.writeDStarData(data, DSTAR_DATA_LENGTH_BYTES + 2U); data[12U] = (rssi >> 8) & 0xFFU;
data[13U] = (rssi >> 0) & 0xFFU;
serial.writeDStarData(data, DSTAR_DATA_LENGTH_BYTES + 2U);
} else {
serial.writeDStarData(data, DSTAR_DATA_LENGTH_BYTES + 0U);
}
#else #else
serial.writeDStarData(data, DSTAR_DATA_LENGTH_BYTES + 0U); serial.writeDStarData(data, DSTAR_DATA_LENGTH_BYTES + 0U);
#endif #endif
m_rssiAccum = 0U;
m_rssiCount = 0U;
} }
bool CDStarRX::rxHeader(uint8_t* in, uint8_t* out) bool CDStarRX::rxHeader(uint8_t* in, uint8_t* out)

14
DStarRX.h
View File

@ -51,14 +51,14 @@ private:
unsigned int m_pathMemory2[42U]; unsigned int m_pathMemory2[42U];
unsigned int m_pathMemory3[42U]; unsigned int m_pathMemory3[42U];
uint8_t m_fecOutput[42U]; uint8_t m_fecOutput[42U];
q15_t m_samples[DSTAR_DATA_SYNC_LENGTH_BITS]; uint32_t m_rssiAccum;
uint8_t m_samplesPtr; uint16_t m_rssiCount;
void processNone(bool bit, uint16_t rssi); void processNone(bool bit);
void processHeader(bool bit, uint16_t rssi); void processHeader(bool bit);
void processData(bool bit, uint16_t rssi); void processData(bool bit);
void writeRSSIHeader(unsigned char* header, uint16_t rssi); void writeRSSIHeader(unsigned char* header);
void writeRSSIData(unsigned char* data, uint16_t rssi); void writeRSSIData(unsigned char* data);
bool rxHeader(uint8_t* in, uint8_t* out); bool rxHeader(uint8_t* in, uint8_t* out);
void acs(int* metric); void acs(int* metric);
void viterbiDecode(int* data); void viterbiDecode(int* data);

37
P25RX.cpp
View File

@ -55,7 +55,9 @@ m_bufferPtr(0U),
m_symbolPtr(0U), m_symbolPtr(0U),
m_lostCount(0U), m_lostCount(0U),
m_centre(0), m_centre(0),
m_threshold(0) m_threshold(0),
m_rssiAccum(0U),
m_rssiCount(0U)
{ {
m_buffer = m_outBuffer + 1U; m_buffer = m_outBuffer + 1U;
} }
@ -71,11 +73,16 @@ void CP25RX::reset()
m_lostCount = 0U; m_lostCount = 0U;
m_centre = 0; m_centre = 0;
m_threshold = 0; m_threshold = 0;
m_rssiAccum = 0U;
m_rssiCount = 0U;
} }
void CP25RX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length) void CP25RX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length)
{ {
for (uint16_t i = 0U; i < length; i++) { for (uint16_t i = 0U; i < length; i++) {
m_rssiAccum += rssi[i];
m_rssiCount++;
bool bit = samples[i] < 0; bool bit = samples[i] < 0;
if (bit != m_prev) { if (bit != m_prev) {
@ -95,7 +102,7 @@ void CP25RX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length)
if (m_state == P25RXS_NONE) if (m_state == P25RXS_NONE)
processNone(samples[i]); processNone(samples[i]);
else else
processData(samples[i], rssi[i]); processData(samples[i]);
} }
} }
} }
@ -162,6 +169,8 @@ void CP25RX::processNone(q15_t sample)
m_lostCount = MAX_SYNC_FRAMES; m_lostCount = MAX_SYNC_FRAMES;
m_bufferPtr = P25_SYNC_LENGTH_BITS; m_bufferPtr = P25_SYNC_LENGTH_BITS;
m_state = P25RXS_DATA; m_state = P25RXS_DATA;
m_rssiAccum = 0U;
m_rssiCount = 0U;
io.setDecode(true); io.setDecode(true);
io.setADCDetection(true); io.setADCDetection(true);
@ -173,7 +182,7 @@ void CP25RX::processNone(q15_t sample)
m_symbolPtr = 0U; m_symbolPtr = 0U;
} }
void CP25RX::processData(q15_t sample, uint16_t rssi) void CP25RX::processData(q15_t sample)
{ {
sample -= m_centre; sample -= m_centre;
@ -216,6 +225,9 @@ void CP25RX::processData(q15_t sample, uint16_t rssi)
m_outBuffer[0U] = 0x01U; m_outBuffer[0U] = 0x01U;
serial.writeP25Hdr(m_outBuffer, P25_HDR_FRAME_LENGTH_BYTES + 1U); serial.writeP25Hdr(m_outBuffer, P25_HDR_FRAME_LENGTH_BYTES + 1U);
m_rssiAccum = 0U;
m_rssiCount = 0U;
// Restore the sync that's now in the wrong place // Restore the sync that's now in the wrong place
for (uint8_t i = 0U; i < P25_SYNC_LENGTH_BYTES; i++) for (uint8_t i = 0U; i < P25_SYNC_LENGTH_BYTES; i++)
m_buffer[i] = P25_SYNC_BYTES[i]; m_buffer[i] = P25_SYNC_BYTES[i];
@ -251,7 +263,7 @@ void CP25RX::processData(q15_t sample, uint16_t rssi)
} else { } else {
m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
writeRSSILdu(m_outBuffer, rssi); writeRSSILdu(m_outBuffer);
// Start the next frame // Start the next frame
::memset(m_outBuffer, 0x00U, P25_LDU_FRAME_LENGTH_BYTES + 3U); ::memset(m_outBuffer, 0x00U, P25_LDU_FRAME_LENGTH_BYTES + 3U);
@ -260,14 +272,23 @@ void CP25RX::processData(q15_t sample, uint16_t rssi)
} }
} }
void CP25RX::writeRSSILdu(uint8_t* ldu, uint16_t rssi) void CP25RX::writeRSSILdu(uint8_t* ldu)
{ {
#if defined(SEND_RSSI_DATA) #if defined(SEND_RSSI_DATA)
ldu[216U] = (rssi >> 8) & 0xFFU; if (m_rssiCount > 0U) {
ldu[217U] = (rssi >> 0) & 0xFFU; uint16_t rssi = m_rssiAccum / m_rssiCount;
serial.writeP25Ldu(ldu, P25_LDU_FRAME_LENGTH_BYTES + 3U); ldu[216U] = (rssi >> 8) & 0xFFU;
ldu[217U] = (rssi >> 0) & 0xFFU;
serial.writeP25Ldu(ldu, P25_LDU_FRAME_LENGTH_BYTES + 3U);
} else {
serial.writeP25Ldu(ldu, P25_LDU_FRAME_LENGTH_BYTES + 1U);
}
#else #else
serial.writeP25Ldu(ldu, P25_LDU_FRAME_LENGTH_BYTES + 1U); serial.writeP25Ldu(ldu, P25_LDU_FRAME_LENGTH_BYTES + 1U);
#endif #endif
m_rssiAccum = 0U;
m_rssiCount = 0U;
} }

6
P25RX.h
View File

@ -49,10 +49,12 @@ private:
uint16_t m_lostCount; uint16_t m_lostCount;
q15_t m_centre; q15_t m_centre;
q15_t m_threshold; q15_t m_threshold;
uint32_t m_rssiAccum;
uint16_t m_rssiCount;
void processNone(q15_t sample); void processNone(q15_t sample);
void processData(q15_t sample, uint16_t rssi); void processData(q15_t sample);
void writeRSSILdu(uint8_t* data, uint16_t rssi); void writeRSSILdu(uint8_t* data);
}; };
#endif #endif

34
YSFRX.cpp
View File

@ -55,7 +55,9 @@ m_bufferPtr(0U),
m_symbolPtr(0U), m_symbolPtr(0U),
m_lostCount(0U), m_lostCount(0U),
m_centre(0), m_centre(0),
m_threshold(0) m_threshold(0),
m_rssiAccum(0U),
m_rssiCount(0U)
{ {
m_buffer = m_outBuffer + 1U; m_buffer = m_outBuffer + 1U;
} }
@ -71,11 +73,16 @@ void CYSFRX::reset()
m_lostCount = 0U; m_lostCount = 0U;
m_centre = 0; m_centre = 0;
m_threshold = 0; m_threshold = 0;
m_rssiAccum = 0U;
m_rssiCount = 0U;
} }
void CYSFRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length) void CYSFRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length)
{ {
for (uint16_t i = 0U; i < length; i++) { for (uint16_t i = 0U; i < length; i++) {
m_rssiAccum += rssi[i];
m_rssiCount++;
bool bit = samples[i] < 0; bool bit = samples[i] < 0;
if (bit != m_prev) { if (bit != m_prev) {
@ -95,7 +102,7 @@ void CYSFRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length)
if (m_state == YSFRXS_NONE) if (m_state == YSFRXS_NONE)
processNone(samples[i]); processNone(samples[i]);
else else
processData(samples[i], rssi[i]); processData(samples[i]);
} }
} }
} }
@ -162,6 +169,8 @@ void CYSFRX::processNone(q15_t sample)
m_lostCount = MAX_SYNC_FRAMES; m_lostCount = MAX_SYNC_FRAMES;
m_bufferPtr = YSF_SYNC_LENGTH_BITS; m_bufferPtr = YSF_SYNC_LENGTH_BITS;
m_state = YSFRXS_DATA; m_state = YSFRXS_DATA;
m_rssiAccum = 0U;
m_rssiCount = 0U;
io.setDecode(true); io.setDecode(true);
io.setADCDetection(true); io.setADCDetection(true);
@ -173,7 +182,7 @@ void CYSFRX::processNone(q15_t sample)
m_symbolPtr = 0U; m_symbolPtr = 0U;
} }
void CYSFRX::processData(q15_t sample, uint16_t rssi) void CYSFRX::processData(q15_t sample)
{ {
sample -= m_centre; sample -= m_centre;
@ -233,7 +242,7 @@ void CYSFRX::processData(q15_t sample, uint16_t rssi)
} else { } else {
m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
writeRSSIData(m_outBuffer, rssi); writeRSSIData(m_outBuffer);
// Start the next frame // Start the next frame
::memset(m_outBuffer, 0x00U, YSF_FRAME_LENGTH_BYTES + 3U); ::memset(m_outBuffer, 0x00U, YSF_FRAME_LENGTH_BYTES + 3U);
@ -242,14 +251,23 @@ void CYSFRX::processData(q15_t sample, uint16_t rssi)
} }
} }
void CYSFRX::writeRSSIData(uint8_t* data, uint16_t rssi) void CYSFRX::writeRSSIData(uint8_t* data)
{ {
#if defined(SEND_RSSI_DATA) #if defined(SEND_RSSI_DATA)
data[120U] = (rssi >> 8) & 0xFFU; if (m_rssiCount > 0U) {
data[121U] = (rssi >> 0) & 0xFFU; uint16_t rssi = m_rssiAccum / m_rssiCount;
serial.writeYSFData(data, YSF_FRAME_LENGTH_BYTES + 3U); data[120U] = (rssi >> 8) & 0xFFU;
data[121U] = (rssi >> 0) & 0xFFU;
serial.writeYSFData(data, YSF_FRAME_LENGTH_BYTES + 3U);
} else {
serial.writeYSFData(data, YSF_FRAME_LENGTH_BYTES + 1U);
}
#else #else
serial.writeYSFData(data, YSF_FRAME_LENGTH_BYTES + 1U); serial.writeYSFData(data, YSF_FRAME_LENGTH_BYTES + 1U);
#endif #endif
m_rssiAccum = 0U;
m_rssiCount = 0U;
} }

6
YSFRX.h
View File

@ -49,10 +49,12 @@ private:
uint16_t m_lostCount; uint16_t m_lostCount;
q15_t m_centre; q15_t m_centre;
q15_t m_threshold; q15_t m_threshold;
uint32_t m_rssiAccum;
uint16_t m_rssiCount;
void processNone(q15_t sample); void processNone(q15_t sample);
void processData(q15_t sample, uint16_t rssi); void processData(q15_t sample);
void writeRSSIData(unsigned char* data, uint16_t rssi); void writeRSSIData(unsigned char* data);
}; };
#endif #endif