g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 14:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Have the CRC6 and CRC12 working with encoding and decoding, not tested CRC15.

Browse source
This commit is contained in:
Jonathan Naylor 2018-02-01 21:28:48 +00:00
parent 536d3d9b97
commit dcc8b04b2c
5 changed files with 55 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

27
NXDNControl.cpp
View file

@ -175,7 +175,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
if (ran != m_ran && ran != 0U)
return false;
} else if (m_rfState == RS_RF_LISTENING) {
// return false;
return false;
}
// XXX Reconstruct invalid LICH
@ -186,8 +186,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
bool valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
if (!valid)
valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
// if (!valid)
// return false;
if (!valid)
return false;
unsigned char buffer[10U];
facch.getData(buffer);
@ -273,8 +273,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
}
return true;
}
else {
} else {
// if (valid) {
unsigned char message[3U];
sacch.getData(message);
@ -451,24 +450,6 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
m_display->writeNXDNRSSI(m_rssi);
#ifdef notdef
// Process end of audio here
if (endofdata) {
if (m_rfState == RS_RF_AUDIO) {
if (m_rssi != 0U)
LogMessage("NXDN, received RF end of transmission, %.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);
else
LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits));
writeEndRF();
} else {
m_rfState = RS_RF_LISTENING;
m_rfMask = 0x00U;
return false;
}
}
#endif
return true;
}