g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 14:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #533 from maierp/maier_p_ovcm_rx

Browse source 
Config setting for sending OVCM to network (RX)
This commit is contained in:
Jonathan Naylor 2019-11-15 11:58:02 +00:00 • committed by GitHub
commit aa7ae2371c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MMDVMHost.cpp
View file

@ -446,6 +446,7 @@ int CMMDVMHost::run()
m_dmrRFModeHang = m_conf.getDMRModeHang();
dmrBeacons = m_conf.getDMRBeacons();
bool ovcm = m_conf.getDMROVCM();
bool ovcmRX = m_conf.getDMROVCMRX();
if (txHang > m_dmrRFModeHang)
txHang = m_dmrRFModeHang;
@ -479,6 +480,7 @@ int CMMDVMHost::run()
LogInfo(" TX Hang: %us", txHang);
LogInfo(" Mode Hang: %us", m_dmrRFModeHang);
LogInfo(" OVCM: %s", ovcm ? "on" : "off");
LogInfo(" OVCMRX: %s", ovcmRX ? "on" : "off");
switch (dmrBeacons) {
case DMR_BEACONS_NETWORK: {
@ -509,7 +511,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);
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_dmrTXTimer.setTimeout(txHang);
}