From 549dfd725844931a2259ab2c63dbeb50ecf87353 Mon Sep 17 00:00:00 2001 From: adrian Date: Sun, 19 Apr 2026 11:32:07 +0300 Subject: [PATCH] Change DMR ALOHA header to 0x17 --- DMRTX.cpp | 10 ++++++---- SerialPort.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DMRTX.cpp b/DMRTX.cpp index e34ea60..ece7bb6 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -378,10 +378,12 @@ void CDMRTX::createCACH(uint8_t txSlotIndex, uint8_t rxSlotIndex) m_cachPtr = 0U; if (m_cachPtr == 0U) { - if ((m_fifo[0U].getData() == 0U && m_fifo[1U].getData() == 0U) && !m_trunking) - ::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U); - else - ::memcpy(m_shortLC, m_newShortLC, 12U); + if (m_fifo[0U].getData() == 0U && m_fifo[1U].getData() == 0U) { + if(!m_trunking) + ::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U); + else + ::memcpy(m_shortLC, m_newShortLC, 12U); + } } ::memcpy(m_poBuffer, m_shortLC + m_cachPtr, 3U); diff --git a/SerialPort.cpp b/SerialPort.cpp index 302acc1..7c6eb0c 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -45,12 +45,12 @@ const uint8_t MMDVM_DSTAR_DATA = 0x11U; const uint8_t MMDVM_DSTAR_LOST = 0x12U; const uint8_t MMDVM_DSTAR_EOT = 0x13U; +const uint8_t MMDVM_DMR_ALOHA = 0x17U; const uint8_t MMDVM_DMR_DATA1 = 0x18U; const uint8_t MMDVM_DMR_LOST1 = 0x19U; const uint8_t MMDVM_DMR_DATA2 = 0x1AU; const uint8_t MMDVM_DMR_LOST2 = 0x1BU; const uint8_t MMDVM_DMR_SHORTLC = 0x1CU; -const uint8_t MMDVM_DMR_ALOHA = 0x14U; const uint8_t MMDVM_DMR_START = 0x1DU; const uint8_t MMDVM_DMR_ABORT = 0x1EU;