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

Some code cleanup

Browse source
This commit is contained in:
Andy CA6JAU 2018-07-19 23:28:17 -04:00
parent 32721d8bb2
commit 8f0e0dacad
5 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BitRB.cpp
View file

@ -25,7 +25,7 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
#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 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))) #define READ_BIT1(p,i) ((p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) >> (7 - ((i)&7)))
CBitRB::CBitRB(uint16_t length) : CBitRB::CBitRB(uint16_t length) :
m_length(length), m_length(length),
m_bits(NULL), m_bits(NULL),

4
DMRDMOTX.cpp
View file

@ -77,10 +77,10 @@ void CDMRDMOTX::process()
m_poPtr++; m_poPtr++;
writeByte(DMR_SYNC); writeByte(DMR_SYNC);
} else } else
writeByte(m_poBuffer[m_poPtr++]); writeByte(m_poBuffer[m_poPtr++]);
space -= 8U; space -= 8U;
if (m_poPtr >= m_poLen) { if (m_poPtr >= m_poLen) {
m_poPtr = 0U; m_poPtr = 0U;
m_poLen = 0U; m_poLen = 0U;

3
Globals.h
View file

@ -83,9 +83,6 @@ const uint8_t MARK_NONE = 0x00U;
#include "Debug.h" #include "Debug.h"
#include "Utils.h" #include "Utils.h"
const uint16_t TX_RINGBUFFER_SIZE = 1024U;
const uint16_t RX_RINGBUFFER_SIZE = 1024U;
extern MMDVM_STATE m_modemState; extern MMDVM_STATE m_modemState;
extern MMDVM_STATE m_calState; extern MMDVM_STATE m_calState;
extern MMDVM_STATE m_modemState_prev; extern MMDVM_STATE m_modemState_prev;

4
IO.cpp
View file

@ -29,8 +29,8 @@ uint8_t m_power;
CIO::CIO(): CIO::CIO():
m_started(false), m_started(false),
m_rxBuffer(RX_RINGBUFFER_SIZE), m_rxBuffer(1024U),
m_txBuffer(TX_RINGBUFFER_SIZE), m_txBuffer(1024U),
m_LoDevYSF(false), m_LoDevYSF(false),
m_ledCount(0U), m_ledCount(0U),
m_scanEnable(false), m_scanEnable(false),

21
POCSAGTX.cpp
View file

@ -34,35 +34,32 @@ m_delay(false)
void CPOCSAGTX::process() void CPOCSAGTX::process()
{ {
if (m_buffer.getData() == 0U && m_poLen == 0U) if (m_poLen == 0U && m_buffer.getData() > 0U) {
return;
if (m_poLen == 0U) {
if (!m_tx) { if (!m_tx) {
m_delay = true; m_delay = true;
m_poLen = m_txDelay; m_poLen = m_txDelay;
} else { } else {
m_delay = false; m_delay = false;
for (uint8_t i = 0U; i < POCSAG_FRAME_LENGTH_BYTES; i++) for (uint8_t i = 0U; i < POCSAG_FRAME_LENGTH_BYTES; i++)
m_poBuffer[m_poLen++] = m_buffer.get(); m_poBuffer[i] = m_buffer.get();
}
m_poLen = POCSAG_FRAME_LENGTH_BYTES;
}
m_poPtr = 0U; m_poPtr = 0U;
} }
if (m_poLen > 0U) { if (m_poLen > 0U) {
uint16_t space = io.getSpace(); uint16_t space = io.getSpace();
while (space > 8U) { while (space > 8U) {
if (m_delay) { if (m_delay) {
m_poPtr++; m_poPtr++;
writeByte(POCSAG_SYNC); writeByte(POCSAG_SYNC);
} } else
else writeByte(m_poBuffer[m_poPtr++]);
writeByte(m_poBuffer[m_poPtr++]);
space -= 8U; space -= 8U;
if (m_poPtr >= m_poLen) { if (m_poPtr >= m_poLen) {
m_poPtr = 0U; m_poPtr = 0U;
m_poLen = 0U; m_poLen = 0U;
@ -92,7 +89,7 @@ void CPOCSAGTX::writeByte(uint8_t c)
{ {
uint8_t bit; uint8_t bit;
uint8_t mask = 0x80U; uint8_t mask = 0x80U;
for (uint8_t i = 0U; i < 8U; i++, c <<= 1) { for (uint8_t i = 0U; i < 8U; i++, c <<= 1) {
if ((c & mask) == mask) if ((c & mask) == mask)
bit = 1U; bit = 1U;