Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change DMR ALOHA header to 0x17

This commit is contained in:
adrian 2026-04-19 11:32:07 +03:00
parent 30ba4c4c55
commit 549dfd7258
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DMRTX.cpp
View File

@ -378,10 +378,12 @@ void CDMRTX::createCACH(uint8_t txSlotIndex, uint8_t rxSlotIndex)
m_cachPtr = 0U; m_cachPtr = 0U;
if (m_cachPtr == 0U) { if (m_cachPtr == 0U) {
if ((m_fifo[0U].getData() == 0U && m_fifo[1U].getData() == 0U) && !m_trunking) if (m_fifo[0U].getData() == 0U && m_fifo[1U].getData() == 0U) {
::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U); if(!m_trunking)
else ::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U);
::memcpy(m_shortLC, m_newShortLC, 12U); else
::memcpy(m_shortLC, m_newShortLC, 12U);
}
} }
::memcpy(m_poBuffer, m_shortLC + m_cachPtr, 3U); ::memcpy(m_poBuffer, m_shortLC + m_cachPtr, 3U);

2
SerialPort.cpp
View File

@ -45,12 +45,12 @@ const uint8_t MMDVM_DSTAR_DATA = 0x11U;
const uint8_t MMDVM_DSTAR_LOST = 0x12U; const uint8_t MMDVM_DSTAR_LOST = 0x12U;
const uint8_t MMDVM_DSTAR_EOT = 0x13U; 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_DATA1 = 0x18U;
const uint8_t MMDVM_DMR_LOST1 = 0x19U; const uint8_t MMDVM_DMR_LOST1 = 0x19U;
const uint8_t MMDVM_DMR_DATA2 = 0x1AU; const uint8_t MMDVM_DMR_DATA2 = 0x1AU;
const uint8_t MMDVM_DMR_LOST2 = 0x1BU; const uint8_t MMDVM_DMR_LOST2 = 0x1BU;
const uint8_t MMDVM_DMR_SHORTLC = 0x1CU; 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_START = 0x1DU;
const uint8_t MMDVM_DMR_ABORT = 0x1EU; const uint8_t MMDVM_DMR_ABORT = 0x1EU;