From 2e43624ea29934ceccb56377b0766338feee4cf7 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 2 Feb 2016 08:00:04 +0000 Subject: [PATCH] Received data doesn't change the mode. --- Log.cpp | 4 ++-- MMDVMHost.cpp | 22 ++++------------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Log.cpp b/Log.cpp index c0fe87c..0a74fc1 100644 --- a/Log.cpp +++ b/Log.cpp @@ -115,9 +115,9 @@ void Log(unsigned int level, const char* fmt, ...) struct tm* tm = ::gmtime(&now.tv_sec); - ::fprintf(m_fpLog, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03u ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U); + ::fprintf(m_fpLog, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U); if (m_display) - ::fprintf(stdout, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03u ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U); + ::fprintf(stdout, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U); #endif va_list vl; diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index c88b48a..cf2a1b5 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -179,14 +179,8 @@ int CMMDVMHost::run() len = m_modem->readDStarData(data); if (dstar != NULL && len > 0U) { - if (mode == MODE_IDLE) { - LogMessage("Mode set to D-Star"); - mode = MODE_DSTAR; - m_display->setDStar(); - m_modem->setMode(MODE_DSTAR); - if (m_dmrNetwork != NULL) - m_dmrNetwork->enable(false); - } + if (mode == MODE_IDLE) + dstar->writeModem(data); if (mode == MODE_DSTAR) { dstar->writeModem(data); @@ -238,16 +232,8 @@ int CMMDVMHost::run() len = m_modem->readYSFData(data); if (ysf != NULL && len > 0U) { - if (mode == MODE_IDLE) { - LogMessage("Mode set to System Fusion"); - mode = MODE_YSF; - m_display->setFusion(); - m_modem->setMode(MODE_YSF); - if (m_dmrNetwork != NULL) - m_dmrNetwork->enable(false); - if (m_dstarNetwork != NULL) - m_dstarNetwork->enable(false); - } + if (mode == MODE_IDLE) + ysf->writeData(data, len); if (mode == MODE_YSF) { ysf->writeData(data, len);