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

Improve the logic of the repeater, late entry still to finish.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-02-01 22:05:17 +00:00
parent dcc8b04b2c
commit 7cc2a042b5
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
NXDNControl.cpp
View File

@@ -274,7 +274,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
return true;
} else {
// if (valid) {
if (m_rfState == RS_RF_LISTENING) {
unsigned char message[3U];
sacch.getData(message);
@@ -300,11 +300,11 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
break;
}
// if (m_rfMask != 0x0FU)
// return false;
if (m_rfMask != 0x0FU)
return false;
unsigned char messageType = m_rfLayer3.getMessageType();
if (messageType != NXDN_MESSAGE_TYPE_VCALL)
bool hasInfo = m_rfLayer3.getHasInfo();
if (!hasInfo)
return false;
unsigned short srcId = m_rfLayer3.getSourceUnitId();
@@ -337,9 +337,9 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
m_rfState = RS_RF_AUDIO;
}
// }
}
// if (m_rfState == RS_RF_AUDIO) {
if (m_rfState == RS_RF_AUDIO) {
// Regenerate the sync
CSync::addNXDNSync(data + 2U);
@@ -449,6 +449,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
m_rfFrames++;
m_display->writeNXDNRSSI(m_rssi);
}
return true;
}