diff --git a/M17Control.cpp b/M17Control.cpp index 79def48..5d7f7e6 100644 --- a/M17Control.cpp +++ b/M17Control.cpp @@ -362,7 +362,6 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len) // Remove any erronous EOF from the FN netData[M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + 0U] &= 0x7FU; - // The CRC is added in the networking code m_network->write(netData); diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index fbe0218..ef8f9d2 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -297,8 +297,8 @@ int CMMDVMHost::run() LogInfo(HEADER3); LogInfo(HEADER4); - LogMessage("MMDVMHost-%s is starting", VERSION); - LogMessage("Built %s %s (GitID #%.7s)", __TIME__, __DATE__, gitversion); + LogInfo("MMDVMHost-%s is starting", VERSION); + LogInfo("Built %s %s (GitID #%.7s)", __TIME__, __DATE__, gitversion); readParams(); @@ -353,6 +353,8 @@ int CMMDVMHost::run() m_display = CDisplay::createDisplay(m_conf, m_modem); + LogInfo("Opening network connections"); + if (m_dstarEnabled && m_conf.getDStarNetworkEnabled()) { ret = createDStarNetwork(); if (!ret) @@ -488,6 +490,8 @@ int CMMDVMHost::run() m_dmrLookup->read(); } + LogInfo("Starting protocol handlers"); + CStopWatch stopWatch; stopWatch.start(); @@ -765,7 +769,7 @@ int CMMDVMHost::run() setMode(MODE_IDLE); - LogMessage("MMDVMHost-%s is running", VERSION); + LogInfo("MMDVMHost-%s is running", VERSION); while (!m_killed) { bool lockout = m_modem->hasLockout(); @@ -1307,18 +1311,14 @@ int CMMDVMHost::run() setMode(MODE_QUIT); - m_modem->close(); - delete m_modem; - - m_display->close(); - delete m_display; - if (m_dmrLookup != NULL) m_dmrLookup->stop(); if (m_nxdnLookup != NULL) m_nxdnLookup->stop(); + LogInfo("Closing network connections"); + if (m_dstarNetwork != NULL) { m_dstarNetwork->close(); delete m_dstarNetwork; @@ -1374,6 +1374,8 @@ int CMMDVMHost::run() delete m_remoteControl; } + LogInfo("Stopping protocol handlers"); + delete m_dstar; delete m_dmr; delete m_ysf; @@ -1384,6 +1386,14 @@ int CMMDVMHost::run() delete m_fm; delete m_ax25; + LogInfo("MMDVMHost-%s has stopped", VERSION); + + m_modem->close(); + delete m_modem; + + m_display->close(); + delete m_display; + return 0; }