diff --git a/DMRDefines.h b/DMRDefines.h index 637bf35..d853c6f 100644 --- a/DMRDefines.h +++ b/DMRDefines.h @@ -59,11 +59,11 @@ const unsigned char DMR_IDLE_DATA[] = {TAG_DATA, 0x00U, 0x36U, 0x00U, 0x0DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD0U, 0x03U, 0xF6U, 0xE4U, 0x65U, 0x17U, 0x1BU, 0x48U, 0xCAU, 0x6DU, 0x4FU, 0xC6U, 0x10U, 0xB4U}; -// A silence frame with no EMB and a null Short LC, XXX -//const unsigned char DMR_SILENCE_DATA[] = {TAG_DATA, 0x00U, -// 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}; +// A silence frame with no EMB and a null Short LC +const unsigned char DMR_SILENCE_DATA[] = {TAG_DATA, 0x00U, + 0x88U, 0xC8U, 0xA3U, 0x54U, 0x22U, 0x14U, 0x31U, 0x69U, 0x6AU, 0xAAU, 0xCAU, + 0x81U, 0x54U, 0x20U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x01U, 0x25U, 0x13U, + 0x29U, 0x48U, 0xAAU, 0xCAU, 0x81U, 0x54U, 0x21U, 0x25U, 0x31U, 0x39U, 0x6AU}; const unsigned char PAYLOAD_LEFT_MASK[] = {0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xF0U}; const unsigned char PAYLOAD_RIGHT_MASK[] = {0x0FU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU}; diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 5f7b10e..3d463e8 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -746,10 +746,7 @@ void CDMRSlot::init(unsigned int colorCode, CModem* modem, CHomebrewDMRIPSC* net m_silence = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; m_idle = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; - ::memset(m_silence, 0x00U, DMR_FRAME_LENGTH_BYTES + 2U); - m_silence[0U] = TAG_DATA; - - // ::memcpy(m_silence, DMR_SILENCE_DATA, DMR_FRAME_LENGTH_BYTES + 2U); + ::memcpy(m_silence, DMR_SILENCE_DATA, DMR_FRAME_LENGTH_BYTES + 2U); ::memcpy(m_idle, DMR_IDLE_DATA, DMR_FRAME_LENGTH_BYTES + 2U); // Generate the Slot Type for the Idle frame