g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-04 22:17:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial removal of TG rewrite code.

Browse source
This commit is contained in:
Jonathan Naylor 2016-12-21 18:06:43 +00:00
parent a15636f98c
commit a28508b8b1
9 changed files with 7 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

35
DMRSlot.cpp
View file

@ -155,12 +155,6 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return;
}
unsigned int rewriteId = CDMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, false, lc);
if (rewriteId != 0U) {
lc->setDstId(rewriteId);
dstId = rewriteId;
}
m_rfLC = lc;
// Regenerate the LC data
@ -255,7 +249,6 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
LogMessage("DMR Slot %u, received RF end of voice transmission, %.1f seconds, BER: %.1f%%", m_slotNo, float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits));
writeEndRF();
CDMRAccessControl::setOverEndTime(m_slotNo);
} else if (dataType == DT_DATA_HEADER) {
if (m_rfState == RS_RF_DATA)
return;
@ -485,12 +478,6 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return;
}
unsigned int rewriteId = CDMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, false, lc);
if (rewriteId != 0U) {
lc->setDstId(rewriteId);
dstId = rewriteId;
}
m_rfLC = lc;
// Create a dummy start frame to replace the received frame
@ -767,13 +754,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netLC = lc;
// Test dst rewrite
unsigned int rewriteId = CDMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, true, m_netLC);
if (rewriteId != 0U) {
m_netLC->setDstId(rewriteId);
dstId = rewriteId;
}
// Regenerate the LC data
fullLC.encode(*m_netLC, data + 2U, DT_VOICE_LC_HEADER);
@ -839,13 +819,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netLC = lc;
// Test dst rewrite
unsigned int rewriteId = CDMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, true, m_netLC);
if (rewriteId != 0U) {
m_netLC->setDstId(rewriteId);
dstId = rewriteId;
}
m_lastFrameValid = false;
m_netTimeoutTimer.start();
@ -958,7 +931,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
LogMessage("DMR Slot %u, received network end of voice transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
writeEndNet();
CDMRAccessControl::setOverEndTime(m_slotNo);
} else if (dataType == DT_DATA_HEADER) {
if (m_netState == RS_NET_DATA)
return;
@ -1029,13 +1001,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netLC = lc;
// Test dst rewrite
unsigned int rewriteId = CDMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, true, m_netLC);
if (rewriteId != 0U) {
m_netLC->setDstId(rewriteId);
dstId = rewriteId;
}
m_lastFrameValid = false;
m_netTimeoutTimer.start();