implement disableCompositeFlag configuration parameter to disable flagging the control channel as composite in a voice on control condition;

pull/12/head
Bryan Biedenkapp 4 years ago
parent c537deeaf4
commit 2aecd682c3

@ -56,6 +56,7 @@ protocols:
interval: 300
duration: 1
voiceOnControl: false
disableCompositeFlag: false
inhibitIllegal: false
legacyGroupGrnt: true
legacyGroupReg: false

@ -222,13 +222,16 @@ void Control::setOptions(yaml::Node& conf, const std::string cwCallsign, const s
m_disableNetworkHDU = p25Protocol["disableNetworkHDU"].as<bool>(false);
bool disableCompositeFlag = p25Protocol["disableCompositeFlag"].as<bool>(false);
uint8_t serviceClass = P25_SVC_CLS_VOICE | P25_SVC_CLS_DATA;
if (m_control) {
serviceClass |= P25_SVC_CLS_REG;
}
if (m_voiceOnControl) {
serviceClass |= P25_SVC_CLS_COMPOSITE;
if (!disableCompositeFlag) {
serviceClass |= P25_SVC_CLS_COMPOSITE;
}
}
m_siteData = SiteData(netId, sysId, rfssId, siteId, 0U, channelId, channelNo, serviceClass);

Loading…
Cancel
Save

Powered by TurnKey Linux.