MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 08:05:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the remote command handler more flexible and add an optional

Browse Source 
timeout to the new mode.
This commit is contained in:
Jonathan Naylor
2019-01-22 13:40:02 +00:00
parent 8ae8894d6f
commit b57d42327a
3 changed files with 145 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
MMDVMHost.cpp
View File

@@ -1788,30 +1788,62 @@ void CMMDVMHost::remoteControl()
if (m_mode != MODE_IDLE)
setMode(MODE_IDLE);
break;
case RCD_MODE_LOCKOUT:
if (m_mode != MODE_LOCKOUT)
setMode(MODE_LOCKOUT);
break;
case RCD_MODE_DSTAR:
if (m_dstar != NULL && m_mode != MODE_DSTAR)
if (m_dstar != NULL && m_mode != MODE_DSTAR) {
if (m_remoteControl->getArgCount() > 0U)
m_modeTimer.setTimeout(m_remoteControl->getArgUInt(0U));
else
m_modeTimer.setTimeout(m_dstarRFModeHang);
setMode(MODE_DSTAR);
}
break;
case RCD_MODE_DMR:
if (m_dmr != NULL && m_mode != MODE_DMR)
if (m_dmr != NULL && m_mode != MODE_DMR) {
if (m_remoteControl->getArgCount() > 0U)
m_modeTimer.setTimeout(m_remoteControl->getArgUInt(0U));
else
m_modeTimer.setTimeout(m_dmrRFModeHang);
setMode(MODE_DMR);
}
break;
case RCD_MODE_YSF:
if (m_ysf != NULL && m_mode != MODE_YSF)
if (m_ysf != NULL && m_mode != MODE_YSF) {
if (m_remoteControl->getArgCount() > 0U)
m_modeTimer.setTimeout(m_remoteControl->getArgUInt(0U));
else
m_modeTimer.setTimeout(m_ysfRFModeHang);
setMode(MODE_YSF);
}
break;
case RCD_MODE_P25:
if (m_p25 != NULL && m_mode != MODE_P25)
if (m_p25 != NULL && m_mode != MODE_P25) {
if (m_remoteControl->getArgCount() > 0U)
m_modeTimer.setTimeout(m_remoteControl->getArgUInt(0U));
else
m_modeTimer.setTimeout(m_p25RFModeHang);
setMode(MODE_P25);
}
break;
case RCD_MODE_NXDN:
if (m_nxdn != NULL && m_mode != MODE_NXDN)
if (m_nxdn != NULL && m_mode != MODE_NXDN) {
if (m_remoteControl->getArgCount() > 0U)
m_modeTimer.setTimeout(m_remoteControl->getArgUInt(0U));
else
m_modeTimer.setTimeout(m_nxdnRFModeHang);
setMode(MODE_NXDN);
}
break;
default:
break;
}