Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Tony Corbett G0WFV 2016-11-20 08:59:32 +02:00
commit 3aa4820c32
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DMRAccessControl.cpp
View file

@ -232,12 +232,12 @@ unsigned int CDMRAccessControl::dstIdRewrite(unsigned int did, unsigned int sid,
} else if (m_bmAutoRewrite && did == 9U && m_dstRewriteID[slot - 1U] != 9U && m_dstRewriteID[slot - 1U] != 0U && (m_time[slot - 1U] + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP) { } else if (m_bmAutoRewrite && did == 9U && m_dstRewriteID[slot - 1U] != 9U && m_dstRewriteID[slot - 1U] != 0U && (m_time[slot - 1U] + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP) {
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)", slot, did, m_dstRewriteID[slot - 1U]); LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)", slot, did, m_dstRewriteID[slot - 1U]);
return m_dstRewriteID[slot - 1U]; return m_dstRewriteID[slot - 1U];
} else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did != 9U && did != 9990U && did < 99999U && dmrLC->getFLCO() == FLCO_USER_USER) { } else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did != 9U && did != 9990U && did < 999999U && dmrLC->getFLCO() == FLCO_USER_USER) {
m_dstRewriteID[slot - 1U] = did; m_dstRewriteID[slot - 1U] = did;
dmrLC->setFLCO(FLCO_GROUP); dmrLC->setFLCO(FLCO_GROUP);
LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)", slot, did); LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)", slot, did);
return did; return did;
} else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did != 9U && did != 9990U && did > 99999U) { } else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did != 9U && did != 9990U && did > 999999U) {
m_dstRewriteID[slot - 1U] = did; m_dstRewriteID[slot - 1U] = did;
} }

3
Modem.cpp
View file

@ -422,7 +422,6 @@ void CModem::clock(unsigned int ms)
// CUtils::dump(1U, "GET_STATUS", m_buffer, m_length); // CUtils::dump(1U, "GET_STATUS", m_buffer, m_length);
m_tx = (m_buffer[5U] & 0x01U) == 0x01U; m_tx = (m_buffer[5U] & 0x01U) == 0x01U;
m_cd = (m_buffer[5U] & 0x02U) == 0x02U;
bool adcOverflow = (m_buffer[5U] & 0x02U) == 0x02U; bool adcOverflow = (m_buffer[5U] & 0x02U) == 0x02U;
if (adcOverflow) if (adcOverflow)
@ -442,6 +441,8 @@ void CModem::clock(unsigned int ms)
if (dacOverflow) if (dacOverflow)
LogError("MMDVM DAC levels have overflowed"); LogError("MMDVM DAC levels have overflowed");
m_cd = (m_buffer[5U] & 0x40U) == 0x40U;
m_dstarSpace = m_buffer[6U]; m_dstarSpace = m_buffer[6U];
m_dmrSpace1 = m_buffer[7U]; m_dmrSpace1 = m_buffer[7U];
m_dmrSpace2 = m_buffer[8U]; m_dmrSpace2 = m_buffer[8U];