use enum DMR_OVCM_TYPES

This commit is contained in:
Shawn Chain
2019-11-17 10:57:58 +08:00
parent d5b08ea7ea
commit 88d91e420a
9 changed files with 47 additions and 24 deletions

View File

@@ -445,7 +445,7 @@ int CMMDVMHost::run()
unsigned int jitter = m_conf.getDMRNetworkJitter();
m_dmrRFModeHang = m_conf.getDMRModeHang();
dmrBeacons = m_conf.getDMRBeacons();
int ovcm = m_conf.getDMROVCM();
DMR_OVCM_TYPES ovcm = m_conf.getDMROVCM();
if (txHang > m_dmrRFModeHang)
txHang = m_dmrRFModeHang;
@@ -478,13 +478,16 @@ int CMMDVMHost::run()
LogInfo(" Call Hang: %us", callHang);
LogInfo(" TX Hang: %us", txHang);
LogInfo(" Mode Hang: %us", m_dmrRFModeHang);
if (ovcm == 0)
if (ovcm == DMR_OVCM_OFF)
LogInfo(" OVCM: off");
else if (ovcm == 1)
LogInfo(" OVCM: on(rx)");
else
else if (ovcm == DMR_OVCM_RX_ON)
LogInfo(" OVCM: on(rx only)");
else if (ovcm == DMR_OVCM_TX_ON)
LogInfo(" OVCM: on(tx only)");
else if (ovcm == DMR_OVCM_ON)
LogInfo(" OVCM: on");
switch (dmrBeacons) {
case DMR_BEACONS_NETWORK: {
unsigned int dmrBeaconDuration = m_conf.getDMRBeaconDuration();