g4klx/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM_HS.git synced 2025-12-06 07:02:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify the D-Star fast data support.

Browse source
This commit is contained in:
Tim Stewart 2020-12-30 17:11:30 -05:00
parent 0f7a64115d
commit 08a6c21c17
2 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
DStarRX.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2016 by Jonathan Naylor G4KLX * Copyright (C) 2009-2016,2020 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -25,18 +25,18 @@
const unsigned int MAX_SYNC_BITS = 100U * DSTAR_DATA_LENGTH_BITS; const unsigned int MAX_SYNC_BITS = 100U * DSTAR_DATA_LENGTH_BITS;
// D-Star preamble sequence (only 32 bits of 101010...) // D-Star preamble sequence (only 32 bits of 101010...)
const uint32_t PREAMBLE_MASK = 0xFFFFFFFFU; const uint64_t PREAMBLE_MASK = 0x00000000FFFFFFFFU;
const uint32_t PREAMBLE_DATA = 0xAAAAAAAAU; const uint64_t PREAMBLE_DATA = 0x00000000AAAAAAAAU;
const uint8_t PREAMBLE_ERRS = 2U; const uint8_t PREAMBLE_ERRS = 2U;
// D-Star bit order version of 0x55 0x55 0x6E 0x0A // D-Star bit order version of 0x55 0x55 0x6E 0x0A
const uint32_t FRAME_SYNC_DATA = 0x00557650U; const uint64_t FRAME_SYNC_DATA = 0x0000000000557650U;
const uint32_t FRAME_SYNC_MASK = 0x00FFFFFFU; const uint64_t FRAME_SYNC_MASK = 0x0000000000FFFFFFU;
const uint8_t FRAME_SYNC_ERRS = 2U; const uint8_t FRAME_SYNC_ERRS = 2U;
// D-Star bit order version of 0x55 0x2D 0x16 // D-Star bit order version of 0x55 0x2D 0x16
const uint32_t DATA_SYNC_DATA = 0x00AAB468U; const uint64_t DATA_SYNC_DATA = 0x0000000000AAB468U;
const uint32_t DATA_SYNC_MASK = 0x00FFFFFFU; const uint64_t DATA_SYNC_MASK = 0x0000000000FFFFFFU;
const uint8_t DATA_SYNC_ERRS = 3U; const uint8_t DATA_SYNC_ERRS = 3U;
// D-Star bit order version of 0x55 0x55 0xC8 0x7A // D-Star bit order version of 0x55 0x55 0xC8 0x7A
@ -239,7 +239,6 @@ const uint16_t CCITT_TABLE[] = {
CDStarRX::CDStarRX() : CDStarRX::CDStarRX() :
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),
@ -257,7 +256,6 @@ void CDStarRX::reset()
{ {
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;
} }
@ -285,12 +283,8 @@ 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 preamble sync sequence // Fuzzy matching of the preamble sync sequence
if (countBits32((m_patternBuffer & PREAMBLE_MASK) ^ PREAMBLE_DATA) <= PREAMBLE_ERRS) { if (countBits64((m_patternBuffer & PREAMBLE_MASK) ^ PREAMBLE_DATA) <= PREAMBLE_ERRS) {
// Extend scan period in D-Star, once preamble is detected // Extend scan period in D-Star, once preamble is detected
m_modeTimerCnt = 0; m_modeTimerCnt = 0;
@ -301,7 +295,7 @@ void CDStarRX::processNone(bool bit)
} }
// 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 (countBits64((m_patternBuffer & FRAME_SYNC_MASK) ^ FRAME_SYNC_DATA) <= FRAME_SYNC_ERRS) {
DEBUG1("DStarRX: found frame sync in None, fuzzy"); DEBUG1("DStarRX: found frame sync in None, fuzzy");
::memset(m_rxBuffer, 0x00U, DSTAR_FEC_SECTION_LENGTH_BYTES); ::memset(m_rxBuffer, 0x00U, DSTAR_FEC_SECTION_LENGTH_BYTES);
@ -312,7 +306,7 @@ void CDStarRX::processNone(bool bit)
} }
// Exact matching of the data sync bit sequence // Exact matching of the data sync bit sequence
if (countBits32((m_patternBuffer & DATA_SYNC_MASK) ^ DATA_SYNC_DATA) == 0U) { if (countBits64((m_patternBuffer & DATA_SYNC_MASK) ^ DATA_SYNC_DATA) == 0U) {
DEBUG1("DStarRX: found data sync in None, exact"); DEBUG1("DStarRX: found data sync in None, exact");
io.setDecode(true); io.setDecode(true);
@ -335,10 +329,6 @@ 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++;
@ -373,10 +363,6 @@ 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++;
@ -384,7 +370,7 @@ void CDStarRX::processData(bool bit)
reset(); reset();
// Fuzzy matching of the end frame sequences // Fuzzy matching of the end frame sequences
if (countBits64((m_patternBuffer64 & END_SYNC_MASK) ^ END_SYNC_DATA) <= END_SYNC_ERRS) { if (countBits64((m_patternBuffer & 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);
@ -397,7 +383,7 @@ void CDStarRX::processData(bool bit)
// Fuzzy matching of the data sync bit sequence // Fuzzy matching of the data sync bit sequence
bool syncSeen = false; bool syncSeen = false;
if (m_rxBufferBits >= (DSTAR_DATA_LENGTH_BITS - 3U)) { if (m_rxBufferBits >= (DSTAR_DATA_LENGTH_BITS - 3U)) {
if (countBits32((m_patternBuffer & DATA_SYNC_MASK) ^ DATA_SYNC_DATA) <= DATA_SYNC_ERRS) { if (countBits64((m_patternBuffer & DATA_SYNC_MASK) ^ DATA_SYNC_DATA) <= DATA_SYNC_ERRS) {
m_rxBufferBits = DSTAR_DATA_LENGTH_BITS; m_rxBufferBits = DSTAR_DATA_LENGTH_BITS;
m_dataBits = MAX_SYNC_BITS; m_dataBits = MAX_SYNC_BITS;
syncSeen = true; syncSeen = true;
@ -407,9 +393,9 @@ void CDStarRX::processData(bool bit)
// Check to see if the sync is arriving late // Check to see if the sync is arriving late
if (m_rxBufferBits == DSTAR_DATA_LENGTH_BITS && !syncSeen) { if (m_rxBufferBits == DSTAR_DATA_LENGTH_BITS && !syncSeen) {
for (uint8_t i = 1U; i <= 3U; i++) { for (uint8_t i = 1U; i <= 3U; i++) {
uint32_t syncMask = DATA_SYNC_MASK >> i; uint64_t syncMask = DATA_SYNC_MASK >> i;
uint32_t syncData = DATA_SYNC_DATA >> i; uint64_t syncData = DATA_SYNC_DATA >> i;
if (countBits32((m_patternBuffer & syncMask) ^ syncData) <= DATA_SYNC_ERRS) { if (countBits64((m_patternBuffer & syncMask) ^ syncData) <= DATA_SYNC_ERRS) {
m_rxBufferBits -= i; m_rxBufferBits -= i;
break; break;
} }

5
DStarRX.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017 by Andy Uribe CA6JAU * Copyright (C) 2016,2017 by Andy Uribe CA6JAU
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -40,8 +40,7 @@ public:
private: private:
DSRX_STATE m_rxState; DSRX_STATE m_rxState;
uint32_t m_patternBuffer; uint64_t m_patternBuffer;
uint64_t m_patternBuffer64;
uint8_t m_rxBuffer[DSTAR_BUFFER_LENGTH_BITS / 8U]; uint8_t m_rxBuffer[DSTAR_BUFFER_LENGTH_BITS / 8U];
unsigned int m_rxBufferBits; unsigned int m_rxBufferBits;
unsigned int m_dataBits; unsigned int m_dataBits;