Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #306 from timclassic/dstar-match-full-last-data-frame 

Detect full 48 bits of last data frame in a D-Star transmission
This commit is contained in:
Jonathan Naylor 2020-12-14 09:37:05 +00:00 committed by GitHub
parent 061e10e395 657e71238d
commit c06a83660f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DStarRX.cpp
View File

@ -41,8 +41,8 @@ const uint32_t DATA_SYNC_MASK = 0x00FFFFFFU;
const uint8_t DATA_SYNC_ERRS = 2U; const uint8_t DATA_SYNC_ERRS = 2U;
// D-Star bit order version of 0x55 0x55 0xC8 0x7A // D-Star bit order version of 0x55 0x55 0xC8 0x7A
const uint32_t END_SYNC_DATA = 0xAAAA135EU; const uint64_t END_SYNC_DATA = 0x0000AAAAAAAA135EU;
const uint32_t END_SYNC_MASK = 0xFFFFFFFFU; const uint64_t END_SYNC_MASK = 0x0000FFFFFFFFFFFFU;
const uint8_t END_SYNC_ERRS = 1U; const uint8_t END_SYNC_ERRS = 1U;
const uint8_t BIT_MASK_TABLE0[] = {0x7FU, 0xBFU, 0xDFU, 0xEFU, 0xF7U, 0xFBU, 0xFDU, 0xFEU}; const uint8_t BIT_MASK_TABLE0[] = {0x7FU, 0xBFU, 0xDFU, 0xEFU, 0xF7U, 0xFBU, 0xFDU, 0xFEU};
@ -242,6 +242,7 @@ m_pll(0U),
m_prev(false), m_prev(false),
m_rxState(DSRXS_NONE), m_rxState(DSRXS_NONE),
m_patternBuffer(0x00U), m_patternBuffer(0x00U),
m_patternBuffer64(0x00U),
m_rxBuffer(), m_rxBuffer(),
m_rxBufferBits(0U), m_rxBufferBits(0U),
m_dataBits(0U), m_dataBits(0U),
@ -263,6 +264,7 @@ void CDStarRX::reset()
m_prev = false; m_prev = false;
m_rxState = DSRXS_NONE; m_rxState = DSRXS_NONE;
m_patternBuffer = 0x00U; m_patternBuffer = 0x00U;
m_patternBuffer64 = 0x00U;
m_rxBufferBits = 0U; m_rxBufferBits = 0U;
m_dataBits = 0U; m_dataBits = 0U;
m_rssiAccum = 0U; m_rssiAccum = 0U;
@ -314,6 +316,10 @@ void CDStarRX::processNone(bool bit)
if (bit) if (bit)
m_patternBuffer |= 0x01U; m_patternBuffer |= 0x01U;
m_patternBuffer64 <<= 1;
if (bit)
m_patternBuffer64 |= 0x01U;
// Fuzzy matching of the frame sync sequence // Fuzzy matching of the frame sync sequence
if (countBits32((m_patternBuffer & FRAME_SYNC_MASK) ^ FRAME_SYNC_DATA) <= FRAME_SYNC_ERRS) { if (countBits32((m_patternBuffer & FRAME_SYNC_MASK) ^ FRAME_SYNC_DATA) <= FRAME_SYNC_ERRS) {
DEBUG1("DStarRX: found frame sync in None"); DEBUG1("DStarRX: found frame sync in None");
@ -357,6 +363,10 @@ void CDStarRX::processHeader(bool bit)
if (bit) if (bit)
m_patternBuffer |= 0x01U; m_patternBuffer |= 0x01U;
m_patternBuffer64 <<= 1;
if (bit)
m_patternBuffer64 |= 0x01U;
WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit); WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit);
m_rxBufferBits++; m_rxBufferBits++;
@ -389,11 +399,15 @@ void CDStarRX::processData(bool bit)
if (bit) if (bit)
m_patternBuffer |= 0x01U; m_patternBuffer |= 0x01U;
m_patternBuffer64 <<= 1;
if (bit)
m_patternBuffer64 |= 0x01U;
WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit); WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit);
m_rxBufferBits++; m_rxBufferBits++;
// Fuzzy matching of the end frame sequences // Fuzzy matching of the end frame sequences
if (countBits32((m_patternBuffer & END_SYNC_MASK) ^ END_SYNC_DATA) <= END_SYNC_ERRS) { if (countBits64((m_patternBuffer64 & END_SYNC_MASK) ^ END_SYNC_DATA) <= END_SYNC_ERRS) {
DEBUG1("DStarRX: Found end sync in Data"); DEBUG1("DStarRX: Found end sync in Data");
io.setDecode(false); io.setDecode(false);

1
DStarRX.h
View File

@ -41,6 +41,7 @@ private:
bool m_prev; bool m_prev;
DSRX_STATE m_rxState; DSRX_STATE m_rxState;
uint32_t m_patternBuffer; uint32_t m_patternBuffer;
uint64_t m_patternBuffer64;
uint8_t m_rxBuffer[100U]; uint8_t m_rxBuffer[100U];
unsigned int m_rxBufferBits; unsigned int m_rxBufferBits;
unsigned int m_dataBits; unsigned int m_dataBits;