From 522825568be6493cc33052d761c00182f63d1f06 Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Tue, 4 Apr 2017 23:09:22 -0300
Subject: [PATCH 1/2] Sending idle data in second slot, DMR DMO

---
 DMRDMOTX.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp
index b0175c8..dec2577 100644
--- a/DMRDMOTX.cpp
+++ b/DMRDMOTX.cpp
@@ -41,6 +41,11 @@ const q15_t DMR_LEVELB =  963;
 const q15_t DMR_LEVELC = -963;
 const q15_t DMR_LEVELD = -2889;
 
+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};
+
 const uint8_t CACH_INTERLEAVE[] =
       {1U,   2U,  3U,  5U,  6U,  7U,  9U, 10U, 11U, 13U, 15U, 16U, 17U, 19U, 20U, 21U, 23U,
        25U, 26U, 27U, 29U, 30U, 31U, 33U, 34U, 35U, 37U, 39U, 40U, 41U, 43U, 44U, 45U, 47U,
@@ -87,8 +92,10 @@ void CDMRDMOTX::process()
       createCACH(m_poBuffer + 0U,  0U);
       createCACH(m_poBuffer + 36U, 1U);
 
-      for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
-        m_poBuffer[i + 3U] = m_poBuffer[i + 39U] = m_fifo.get();
+      for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) {
+        m_poBuffer[i + 3U] = m_fifo.get();
+        m_poBuffer[i + 39U] = IDLE_DATA[i];
+      }
 
       m_poLen = 72U;
     }

From beb2e8f68f4bef7502dd88f21390a92ffed64251 Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Wed, 5 Apr 2017 08:33:34 -0300
Subject: [PATCH 2/2] Adding Color Code and Data Type setting to IDLE data

---
 DMRDMOTX.cpp   | 10 +++++++++-
 DMRDMOTX.h     |  3 +++
 SerialPort.cpp |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp
index dec2577..eca1a4b 100644
--- a/DMRDMOTX.cpp
+++ b/DMRDMOTX.cpp
@@ -94,7 +94,7 @@ void CDMRDMOTX::process()
 
       for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) {
         m_poBuffer[i + 3U] = m_fifo.get();
-        m_poBuffer[i + 39U] = IDLE_DATA[i];
+        m_poBuffer[i + 39U] = m_idle[i];
       }
 
       m_poLen = 72U;
@@ -210,3 +210,11 @@ void CDMRDMOTX::createCACH(uint8_t* buffer, uint8_t slotIndex)
 
   m_cachPtr += 3U;
 }
+
+void CDMRDMOTX::setColorCode(uint8_t colorCode)
+{
+  ::memcpy(m_idle, IDLE_DATA, DMR_FRAME_LENGTH_BYTES);
+
+  CDMRSlotType slotType;
+  slotType.encode(colorCode, DT_IDLE, m_idle);
+}
diff --git a/DMRDMOTX.h b/DMRDMOTX.h
index 98ffdb0..7401fc6 100644
--- a/DMRDMOTX.h
+++ b/DMRDMOTX.h
@@ -36,6 +36,8 @@ public:
   void setTXDelay(uint8_t delay);
 
   uint8_t getSpace() const;
+  
+  void setColorCode(uint8_t colorCode);
 
 private:
 
@@ -47,6 +49,7 @@ private:
   uint16_t                         m_poPtr;
   uint32_t                         m_txDelay;
   uint8_t                          m_cachPtr;
+  uint8_t                          m_idle[DMR_FRAME_LENGTH_BYTES];
 
   void createCACH(uint8_t* buffer, uint8_t slotIndex);
   void writeByte(uint8_t c);
diff --git a/SerialPort.cpp b/SerialPort.cpp
index fd2678f..a22e129 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -271,6 +271,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
   dmrDMOTX.setTXDelay(txDelay);
 
   dmrTX.setColorCode(colorCode);
+  dmrDMOTX.setColorCode(colorCode);
   dmrRX.setColorCode(colorCode);
   dmrRX.setDelay(dmrDelay);
   dmrDMORX.setColorCode(colorCode);