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

Clean up the slow data handling.

Browse Source
This commit is contained in:
Jonathan Naylor
2025-04-17 12:32:54 +01:00
parent 29af1f9258
commit 05b9c4d79b
4 changed files with 91 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
DStarControl.cpp
View File

@@ -360,16 +360,15 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
return false;
}
if ((m_rfState == RPT_RF_STATE::AUDIO) || (m_rfState == RPT_RF_STATE::DATA)) {
// The sync is regenerated by the modem so can do exact match
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
m_rfSlowData.start();
m_rfN = 0U;
}
// The sync is regenerated by the modem so can do exact match
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
m_rfSlowData.start();
m_rfN = 0U;
} else {
m_rfSlowData.add(data + 1U);
}
if (m_rfState == RPT_RF_STATE::AUDIO) {
m_rfSlowData.peakSlowData(data + 1U);
unsigned char type = m_rfSlowData.getType();
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) {
@@ -380,10 +379,8 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
if (m_rfState == RPT_RF_STATE::DATA) {
// Send the RSSI data to the display
if (m_rfN == 0U) {
CSync::addDStarSync(data + 1U);
if (m_rfN == 0U)
m_display->writeDStarRSSI(m_rssi);
}
LogDebug("D-Star, fast data sequence no. %u", m_rfN);
@@ -396,9 +393,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
if (m_duplex)
writeQueueDataRF(data);
m_rfSlowData.peakSlowData(data + 1U);
bool complete = m_rfSlowData.isComplete();
if (complete) {
unsigned char type = m_rfSlowData.getType();
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) {
@@ -410,10 +405,8 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rfN = (m_rfN + 1U) % 21U;
} else if (m_rfState == RPT_RF_STATE::AUDIO) {
// Send the RSSI data to the display
if (m_rfN == 0U) {
CSync::addDStarSync(data + 1U);
if (m_rfN == 0U)
m_display->writeDStarRSSI(m_rssi);
}
unsigned int errors = 0U;
if (::memcmp(data + 1U, DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) {
@@ -429,7 +422,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rfFrames++;
if (m_rfN != 0U) {
const unsigned char* text = m_rfSlowData.addText(data + 1U);
const unsigned char* text = m_rfSlowData.getText();
if (text != nullptr)
LogMessage("D-Star, RF slow data text = \"%s\"", text);
}
@@ -451,7 +444,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rfSlowData.reset();
return false;
} else {
CDStarHeader* header = m_rfSlowData.addHeader(data + 1U);
CDStarHeader* header = m_rfSlowData.getHeader();
if (header == nullptr)
return false;
@@ -742,13 +735,13 @@ void CDStarControl::writeNetwork()
writeEndNet();
} else if (type == TAG_DATA) {
if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA)) {
unsigned char n = data[1U];
m_netN = data[1U];
// The sync is regenerated by the modem so can do exact match
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
if (m_netN == 0U) {
CSync::addDStarSync(data + 2U);
m_netSlowData.start();
} else {
m_netSlowData.peakSlowData(data + 1U);
m_netSlowData.add(data + 2U);
if (m_netState == RPT_NET_STATE::AUDIO) {
unsigned char type = m_netSlowData.getType();
@@ -761,8 +754,6 @@ void CDStarControl::writeNetwork()
}
if (m_netState == RPT_NET_STATE::AUDIO) {
unsigned char n = data[1U];
unsigned int errors = 0U;
if (::memcmp(data + 2U, DSTAR_nullptr_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) != 0) {
errors = m_fec.regenerateDStar(data + 2U);
@@ -772,21 +763,15 @@ void CDStarControl::writeNetwork()
data[1U] = TAG_DATA;
// Insert silence and reject if in the past
bool ret = insertSilence(data + 1U, n);
bool ret = insertSilence(data + 1U, m_netN);
if (!ret)
return;
m_netErrs += errors;
m_netBits += 48U;
m_netN = n;
// Regenerate the sync
if (m_netN == 0U) {
CSync::addDStarSync(data + 2U);
m_netSlowData.start();
} else {
const unsigned char* text = m_netSlowData.addText(data + 2U);
if (m_netN != 0U) {
const unsigned char* text = m_netSlowData.getText();
if (text != nullptr)
LogMessage("D-Star, network slow data text = \"%s\"", text);
}
@@ -801,18 +786,11 @@ void CDStarControl::writeNetwork()
}
if (m_netState == RPT_NET_STATE::DATA) {
m_netN = data[1U];
data[1U] = TAG_DATA;
m_netBits += 48U;
// Regenerate the sync
if (m_netN == 0U) {
CSync::addDStarSync(data + 2U);
m_netSlowData.start();
} else {
m_netSlowData.peakSlowData(data + 2U);
if (m_netN != 0U) {
bool complete = m_netSlowData.isComplete();
if (complete) {
unsigned char type = m_netSlowData.getType();