Merge branch 'master' into dmr_beacons

This commit is contained in:
Jonathan Naylor
2019-11-13 08:41:11 +00:00
8 changed files with 41404 additions and 4659 deletions

View File

@@ -146,7 +146,7 @@ m_dmrSlot2TGWhiteList(),
m_dmrCallHang(10U),
m_dmrTXHang(4U),
m_dmrModeHang(10U),
m_dmrOVCM(true),
m_dmrOVCM(false),
m_fusionEnabled(false),
m_fusionLowDeviation(false),
m_fusionRemoteGateway(false),