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

Change ovcm config to int value

Browse Source
This commit is contained in:
Shawn Chain
2019-11-16 23:06:26 +08:00
parent aa7ae2371c
commit 2f9595949a
8 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MMDVMHost.cpp
View File

@@ -445,8 +445,7 @@ int CMMDVMHost::run()
unsigned int jitter = m_conf.getDMRNetworkJitter();
m_dmrRFModeHang = m_conf.getDMRModeHang();
dmrBeacons = m_conf.getDMRBeacons();
bool ovcm = m_conf.getDMROVCM();
bool ovcmRX = m_conf.getDMROVCMRX();
int ovcm = m_conf.getDMROVCM();
if (txHang > m_dmrRFModeHang)
txHang = m_dmrRFModeHang;
@@ -479,8 +478,12 @@ int CMMDVMHost::run()
LogInfo(" Call Hang: %us", callHang);
LogInfo(" TX Hang: %us", txHang);
LogInfo(" Mode Hang: %us", m_dmrRFModeHang);
LogInfo(" OVCM: %s", ovcm ? "on" : "off");
LogInfo(" OVCMRX: %s", ovcmRX ? "on" : "off");
if (ovcm == 0)
LogInfo(" OVCM: off");
else if (ovcm == 1)
LogInfo(" OVCM: on(rx)");
else
LogInfo(" OVCM: on");
switch (dmrBeacons) {
case DMR_BEACONS_NETWORK: {
@@ -511,7 +514,7 @@ int CMMDVMHost::run()
break;
}
m_dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_dmrLookup, rssi, jitter, ovcm, ovcmRX);
m_dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_dmrLookup, rssi, jitter, ovcm);
m_dmrTXTimer.setTimeout(txHang);
}