ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce the amount of logging a little.

This commit is contained in:
Jonathan Naylor 2016-05-10 18:26:52 +01:00
parent 864b528abb
commit 62aa7a8103
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MMDVMHost.cpp
View File

@ -499,7 +499,7 @@ int CMMDVMHost::run()
if (m_dmrNetwork != NULL) { if (m_dmrNetwork != NULL) {
bool run = m_dmrNetwork->wantsBeacon(); bool run = m_dmrNetwork->wantsBeacon();
if (dmrBeaconsEnabled && run && m_mode == MODE_IDLE) { if (dmrBeaconsEnabled && run && m_mode == MODE_IDLE) {
setMode(MODE_DMR, false); setMode(MODE_DMR);
dmrBeaconTimer.start(); dmrBeaconTimer.start();
} }
} }
@ -532,7 +532,7 @@ int CMMDVMHost::run()
dmrBeaconTimer.clock(ms); dmrBeaconTimer.clock(ms);
if (dmrBeaconTimer.isRunning() && dmrBeaconTimer.hasExpired()) { if (dmrBeaconTimer.isRunning() && dmrBeaconTimer.hasExpired()) {
setMode(MODE_IDLE, false); setMode(MODE_IDLE);
dmrBeaconTimer.stop(); dmrBeaconTimer.stop();
} }
@ -786,15 +786,13 @@ void CMMDVMHost::createDisplay()
} }
} }
void CMMDVMHost::setMode(unsigned char mode, bool logging) void CMMDVMHost::setMode(unsigned char mode)
{ {
assert(m_modem != NULL); assert(m_modem != NULL);
assert(m_display != NULL); assert(m_display != NULL);
switch (mode) { switch (mode) {
case MODE_DSTAR: case MODE_DSTAR:
if (logging)
LogMessage("Mode set to D-Star");
if (m_dmrNetwork != NULL) if (m_dmrNetwork != NULL)
m_dmrNetwork->enable(false); m_dmrNetwork->enable(false);
m_modem->setMode(MODE_DSTAR); m_modem->setMode(MODE_DSTAR);
@ -804,8 +802,6 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
break; break;
case MODE_DMR: case MODE_DMR:
if (logging)
LogMessage("Mode set to DMR");
if (m_dstarNetwork != NULL) if (m_dstarNetwork != NULL)
m_dstarNetwork->enable(false); m_dstarNetwork->enable(false);
m_modem->setMode(MODE_DMR); m_modem->setMode(MODE_DMR);
@ -819,8 +815,6 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
break; break;
case MODE_YSF: case MODE_YSF:
if (logging)
LogMessage("Mode set to System Fusion");
if (m_dstarNetwork != NULL) if (m_dstarNetwork != NULL)
m_dstarNetwork->enable(false); m_dstarNetwork->enable(false);
if (m_dmrNetwork != NULL) if (m_dmrNetwork != NULL)
@ -832,7 +826,6 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
break; break;
case MODE_LOCKOUT: case MODE_LOCKOUT:
if (logging)
LogMessage("Mode set to Lockout"); LogMessage("Mode set to Lockout");
if (m_dstarNetwork != NULL) if (m_dstarNetwork != NULL)
m_dstarNetwork->enable(false); m_dstarNetwork->enable(false);
@ -850,7 +843,6 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
break; break;
case MODE_ERROR: case MODE_ERROR:
if (logging)
LogMessage("Mode set to Error"); LogMessage("Mode set to Error");
if (m_dstarNetwork != NULL) if (m_dstarNetwork != NULL)
m_dstarNetwork->enable(false); m_dstarNetwork->enable(false);
@ -867,8 +859,6 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
break; break;
default: default:
if (logging)
LogMessage("Mode set to Idle");
if (m_dstarNetwork != NULL) if (m_dstarNetwork != NULL)
m_dstarNetwork->enable(true); m_dstarNetwork->enable(true);
if (m_dmrNetwork != NULL) if (m_dmrNetwork != NULL)

2
MMDVMHost.h
View File

@ -58,7 +58,7 @@ private:
bool createDMRNetwork(); bool createDMRNetwork();
void createDisplay(); void createDisplay();
void setMode(unsigned char mode, bool logging = true); void setMode(unsigned char mode);
}; };
#endif #endif