From 0d1f41c9c4cccf9b1fbeb854fbc1c1d03f2979b3 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 11 Mar 2016 06:49:27 +0000 Subject: [PATCH] Reduce CSBK and Data Header logging to Debug level. --- DMRCSBK.cpp | 10 +++++----- DMRDataHeader.cpp | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DMRCSBK.cpp b/DMRCSBK.cpp index 09310d2..7b33e85 100644 --- a/DMRCSBK.cpp +++ b/DMRCSBK.cpp @@ -65,31 +65,31 @@ bool CDMRCSBK::put(const unsigned char* bytes) case CSBKO_BSDWNACT: 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]; - CUtils::dump("Download Activate CSBK", m_data, 12U); + CUtils::dump(1U, "Download Activate CSBK", m_data, 12U); break; case CSBKO_UUVREQ: 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]; - CUtils::dump("Unit to Unit Service Request CSBK", m_data, 12U); + CUtils::dump(1U, "Unit to Unit Service Request CSBK", m_data, 12U); break; case CSBKO_UUANSRSP: 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]; - 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; case CSBKO_PRECCSBK: 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]; - CUtils::dump("Preamble CSBK", m_data, 12U); + CUtils::dump(1U, "Preamble CSBK", m_data, 12U); break; case CSBKO_NACKRSP: 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]; - CUtils::dump("Negative Acknowledge Response CSBK", m_data, 12U); + CUtils::dump(1U, "Negative Acknowledge Response CSBK", m_data, 12U); break; default: diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp index 891e7c1..444a385 100644 --- a/DMRDataHeader.cpp +++ b/DMRDataHeader.cpp @@ -78,13 +78,13 @@ bool CDMRDataHeader::put(const unsigned char* bytes) switch (dpf) { 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_blocks = m_data[8U] & 0x7FU; break; 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_blocks = m_data[8U] & 0x7FU; m_S = (m_data[9U] & 0x80U) == 0x80U; @@ -92,28 +92,28 @@ bool CDMRDataHeader::put(const unsigned char* bytes) break; 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; break; case DPF_PROPRIETARY: - CUtils::dump("Proprietary Data Header", m_data, 12U); + CUtils::dump(1U, "Proprietary Data Header", m_data, 12U); break; 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_S = (m_data[8U] & 0x02U) == 0x02U; break; 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_S = (m_data[8U] & 0x02U) == 0x02U; break; case DPF_UDT: - CUtils::dump("Unified Data Transport Header", m_data, 12U); + CUtils::dump(1U, "Unified Data Transport Header", m_data, 12U); break; default: