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

Standardise the number of headers transmitted.

Browse source
This commit is contained in:
Jonathan Naylor 2016-03-29 18:06:17 +01:00
parent 3675153d11
commit 4c80f52131
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DMRIPSC.cpp
View file

@ -248,7 +248,7 @@ bool CDMRIPSC::write(const CDMRData& data)
} else { } else {
if (dataType == DT_VOICE_LC_HEADER) { if (dataType == DT_VOICE_LC_HEADER) {
m_streamId[slotIndex] = ::rand() + 1U; m_streamId[slotIndex] = ::rand() + 1U;
count = 3U; count = 2U;
} }
if (dataType == DT_CSBK || dataType == DT_DATA_HEADER) { if (dataType == DT_CSBK || dataType == DT_DATA_HEADER) {

16
DMRSlot.cpp
View file

@ -151,8 +151,8 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfErrs = 0U; m_rfErrs = 0U;
if (m_duplex) { if (m_duplex) {
for (unsigned i = 0U; i < 3U; i++) writeQueueRF(data);
writeQueueRF(data); writeQueueRF(data);
} }
writeNetworkRF(data, DT_VOICE_LC_HEADER); writeNetworkRF(data, DT_VOICE_LC_HEADER);
@ -205,8 +205,8 @@ void CDMRSlot::writeModem(unsigned char *data)
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
data[1U] = 0x00U; data[1U] = 0x00U;
for (unsigned int i = 0U; i < 2U; i++) writeNetworkRF(data, DT_TERMINATOR_WITH_LC);
writeNetworkRF(data, DT_TERMINATOR_WITH_LC); writeNetworkRF(data, DT_TERMINATOR_WITH_LC);
// 480ms of terminator to space things out // 480ms of terminator to space things out
if (m_duplex) { if (m_duplex) {
@ -484,8 +484,8 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfErrs = 0U; m_rfErrs = 0U;
if (m_duplex) { if (m_duplex) {
for (unsigned int i = 0U; i < 3U; i++) writeQueueRF(start);
writeQueueRF(start); writeQueueRF(start);
} }
writeNetworkRF(start, DT_VOICE_LC_HEADER); writeNetworkRF(start, DT_VOICE_LC_HEADER);
@ -690,8 +690,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
for (unsigned int i = 0U; i < 5U; i++) for (unsigned int i = 0U; i < 5U; i++)
writeQueueNet(m_idle); writeQueueNet(m_idle);
for (unsigned int i = 0U; i < 3U; i++) writeQueueNet(data);
writeQueueNet(data); writeQueueNet(data);
m_netState = RS_NET_AUDIO; m_netState = RS_NET_AUDIO;