From 30b821e34a2cb6687097d5c578985f1eee6226dc Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 25 Apr 2016 09:27:03 +0100 Subject: [PATCH] Correct the block count in two of the data header formats. --- DMRDataHeader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp index ed8dbc1..ef0922d 100644 --- a/DMRDataHeader.cpp +++ b/DMRDataHeader.cpp @@ -102,14 +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_blocks = (m_data[0U] & 0x30U) + (m_data[1U] & 0x0FU); 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_blocks = (m_data[0U] & 0x30U) + (m_data[1U] & 0x0FU); m_F = (m_data[8U] & 0x01U) == 0x01U; m_S = (m_data[8U] & 0x02U) == 0x02U; break;