Some code cleanup

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

View file

@ -77,7 +77,7 @@ void CDMRDMOTX::process()
m_poPtr++;
writeByte(DMR_SYNC);
} else
writeByte(m_poBuffer[m_poPtr++]);
writeByte(m_poBuffer[m_poPtr++]);
space -= 8U;

View file

@ -83,9 +83,6 @@ const uint8_t MARK_NONE = 0x00U;
#include "Debug.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_calState;
extern MMDVM_STATE m_modemState_prev;

4
IO.cpp
View file

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

View file

@ -34,19 +34,17 @@ m_delay(false)
void CPOCSAGTX::process()
{
if (m_buffer.getData() == 0U && m_poLen == 0U)
return;
if (m_poLen == 0U) {
if (m_poLen == 0U && m_buffer.getData() > 0U) {
if (!m_tx) {
m_delay = true;
m_poLen = m_txDelay;
} else {
m_delay = false;
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;
}
@ -57,9 +55,8 @@ void CPOCSAGTX::process()
if (m_delay) {
m_poPtr++;
writeByte(POCSAG_SYNC);
}
else
writeByte(m_poBuffer[m_poPtr++]);
} else
writeByte(m_poBuffer[m_poPtr++]);
space -= 8U;