ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only transmit the data header once over RF.

This commit is contained in:
Jonathan Naylor 2016-03-11 06:50:06 +00:00
parent 0d1f41c9c4
commit 2298a7b1b3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DMRSlot.cpp
View File

@ -237,7 +237,7 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId); m_rfLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId);
// Regenerate the data header // Regenerate the data header
// dataHeader.get(data + 2U); // dataHeader.get(data + 2U); XXX
// Regenerate the Slot Type // Regenerate the Slot Type
slotType.getData(data + 2U); slotType.getData(data + 2U);
@ -248,10 +248,8 @@ void CDMRSlot::writeModem(unsigned char *data)
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
if (m_duplex) { if (m_duplex)
for (unsigned i = 0U; i < 3U; i++)
writeQueueRF(data); writeQueueRF(data);
}
writeNetworkRF(data, DT_DATA_HEADER); writeNetworkRF(data, DT_DATA_HEADER);
@ -758,7 +756,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId); m_netLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId);
// Regenerate the data header // Regenerate the data header
dataHeader.get(data + 2U); // dataHeader.get(data + 2U); XXX
// Regenerate the Slot Type // Regenerate the Slot Type
CDMRSlotType slotType; CDMRSlotType slotType;
@ -776,7 +774,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
writeQueueNet(m_idle); writeQueueNet(m_idle);
writeQueueNet(m_idle); writeQueueNet(m_idle);
for (unsigned i = 0U; i < 3U; i++)
writeQueueNet(data); writeQueueNet(data);
m_netState = RS_NET_DATA; m_netState = RS_NET_DATA;