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

Small mode changes.

This commit is contained in:
Jonathan Naylor 2016-02-03 11:38:53 +00:00
parent caa29894cd
commit 9259421147
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MMDVMHost.cpp
View File

@ -309,9 +309,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) {
m_mode = MODE_DMR;
m_modem->writeDMRStart(true); m_modem->writeDMRStart(true);
dmrBeaconTimer.start(); dmrBeaconTimer.start();
} }
@ -336,7 +334,6 @@ int CMMDVMHost::run()
if (dmrBeaconTimer.isRunning() && dmrBeaconTimer.hasExpired()) { if (dmrBeaconTimer.isRunning() && dmrBeaconTimer.hasExpired()) {
dmrBeaconTimer.stop(); dmrBeaconTimer.stop();
m_modem->writeDMRStart(false); m_modem->writeDMRStart(false);
m_mode = MODE_IDLE;
} }
if (ms < 5U) { if (ms < 5U) {
@ -570,8 +567,9 @@ void CMMDVMHost::setMode(unsigned char mode)
m_dmrNetwork->enable(true); m_dmrNetwork->enable(true);
if (m_mode == MODE_DMR) if (m_mode == MODE_DMR)
m_modem->writeDMRStart(false); m_modem->writeDMRStart(false);
else
m_modem->setMode(MODE_IDLE);
m_display->setIdle(); m_display->setIdle();
m_modem->setMode(MODE_IDLE);
m_mode = MODE_IDLE; m_mode = MODE_IDLE;
m_modeTimer.stop(); m_modeTimer.stop();
break; break;