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

Revert "Merge pull request #462 from gatekeep/master"

Browse Source 
This reverts commit a14a316572, reversing
changes made to f5a70aa6ce.
This commit is contained in:
Jonathan Naylor
2018-11-12 09:48:00 +00:00
parent 9444ecad16
commit 34eb69dede
6 changed files with 106 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
P25Control.cpp
View File

@@ -208,24 +208,9 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
m_rssiCount++;
}
if (duid == P25_DUID_HEADER) {
if (duid == P25_DUID_LDU1) {
if (m_rfState == RS_RF_LISTENING) {
m_rfData.reset();
bool ret = m_rfData.decodeHeader(data + 2U);
if (!ret) {
m_lastDUID = duid;
return false;
}
LogMessage("P25, received RF header");
m_lastDUID = duid;
return true;
}
}
else if (duid == P25_DUID_LDU1) {
if (m_rfState == RS_RF_LISTENING) {
//m_rfData.reset();
bool ret = m_rfData.decodeLDU1(data + 2U);
if (!ret) {
m_lastDUID = duid;
@@ -277,11 +262,6 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
}
if (m_rfState == RS_RF_AUDIO) {
bool ret = m_rfData.decodeLDU1(data + 2U);
if (!ret) {
return false;
}
// Regenerate Sync
CSync::addP25Sync(data + 2U);
@@ -326,11 +306,6 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
}
} else if (duid == P25_DUID_LDU2) {
if (m_rfState == RS_RF_AUDIO) {
bool ret = m_rfData.decodeLDU2(data + 2U);
if (!ret) {
return false;
}
writeNetwork(m_rfLDU, m_lastDUID, false);
// Regenerate Sync