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

Modify the delayed packet sending.

This commit is contained in:
Jonathan Naylor 2016-09-28 08:10:19 +01:00
parent f627a18dd8
commit bfa8bd4f4b
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
P25Control.cpp
View File

@ -104,6 +104,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
if (m_netState == RS_NET_IDLE) if (m_netState == RS_NET_IDLE)
m_display->clearP25(); m_display->clearP25();
writeNetwork(m_rfLDU, m_lastDUID, true);
writeNetwork(data + 2U, P25_DUID_TERM, true); writeNetwork(data + 2U, P25_DUID_TERM, true);
m_rfState = RS_RF_LISTENING; m_rfState = RS_RF_LISTENING;
m_rfTimeout.stop(); m_rfTimeout.stop();
@ -149,11 +150,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
createRFHeader(); createRFHeader();
writeNetwork(data + 2U, P25_DUID_HEADER, false); writeNetwork(data + 2U, P25_DUID_HEADER, false);
} } else {
if (m_rfLDU[0U] != 0x00U) {
writeNetwork(m_rfLDU, m_lastDUID, false); writeNetwork(m_rfLDU, m_lastDUID, false);
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
} }
// Regenerate Sync // Regenerate Sync
@ -205,10 +203,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
if (m_rfState == RS_RF_LISTENING) if (m_rfState == RS_RF_LISTENING)
return false; return false;
if (m_rfLDU[0U] != 0x00U) { writeNetwork(m_rfLDU, m_lastDUID, false);
writeNetwork(m_rfLDU, m_lastDUID, false);
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
}
// Regenerate Sync // Regenerate Sync
CSync::addP25Sync(data + 2U); CSync::addP25Sync(data + 2U);
@ -249,10 +244,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
if (m_rfState == RS_RF_LISTENING) if (m_rfState == RS_RF_LISTENING)
return false; return false;
if (m_rfLDU[0U] != 0x00U) { writeNetwork(m_rfLDU, m_lastDUID, true);
writeNetwork(m_rfLDU, m_lastDUID, true);
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
}
::memset(data + 2U, 0x00U, P25_TERM_FRAME_LENGTH_BYTES); ::memset(data + 2U, 0x00U, P25_TERM_FRAME_LENGTH_BYTES);