From 77d34a0075870e77c97ebcad05ac87b069a234c6 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 21 Jan 2016 18:38:45 +0000 Subject: [PATCH] Use terminators instead of idle to end a voice transmission. ` --- DMRDefines.h | 16 +++++-- DMRSlot.cpp | 111 ++++++++++++++++++++++++++++++------------------- DMRSlot.h | 3 +- Golay24128.cpp | 2 +- 4 files changed, 84 insertions(+), 48 deletions(-) diff --git a/DMRDefines.h b/DMRDefines.h index 8e7cada..637bf35 100644 --- a/DMRDefines.h +++ b/DMRDefines.h @@ -19,6 +19,8 @@ #if !defined(DMRDefines_H) #define DMRDefines_H +#include "Defines.h" // For TAG_DATA + const unsigned int DMR_FRAME_LENGTH_BITS = 264U; const unsigned int DMR_FRAME_LENGTH_BYTES = 33U; @@ -52,10 +54,16 @@ const unsigned char DIRECT_SLOT2_DATA_SYNC[] = {0x0DU, 0x75U, 0x57U, 0xF5U, 0xF const unsigned char SYNC_MASK[] = {0x0FU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xF0U}; // The PR FILL and Data Sync pattern. -const unsigned char 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}; +const unsigned char DMR_IDLE_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, 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}; 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 f81020f..5f7b10e 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -31,6 +31,7 @@ CHomebrewDMRIPSC* CDMRSlot::m_network = NULL; IDisplay* CDMRSlot::m_display = NULL; unsigned char* CDMRSlot::m_idle = NULL; +unsigned char* CDMRSlot::m_silence = NULL; FLCO CDMRSlot::m_flco1; unsigned char CDMRSlot::m_id1 = 0U; @@ -47,8 +48,7 @@ m_embeddedLC(), m_lc(NULL), m_seqNo(0U), m_n(0U), -m_lastFrame(NULL), -m_networkWatchdog(1000U, 1U), +m_networkWatchdog(1000U, 0U, 1500U), m_timeoutTimer(1000U, timeout), m_packetTimer(1000U, 0U, 200U), m_elapsed(), @@ -59,12 +59,10 @@ m_bits(0U), m_errs(0U), m_fp(NULL) { - m_lastFrame = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; } CDMRSlot::~CDMRSlot() { - delete[] m_lastFrame; } void CDMRSlot::writeModem(unsigned char *data) @@ -77,6 +75,7 @@ void CDMRSlot::writeModem(unsigned char *data) if (data[0U] == TAG_LOST && m_state == RS_RELAYING_RF_DATA) { LogMessage("DMR Slot %u, transmission lost", m_slotNo); + writeTerminator(true); writeEndOfTransmission(); return; } @@ -175,14 +174,13 @@ void CDMRSlot::writeModem(unsigned char *data) data[1U] = 0x00U; writeNetwork(data, DT_TERMINATOR_WITH_LC); - writeQueue(data); + + // 480ms of terminator to space things out + for (unsigned int i = 0U; i < 8U; i++) + writeQueue(data); LogMessage("DMR Slot %u, received RF end of voice transmission, BER: %u%%", m_slotNo, (m_errs * 100U) / m_bits); - // 480ms of idle to space things out - for (unsigned int i = 0U; i < 8U; i++) - writeQueue(m_idle); - writeEndOfTransmission(); } else if (dataType == DT_DATA_HEADER) { if (m_state == RS_RELAYING_RF_DATA) @@ -475,7 +473,10 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) data[0U] = TAG_EOT; data[1U] = 0x00U; - writeQueue(data); + // 480ms of terminator to space things out + for (unsigned int i = 0U; i < 8U; i++) + writeQueue(data); + writeEndOfTransmission(); #if defined(DUMP_DMR) @@ -551,7 +552,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) // Save details in case we need to infill data m_seqNo = dmrData.getSeqNo(); m_n = dmrData.getN(); - ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U); #if defined(DUMP_DMR) writeFile(data); @@ -592,7 +592,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) // Save details in case we need to infill data m_seqNo = dmrData.getSeqNo(); m_n = dmrData.getN(); - ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U); #if defined(DUMP_DMR) writeFile(data); @@ -627,12 +626,15 @@ void CDMRSlot::clock(unsigned int ms) m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { - // We've received the voice header haven't we? - m_frames += 1U; - if (m_state == RS_RELAYING_NETWORK_AUDIO) + if (m_state == RS_RELAYING_NETWORK_AUDIO) { + // We've received the voice header haven't we? + m_frames += 1U; LogMessage("DMR Slot %u, network watchdog has expired, %u%% packet loss, BER: %u%%", m_slotNo, (m_lost * 100U) / m_frames, (m_errs * 100U) / m_bits); - else + writeTerminator(false); + } else { LogMessage("DMR Slot %u, network watchdog has expired", m_slotNo); + } + writeEndOfTransmission(); #if defined(DUMP_DMR) closeFile(); @@ -669,6 +671,41 @@ void CDMRSlot::writeQueue(const unsigned char *data) m_queue.addData(data, len); } +// XXX Once the PF flag is fixed in the LC, always use this for the terminator +void CDMRSlot::writeTerminator(bool toNetwork) +{ + unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U]; + + // Generate the LC + CFullLC fullLC; + fullLC.encode(*m_lc, data + 2U, DT_TERMINATOR_WITH_LC); + + // Generate the Slot Type + CSlotType slotType; + slotType.setColorCode(m_colorCode); + slotType.setDataType(DT_TERMINATOR_WITH_LC); + slotType.getData(data + 2U); + + // Set the Data Sync to be from the BS + CDMRSync sync; + sync.addSync(data + 2U, DST_BS_DATA); + + data[0U] = TAG_EOT; + data[1U] = 0x00U; + + // 480ms of terminator to space things out + for (unsigned int i = 0U; i < 8U; i++) + writeQueue(data); + + if (toNetwork) + writeNetwork(data, DT_TERMINATOR_WITH_LC); + +#if defined(DUMP_DMR) + writeFile(data); + closeFile(); +#endif +} + void CDMRSlot::writeNetwork(const unsigned char* data, unsigned char dataType) { assert(m_lc != NULL); @@ -706,18 +743,25 @@ void CDMRSlot::init(unsigned int colorCode, CModem* modem, CHomebrewDMRIPSC* net m_network = network; m_display = display; - m_idle = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; + m_silence = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; + m_idle = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; - ::memcpy(m_idle + 2U, IDLE_DATA, DMR_FRAME_LENGTH_BYTES); + ::memset(m_silence, 0x00U, DMR_FRAME_LENGTH_BYTES + 2U); + m_silence[0U] = TAG_DATA; - // Generate the Slot Type + // ::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 CSlotType slotType; slotType.setColorCode(colorCode); slotType.setDataType(DT_IDLE); slotType.getData(m_idle + 2U); - m_idle[0U] = TAG_DATA; - m_idle[1U] = 0x00U; + // Generate the EMB for the silence frame + CEMB emb; + emb.setColorCode(colorCode); + emb.getData(m_silence + 2U); } void CDMRSlot::setShortLC(unsigned int slotNo, unsigned int id, FLCO flco) @@ -835,36 +879,19 @@ void CDMRSlot::insertSilence(unsigned char newSeqNo) if (newSeqNo == seqNo) return; - unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U]; - ::memcpy(data, m_lastFrame, DMR_FRAME_LENGTH_BYTES + 2U); - - data[0U] = TAG_DATA; - data[1U] = 0x00U; - unsigned char n = (m_n + 1U) % 6U; unsigned int count = 0U; while (seqNo < newSeqNo) { + unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U]; + ::memcpy(data, m_silence, DMR_FRAME_LENGTH_BYTES + 2U); + if (n == 0U) { - // Add the voice sync + // Replace the EMB and Null Short LC with a voice sync CDMRSync sync; sync.addSync(data + 2U, DST_BS_AUDIO); - } else { - // Set the embedded signalling to be nulls - ::memset(data + 16U, 0x00U, 5U); - - // Change the color code in the EMB - // XXX Note that the PI flag is lost here - CEMB emb; - emb.setPI(false); - emb.setLCSS(0U); - emb.setColorCode(m_colorCode); - emb.getData(data + 2U); } - data[0U] = TAG_DATA; - data[1U] = 0x00U; - writeQueue(data); m_seqNo = seqNo; diff --git a/DMRSlot.h b/DMRSlot.h index 3ec5586..825a4c5 100644 --- a/DMRSlot.h +++ b/DMRSlot.h @@ -55,7 +55,6 @@ private: CLC* m_lc; unsigned char m_seqNo; unsigned char m_n; - unsigned char* m_lastFrame; CTimer m_networkWatchdog; CTimer m_timeoutTimer; CTimer m_packetTimer; @@ -73,6 +72,7 @@ private: static IDisplay* m_display; static unsigned char* m_idle; + static unsigned char* m_silence; static FLCO m_flco1; static unsigned char m_id1; @@ -82,6 +82,7 @@ private: void writeQueue(const unsigned char* data); void writeNetwork(const unsigned char* data, unsigned char dataType); + void writeTerminator(bool toNetwork); void writeEndOfTransmission(); bool openFile(); diff --git a/Golay24128.cpp b/Golay24128.cpp index 4bca5de..60f99c8 100644 --- a/Golay24128.cpp +++ b/Golay24128.cpp @@ -5,7 +5,7 @@ #include "Golay24128.h" -static const unsigned int ENCODING_TABLE_23127[] = { +const unsigned int ENCODING_TABLE_23127[] = { 0x000000U, 0x0018EAU, 0x00293EU, 0x0031D4U, 0x004A96U, 0x00527CU, 0x0063A8U, 0x007B42U, 0x008DC6U, 0x00952CU, 0x00A4F8U, 0x00BC12U, 0x00C750U, 0x00DFBAU, 0x00EE6EU, 0x00F684U, 0x010366U, 0x011B8CU, 0x012A58U, 0x0132B2U, 0x0149F0U, 0x01511AU, 0x0160CEU, 0x017824U, 0x018EA0U, 0x01964AU, 0x01A79EU, 0x01BF74U, 0x01C436U, 0x01DCDCU,