MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the non superblock processing.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-02-01 06:35:16 +00:00
parent c4fe7f7759
commit 2f38042409
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
NXDNControl.cpp
View File

@@ -91,7 +91,7 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len)
if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) { if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) {
if (m_rssi != 0U) if (m_rssi != 0U)
LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
else else
LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits));
writeEndRF(); writeEndRF();
@@ -180,19 +180,15 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
if (usc == NXDN_LICH_USC_SACCH_NS) { if (usc == NXDN_LICH_USC_SACCH_NS) {
// The SACCH on a non-superblock frame is usually an idle and not interesting apart from the RAN. // The SACCH on a non-superblock frame is usually an idle and not interesting apart from the RAN.
CNXDNFACCH1 facch11; CNXDNFACCH1 facch;
bool valid1 = facch11.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS); bool valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
if (!valid)
CNXDNFACCH1 facch12; valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
bool valid2 = facch12.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
if (valid) {
unsigned char buffer[10U]; unsigned char buffer[10U];
if (valid1) facch.getData(buffer);
facch11.getData(buffer);
else if (valid2)
facch12.getData(buffer);
if (valid1 || valid2) {
CNXDNLayer3 layer3; CNXDNLayer3 layer3;
layer3.decode(buffer, NXDN_FACCH1_LENGTH_BITS); layer3.decode(buffer, NXDN_FACCH1_LENGTH_BITS);
@@ -228,13 +224,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
sacch.setData(SACCH_IDLE); sacch.setData(SACCH_IDLE);
sacch.encode(data + 2U); sacch.encode(data + 2U);
if (valid1) { facch.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
facch11.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS); facch.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
facch11.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
} else {
facch12.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
facch12.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
}
scrambler(data + 2U); scrambler(data + 2U);
@@ -243,7 +234,6 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
#if defined(DUMP_NXDN) #if defined(DUMP_NXDN)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) if (m_duplex)
writeQueueRF(data); writeQueueRF(data);
@@ -312,8 +302,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
break; break;
} }
if (m_rfMask != 0x0FU) // if (m_rfMask != 0x0FU)
return false; // return false;
unsigned char messageType = m_rfLayer3.getMessageType(); unsigned char messageType = m_rfLayer3.getMessageType();
if (messageType != NXDN_MESSAGE_TYPE_VCALL) if (messageType != NXDN_MESSAGE_TYPE_VCALL)