MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct the block count in two of the data header formats.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-04-25 09:27:03 +01:00
parent 962629bc38
commit 30b821e34a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMRDataHeader.cpp
View File

@@ -102,14 +102,14 @@ bool CDMRDataHeader::put(const unsigned char* bytes)
case DPF_DEFINED_RAW: case DPF_DEFINED_RAW:
CUtils::dump(1U, "Raw or Status/Precoded Short Data Header", m_data, 12U); 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_F = (m_data[8U] & 0x01U) == 0x01U;
m_S = (m_data[8U] & 0x02U) == 0x02U; m_S = (m_data[8U] & 0x02U) == 0x02U;
break; break;
case DPF_DEFINED_SHORT: case DPF_DEFINED_SHORT:
CUtils::dump(1U, "Defined Short Data Header", m_data, 12U); 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_F = (m_data[8U] & 0x01U) == 0x01U;
m_S = (m_data[8U] & 0x02U) == 0x02U; m_S = (m_data[8U] & 0x02U) == 0x02U;
break; break;