MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-20 22:45:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert terminator behaviour for hotspot users.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-06-20 10:01:09 +01:00
committed by GitHub
parent 3e45a49b7c
commit ac87d8e779
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
DMRSlot.cpp
View File

@@ -160,9 +160,6 @@ void CDMRSlot::writeModem(unsigned char *data)
return; return;
} }
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
m_rfLC = lc; m_rfLC = lc;
// Store the LC for the embedded LC // Store the LC for the embedded LC
@@ -188,6 +185,9 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfErrs = 0U; m_rfErrs = 0U;
if (m_duplex) { if (m_duplex) {
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
writeQueueRF(data); writeQueueRF(data);
writeQueueRF(data); writeQueueRF(data);
writeQueueRF(data); writeQueueRF(data);
@@ -525,9 +525,6 @@ void CDMRSlot::writeModem(unsigned char *data)
return; return;
} }
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
m_rfLC = lc; m_rfLC = lc;
// Store the LC for the embedded LC // Store the LC for the embedded LC
@@ -557,6 +554,9 @@ void CDMRSlot::writeModem(unsigned char *data)
m_rfErrs = 0U; m_rfErrs = 0U;
if (m_duplex) { if (m_duplex) {
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
writeQueueRF(start); writeQueueRF(start);
writeQueueRF(start); writeQueueRF(start);
writeQueueRF(start); writeQueueRF(start);
@@ -756,8 +756,13 @@ void CDMRSlot::writeEndNet(bool writeEnd)
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
data[1U] = 0x00U; data[1U] = 0x00U;
for (unsigned int i = 0U; i < m_hangCount; i++) if (m_duplex) {
writeQueueNet(data); for (unsigned int i = 0U; i < m_hangCount; i++)
writeQueueNet(data);
} else {
for (unsigned int i = 0U; i < 3U; i++)
writeQueueNet(data);
}
} }
delete m_netLC; delete m_netLC;
@@ -806,9 +811,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
} }
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
// Store the LC for the embedded LC // Store the LC for the embedded LC
m_netEmbeddedLC.setData(*m_netLC); m_netEmbeddedLC.setData(*m_netLC);
@@ -835,6 +837,11 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netBits = 1U; m_netBits = 1U;
m_netErrs = 0U; m_netErrs = 0U;
if (m_duplex) {
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
}
writeQueueNet(m_idle); writeQueueNet(m_idle);
writeQueueNet(m_idle); writeQueueNet(m_idle);
writeQueueNet(m_idle); writeQueueNet(m_idle);
@@ -934,9 +941,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
data[1U] = 0x00U; data[1U] = 0x00U;
for (unsigned int i = 0U; i < m_hangCount; i++) if (m_duplex) {
writeQueueNet(data); for (unsigned int i = 0U; i < m_hangCount; i++)
writeQueueNet(data);
} else {
for (unsigned int i = 0U; i < 3U; i++)
writeQueueNet(data);
}
#if defined(DUMP_DMR) #if defined(DUMP_DMR)
writeFile(data); writeFile(data);
@@ -1035,11 +1047,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
} }
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
if (m_duplex) {
m_queue.clear();
m_modem->writeDMRAbort(m_slotNo);
}
writeQueueNet(m_idle); writeQueueNet(m_idle);
writeQueueNet(m_idle); writeQueueNet(m_idle);
writeQueueNet(m_idle); writeQueueNet(m_idle);