diff --git a/src/host/Host.DMR.cpp b/src/host/Host.DMR.cpp index 2d937e41..c60e40e0 100644 --- a/src/host/Host.DMR.cpp +++ b/src/host/Host.DMR.cpp @@ -234,7 +234,7 @@ void* Host::threadDMRWriter1(void* arg) if (host->m_dmrDedicatedTxTestTimer.hasExpired() && !host->m_dmrDedicatedTxTestTimer.isPaused()) { host->m_dmrDedicatedTxTestTimer.pause(); if (!host->m_modem->hasTX() && host->m_modem->gotModemStatus() && host->m_state == STATE_DMR && (host->m_dmr->getTSCCSlotNo() == 1U) && host->m_dmr->getCCRunning()) { - LogError(LOG_HOST, "DMR dedicated m_dmr not transmitting, running = %u, halted = %u, frameLength1 = %u", host->m_dmr->getCCRunning(), host->m_dmr->getCCHalted(), nextLen); + LogError(LOG_HOST, "DMR dedicated CC not transmitting, running = %u, halted = %u, frameLength1 = %u", host->m_dmr->getCCRunning(), host->m_dmr->getCCHalted(), nextLen); } } } @@ -486,7 +486,7 @@ void* Host::threadDMRWriter2(void* arg) if (host->m_dmrDedicatedTxTestTimer.hasExpired() && !host->m_dmrDedicatedTxTestTimer.isPaused()) { host->m_dmrDedicatedTxTestTimer.pause(); if (!host->m_modem->hasTX() && host->m_modem->gotModemStatus() && host->m_state == STATE_DMR && (host->m_dmr->getTSCCSlotNo() == 2U) && host->m_dmr->getCCRunning()) { - LogError(LOG_HOST, "DMR dedicated m_dmr not transmitting, running = %u, halted = %u, frameLength2 = %u", host->m_dmr->getCCRunning(), host->m_dmr->getCCHalted(), nextLen); + LogError(LOG_HOST, "DMR dedicated CC not transmitting, running = %u, halted = %u, frameLength2 = %u", host->m_dmr->getCCRunning(), host->m_dmr->getCCHalted(), nextLen); } } } diff --git a/src/host/Host.NXDN.cpp b/src/host/Host.NXDN.cpp index 81d73735..f4b54bd4 100644 --- a/src/host/Host.NXDN.cpp +++ b/src/host/Host.NXDN.cpp @@ -180,7 +180,7 @@ void* Host::threadNXDNWriter(void* arg) if (host->m_nxdnDedicatedTxTestTimer.hasExpired() && !host->m_nxdnDedicatedTxTestTimer.isPaused()) { host->m_nxdnDedicatedTxTestTimer.pause(); if (!host->m_modem->hasTX() && host->m_modem->gotModemStatus() && host->m_state == STATE_NXDN && host->m_nxdn->getCCRunning()) { - LogError(LOG_HOST, "NXDN dedicated m_nxdn stopped transmitting, running = %u, halted = %u, frameLength = %u", host->m_nxdn->getCCRunning(), host->m_nxdn->getCCHalted(), nextLen); + LogError(LOG_HOST, "NXDN dedicated CC stopped transmitting, running = %u, halted = %u, frameLength = %u", host->m_nxdn->getCCRunning(), host->m_nxdn->getCCHalted(), nextLen); } } } diff --git a/src/host/Host.P25.cpp b/src/host/Host.P25.cpp index 186e53f0..b235d484 100644 --- a/src/host/Host.P25.cpp +++ b/src/host/Host.P25.cpp @@ -219,7 +219,7 @@ void* Host::threadP25Writer(void* arg) if (host->m_p25DedicatedTxTestTimer.hasExpired() && !host->m_p25DedicatedTxTestTimer.isPaused()) { host->m_p25DedicatedTxTestTimer.pause(); if (!host->m_modem->hasTX() && host->m_modem->gotModemStatus() && host->m_state == STATE_P25 && host->m_p25->getCCRunning()) { - LogError(LOG_HOST, "P25 dedicated m_p25 not transmitting, running = %u, halted = %u, frameLength = %u", host->m_p25->getCCRunning(), host->m_p25->getCCHalted(), nextLen); + LogError(LOG_HOST, "P25 dedicated CC not transmitting, running = %u, halted = %u, frameLength = %u", host->m_p25->getCCRunning(), host->m_p25->getCCHalted(), nextLen); } } } diff --git a/src/host/p25/Control.cpp b/src/host/p25/Control.cpp index 3976bcfb..0623f27e 100644 --- a/src/host/p25/Control.cpp +++ b/src/host/p25/Control.cpp @@ -1188,7 +1188,6 @@ void Control::addFrame(const uint8_t* data, uint32_t length, bool net, bool imm) } } - uint8_t lenBuffer[2U]; if (length > 255U) lenBuffer[0U] = (length >> 8U) & 0xFFU;