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

Reduce CSBK and Data Header logging to Debug level.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-03-11 06:49:27 +00:00
parent d633dfa020
commit 0d1f41c9c4
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMRCSBK.cpp
View File

@@ -65,31 +65,31 @@ bool CDMRCSBK::put(const unsigned char* bytes)
case CSBKO_BSDWNACT: case CSBKO_BSDWNACT:
m_bsId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_bsId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
CUtils::dump("Download Activate CSBK", m_data, 12U); CUtils::dump(1U, "Download Activate CSBK", m_data, 12U);
break; break;
case CSBKO_UUVREQ: case CSBKO_UUVREQ:
m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
CUtils::dump("Unit to Unit Service Request CSBK", m_data, 12U); CUtils::dump(1U, "Unit to Unit Service Request CSBK", m_data, 12U);
break; break;
case CSBKO_UUANSRSP: case CSBKO_UUANSRSP:
m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
CUtils::dump("Unit to Unit Service Answer Response CSBK", m_data, 12U); CUtils::dump(1U, "Unit to Unit Service Answer Response CSBK", m_data, 12U);
break; break;
case CSBKO_PRECCSBK: case CSBKO_PRECCSBK:
m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
CUtils::dump("Preamble CSBK", m_data, 12U); CUtils::dump(1U, "Preamble CSBK", m_data, 12U);
break; break;
case CSBKO_NACKRSP: case CSBKO_NACKRSP:
m_srcId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U]; m_srcId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
m_dstId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U]; m_dstId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
CUtils::dump("Negative Acknowledge Response CSBK", m_data, 12U); CUtils::dump(1U, "Negative Acknowledge Response CSBK", m_data, 12U);
break; break;
default: default:

14
DMRDataHeader.cpp
View File

@@ -78,13 +78,13 @@ bool CDMRDataHeader::put(const unsigned char* bytes)
switch (dpf) { switch (dpf) {
case DPF_UNCONFIRMED_DATA: case DPF_UNCONFIRMED_DATA:
CUtils::dump("Unconfirmed Data Header", m_data, 12U); CUtils::dump(1U, "Unconfirmed Data Header", m_data, 12U);
m_F = (m_data[8U] & 0x80U) == 0x80U; m_F = (m_data[8U] & 0x80U) == 0x80U;
m_blocks = m_data[8U] & 0x7FU; m_blocks = m_data[8U] & 0x7FU;
break; break;
case DPF_CONFIRMED_DATA: case DPF_CONFIRMED_DATA:
CUtils::dump("Confirmed Data Header", m_data, 12U); CUtils::dump(1U, "Confirmed Data Header", m_data, 12U);
m_F = (m_data[8U] & 0x80U) == 0x80U; m_F = (m_data[8U] & 0x80U) == 0x80U;
m_blocks = m_data[8U] & 0x7FU; m_blocks = m_data[8U] & 0x7FU;
m_S = (m_data[9U] & 0x80U) == 0x80U; m_S = (m_data[9U] & 0x80U) == 0x80U;
@@ -92,28 +92,28 @@ bool CDMRDataHeader::put(const unsigned char* bytes)
break; break;
case DPF_RESPONSE: case DPF_RESPONSE:
CUtils::dump("Response Data Header", m_data, 12U); CUtils::dump(1U, "Response Data Header", m_data, 12U);
m_blocks = m_data[8U] & 0x7FU; m_blocks = m_data[8U] & 0x7FU;
break; break;
case DPF_PROPRIETARY: case DPF_PROPRIETARY:
CUtils::dump("Proprietary Data Header", m_data, 12U); CUtils::dump(1U, "Proprietary Data Header", m_data, 12U);
break; break;
case DPF_DEFINED_RAW: case DPF_DEFINED_RAW:
CUtils::dump("Raw or Status/Precoded Short Data Header", m_data, 12U); CUtils::dump(1U, "Raw or Status/Precoded Short Data Header", m_data, 12U);
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("Defined Short Data Header", m_data, 12U); CUtils::dump(1U, "Defined Short Data Header", m_data, 12U);
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_UDT: case DPF_UDT:
CUtils::dump("Unified Data Transport Header", m_data, 12U); CUtils::dump(1U, "Unified Data Transport Header", m_data, 12U);
break; break;
default: default: