Unsignedio
/
MMDVM
mirror of https://github.com/markqvist/MMDVM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove small gap when data comes in while sending terminators.

48kHz
Jonathan Naylor 2016-07-19 17:34:55 +01:00
parent f7cae15aba
commit 66ca69b02e
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DMRTX.cpp
View File

@ -74,7 +74,8 @@ m_markBuffer(),
m_poBuffer(), m_poBuffer(),
m_poLen(0U), m_poLen(0U),
m_poPtr(0U), m_poPtr(0U),
m_count(0U) m_count(0U),
m_abort()
{ {
::memset(m_modState, 0x00U, 70U * sizeof(q15_t)); ::memset(m_modState, 0x00U, 70U * sizeof(q15_t));
@ -84,6 +85,9 @@ m_count(0U)
::memcpy(m_newShortLC, EMPTY_SHORT_LC, 12U); ::memcpy(m_newShortLC, EMPTY_SHORT_LC, 12U);
::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U); ::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U);
m_abort[0U] = false;
m_abort[1U] = false;
} }
void CDMRTX::process() void CDMRTX::process()
@ -149,6 +153,11 @@ uint8_t CDMRTX::writeData1(const uint8_t* data, uint8_t length)
if (space < DMR_FRAME_LENGTH_BYTES) if (space < DMR_FRAME_LENGTH_BYTES)
return 5U; return 5U;
if (m_abort[0U]) {
m_fifo[0U].reset();
m_abort[0U] = false;
}
for (uint8_t i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) for (uint8_t i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
m_fifo[0U].put(data[i + 1U]); m_fifo[0U].put(data[i + 1U]);
@ -168,6 +177,11 @@ uint8_t CDMRTX::writeData2(const uint8_t* data, uint8_t length)
if (space < DMR_FRAME_LENGTH_BYTES) if (space < DMR_FRAME_LENGTH_BYTES)
return 5U; return 5U;
if (m_abort[1U]) {
m_fifo[1U].reset();
m_abort[1U] = false;
}
for (uint8_t i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) for (uint8_t i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
m_fifo[1U].put(data[i + 1U]); m_fifo[1U].put(data[i + 1U]);
@ -201,11 +215,11 @@ uint8_t CDMRTX::writeAbort(const uint8_t* data, uint8_t length)
switch (data[0U]) { switch (data[0U]) {
case 1U: case 1U:
m_fifo[0U].reset(); m_abort[0U] = true;
return 0U; return 0U;
case 2U: case 2U:
m_fifo[1U].reset(); m_abort[1U] = true;
return 0U; return 0U;
default: default:
@ -218,6 +232,9 @@ void CDMRTX::setStart(bool start)
m_state = start ? DMRTXSTATE_SLOT1 : DMRTXSTATE_IDLE; m_state = start ? DMRTXSTATE_SLOT1 : DMRTXSTATE_IDLE;
m_count = 0U; m_count = 0U;
m_abort[0U] = false;
m_abort[1U] = false;
} }
void CDMRTX::setCal(bool start) void CDMRTX::setCal(bool start)
@ -302,6 +319,7 @@ void CDMRTX::createData(uint8_t slotIndex)
m_markBuffer[i] = MARK_NONE; m_markBuffer[i] = MARK_NONE;
} }
} else { } else {
m_abort[slotIndex] = false;
// Transmit an idle message // Transmit an idle message
for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) { for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) {
m_poBuffer[i] = m_idle[i]; m_poBuffer[i] = m_idle[i];

1
DMRTX.h
View File

@ -68,6 +68,7 @@ private:
uint16_t m_poLen; uint16_t m_poLen;
uint16_t m_poPtr; uint16_t m_poPtr;
uint32_t m_count; uint32_t m_count;
bool m_abort[2U];
void createData(uint8_t slotIndex); void createData(uint8_t slotIndex);
void createCACH(uint8_t txSlotIndex, uint8_t rxSlotIndex); void createCACH(uint8_t txSlotIndex, uint8_t rxSlotIndex);