juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2026-01-01 22:29:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimizing memory for DMR Idle RX

Browse source
This commit is contained in:
Andy CA6JAU 2018-07-15 21:20:08 -04:00
parent 6499fd1596
commit 5da9d93db6
3 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DMRDMORX.cpp
View file

@ -40,6 +40,7 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
CDMRDMORX::CDMRDMORX() : CDMRDMORX::CDMRDMORX() :
m_patternBuffer(0x00U), m_patternBuffer(0x00U),
m_buffer(),
m_dataPtr(0U), m_dataPtr(0U),
m_syncPtr(0U), m_syncPtr(0U),
m_startPtr(0U), m_startPtr(0U),

34
DMRIdleRX.cpp
View file

@ -34,7 +34,13 @@ const uint16_t NOENDPTR = 9999U;
const uint8_t CONTROL_IDLE = 0x80U; const uint8_t CONTROL_IDLE = 0x80U;
const uint8_t CONTROL_DATA = 0x40U; const uint8_t CONTROL_DATA = 0x40U;
const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
#define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
#define READ_BIT1(p,i) ((p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) >> (7 - ((i)&7)))
CDMRIdleRX::CDMRIdleRX() : CDMRIdleRX::CDMRIdleRX() :
m_patternBuffer(0U),
m_buffer(), m_buffer(),
m_dataPtr(0U), m_dataPtr(0U),
m_endPtr(NOENDPTR), m_endPtr(NOENDPTR),
@ -50,7 +56,7 @@ void CDMRIdleRX::reset()
void CDMRIdleRX::databit(bool bit) void CDMRIdleRX::databit(bool bit)
{ {
m_buffer[m_dataPtr] = bit; WRITE_BIT1(m_buffer, m_dataPtr, bit);
m_patternBuffer <<= 1; m_patternBuffer <<= 1;
if (bit) if (bit)
@ -68,7 +74,7 @@ void CDMRIdleRX::databit(bool bit)
uint16_t ptr = m_endPtr + 1; uint16_t ptr = m_endPtr + 1;
if (ptr >= DMR_FRAME_LENGTH_BITS) if (ptr >= DMR_FRAME_LENGTH_BITS)
ptr -= DMR_FRAME_LENGTH_BITS; ptr -= DMR_FRAME_LENGTH_BITS;
uint8_t frame[DMR_FRAME_LENGTH_BYTES + 1U]; uint8_t frame[DMR_FRAME_LENGTH_BYTES + 1U];
bitsToBytes(ptr, DMR_FRAME_LENGTH_BYTES, frame + 1U); bitsToBytes(ptr, DMR_FRAME_LENGTH_BYTES, frame + 1U);
@ -95,28 +101,36 @@ void CDMRIdleRX::bitsToBytes(uint16_t start, uint8_t count, uint8_t* buffer)
{ {
for (uint8_t i = 0U; i < count; i++) { for (uint8_t i = 0U; i < count; i++) {
buffer[i] = 0U; buffer[i] = 0U;
buffer[i] |= ((m_buffer[start++] & 0x01) << 7); buffer[i] |= READ_BIT1(m_buffer, start) << 7;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 6); buffer[i] |= READ_BIT1(m_buffer, start) << 6;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 5); buffer[i] |= READ_BIT1(m_buffer, start) << 5;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 4); buffer[i] |= READ_BIT1(m_buffer, start) << 4;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 3); buffer[i] |= READ_BIT1(m_buffer, start) << 3;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 2); buffer[i] |= READ_BIT1(m_buffer, start) << 2;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 1); buffer[i] |= READ_BIT1(m_buffer, start) << 1;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
buffer[i] |= ((m_buffer[start++] & 0x01) << 0); buffer[i] |= READ_BIT1(m_buffer, start) << 0;
start++;
if (start >= DMR_FRAME_LENGTH_BITS) if (start >= DMR_FRAME_LENGTH_BITS)
start -= DMR_FRAME_LENGTH_BITS; start -= DMR_FRAME_LENGTH_BITS;
} }

2
DMRIdleRX.h
View file

@ -38,7 +38,7 @@ public:
private: private:
uint64_t m_patternBuffer; uint64_t m_patternBuffer;
uint8_t m_buffer[DMR_FRAME_LENGTH_BITS]; uint8_t m_buffer[DMR_FRAME_LENGTH_BITS / 8U];
uint16_t m_dataPtr; uint16_t m_dataPtr;
uint16_t m_endPtr; uint16_t m_endPtr;
uint8_t m_colorCode; uint8_t m_colorCode;