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

Revert the DMR DMO transmitter changes.

c4fmdemod
Jonathan Naylor 2017-03-19 09:35:46 +00:00
parent e04057a5b5
commit e697a91710
3 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
DMRDMOTX.cpp
View File

@ -41,12 +41,6 @@ const q15_t DMR_LEVELB[] = { 213, 213, 213, 213, 213};
const q15_t DMR_LEVELC[] = {-213, -213, -213, -213, -213}; const q15_t DMR_LEVELC[] = {-213, -213, -213, -213, -213};
const q15_t DMR_LEVELD[] = {-640, -640, -640, -640, -640}; const q15_t DMR_LEVELD[] = {-640, -640, -640, -640, -640};
// The PR FILL and Data Sync pattern.
const uint8_t IDLE_DATA[] =
{0x53U, 0xC2U, 0x5EU, 0xABU, 0xA8U, 0x67U, 0x1DU, 0xC7U, 0x38U, 0x3BU, 0xD9U,
0x36U, 0x00U, 0x0DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD0U, 0x03U, 0xF6U,
0xE4U, 0x65U, 0x17U, 0x1BU, 0x48U, 0xCAU, 0x6DU, 0x4FU, 0xC6U, 0x10U, 0xB4U};
CDMRDMOTX::CDMRDMOTX() : CDMRDMOTX::CDMRDMOTX() :
m_fifo(), m_fifo(),
@ -55,9 +49,7 @@ m_modState(),
m_poBuffer(), m_poBuffer(),
m_poLen(0U), m_poLen(0U),
m_poPtr(0U), m_poPtr(0U),
m_txDelay(14U), // 240ms m_txDelay(240U) // 200ms
m_idle(),
m_frameCount(0U)
{ {
::memset(m_modState, 0x00U, 70U * sizeof(q15_t)); ::memset(m_modState, 0x00U, 70U * sizeof(q15_t));
@ -70,26 +62,14 @@ void CDMRDMOTX::process()
{ {
if (m_poLen == 0U && m_fifo.getData() > 0U) { if (m_poLen == 0U && m_fifo.getData() > 0U) {
if (!m_tx) { if (!m_tx) {
m_frameCount = 0U; for (uint16_t i = 0U; i < m_txDelay; i++)
for (unsigned int i = 0U; i < 72U; i++)
m_poBuffer[m_poLen++] = 0x00U; m_poBuffer[m_poLen++] = 0x00U;
for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
m_poBuffer[i] = m_idle[i];
} else { } else {
for (unsigned int i = 0U; i < 72U; i++) for (unsigned int i = 0U; i < 72U; i++)
m_poBuffer[m_poLen++] = 0x00U; m_poBuffer[m_poLen++] = 0x00U;
if (m_frameCount >= m_txDelay) {
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_fifo.get(); m_poBuffer[i] = m_fifo.get();
} else {
for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
m_poBuffer[i] = m_idle[i];
}
m_frameCount++;
} }
m_poPtr = 0U; m_poPtr = 0U;
@ -166,14 +146,6 @@ uint8_t CDMRDMOTX::getSpace() const
void CDMRDMOTX::setTXDelay(uint8_t delay) void CDMRDMOTX::setTXDelay(uint8_t delay)
{ {
m_txDelay = 10U + uint32_t(delay) / 6U; m_txDelay = 240U + uint16_t(delay) * 12U; // 200ms + tx delay
}
void CDMRDMOTX::setColorCode(uint8_t colorCode)
{
::memcpy(m_idle, IDLE_DATA, DMR_FRAME_LENGTH_BYTES);
CDMRSlotType slotType;
slotType.encode(colorCode, DT_IDLE, m_idle);
} }

4
DMRDMOTX.h
View File

@ -37,8 +37,6 @@ public:
uint8_t getSpace() const; uint8_t getSpace() const;
void setColorCode(uint8_t colorCode);
private: private:
CSerialRB m_fifo; CSerialRB m_fifo;
arm_fir_instance_q15 m_modFilter; arm_fir_instance_q15 m_modFilter;
@ -47,8 +45,6 @@ private:
uint16_t m_poLen; uint16_t m_poLen;
uint16_t m_poPtr; uint16_t m_poPtr;
uint32_t m_txDelay; uint32_t m_txDelay;
uint8_t m_idle[DMR_FRAME_LENGTH_BYTES];
uint32_t m_frameCount;
void writeByte(uint8_t c); void writeByte(uint8_t c);
}; };

1
SerialPort.cpp
View File

@ -270,7 +270,6 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
dmrDMOTX.setTXDelay(txDelay); dmrDMOTX.setTXDelay(txDelay);
dmrTX.setColorCode(colorCode); dmrTX.setColorCode(colorCode);
dmrDMOTX.setColorCode(colorCode);
dmrRX.setColorCode(colorCode); dmrRX.setColorCode(colorCode);
dmrRX.setDelay(dmrDelay); dmrRX.setDelay(dmrDelay);
dmrDMORX.setColorCode(colorCode); dmrDMORX.setColorCode(colorCode);