From e1b1d13e74d4a3e1a118143c8ceac82cb25edf46 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 15 Mar 2016 21:51:00 +0000 Subject: [PATCH] Handle the Appended Blocks count in some DMR Data Headers. --- DMRDataHeader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp index 99ac789..bc436c8 100644 --- a/DMRDataHeader.cpp +++ b/DMRDataHeader.cpp @@ -102,12 +102,14 @@ bool CDMRDataHeader::put(const unsigned char* bytes) case DPF_DEFINED_RAW: CUtils::dump(1U, "Raw or Status/Precoded Short Data Header", m_data, 12U); + m_blocks = m_data[0U] & 0x3FU; m_F = (m_data[8U] & 0x01U) == 0x01U; m_S = (m_data[8U] & 0x02U) == 0x02U; break; case DPF_DEFINED_SHORT: CUtils::dump(1U, "Defined Short Data Header", m_data, 12U); + m_blocks = m_data[0U] & 0x3FU; m_F = (m_data[8U] & 0x01U) == 0x01U; m_S = (m_data[8U] & 0x02U) == 0x02U; break;