fix some minor DVRS/conventional weirdness;

pull/55/head
Bryan Biedenkapp 2 years ago
parent a7e727a7ec
commit cbb0af42ba

@ -35,7 +35,7 @@
#define EOL "\r\n" #define EOL "\r\n"
const uint32_t LOG_BUFFER_LEN = 4096U; const uint32_t LOG_BUFFER_LEN = 16384U;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Global Variables // Global Variables

@ -775,7 +775,7 @@ bool ControlSignaling::processNetwork(uint8_t* data, uint32_t len, lc::LC& contr
case TSBK_IOSP_GRP_VCH: case TSBK_IOSP_GRP_VCH:
case TSBK_IOSP_UU_VCH: case TSBK_IOSP_UU_VCH:
{ {
if (m_p25->m_enableControl) { if (m_p25->m_enableControl && m_p25->m_dedicatedControl) {
if (!m_p25->m_affiliations.isGranted(dstId)) { if (!m_p25->m_affiliations.isGranted(dstId)) {
if (m_verbose) { if (m_verbose) {
LogMessage(LOG_NET, P25_TSDU_STR ", %s, emerg = %u, encrypt = %u, prio = %u, chNo = %u, srcId = %u, dstId = %u", LogMessage(LOG_NET, P25_TSDU_STR ", %s, emerg = %u, encrypt = %u, prio = %u, chNo = %u, srcId = %u, dstId = %u",

@ -366,7 +366,7 @@ bool Voice::process(uint8_t* data, uint32_t len)
// send network grant demand TDU // send network grant demand TDU
if (m_p25->m_network != nullptr) { if (m_p25->m_network != nullptr) {
if (!m_p25->m_enableControl && m_p25->m_convNetGrantDemand) { if (!m_p25->m_dedicatedControl && m_p25->m_convNetGrantDemand) {
uint8_t controlByte = 0x80U + ((group) ? 0x00U : 0x01U); uint8_t controlByte = 0x80U + ((group) ? 0x00U : 0x01U);
LogMessage(LOG_RF, P25_HDU_STR " remote grant demand, srcId = %u, dstId = %u", srcId, dstId); LogMessage(LOG_RF, P25_HDU_STR " remote grant demand, srcId = %u, dstId = %u", srcId, dstId);
m_p25->m_network->writeP25TDU(lc, m_rfLSD, controlByte); m_p25->m_network->writeP25TDU(lc, m_rfLSD, controlByte);

Loading…
Cancel
Save

Powered by TurnKey Linux.