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

Revert some D-Star slow data changes.

Browse Source
This commit is contained in:
Jonathan Naylor
2025-03-27 18:27:48 +00:00
parent d9d6846751
commit 29af1f9258
4 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DStarControl.cpp
View File

@@ -354,7 +354,6 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
// 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;
m_rfState = RPT_RF_STATE::LATE_ENTRY;
}
@@ -370,7 +369,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
}
if (m_rfState == RPT_RF_STATE::AUDIO) {
m_rfSlowData.peakSlowData(data + 1U, m_rfN);
m_rfSlowData.peakSlowData(data + 1U);
unsigned char type = m_rfSlowData.getType();
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) {
@@ -380,6 +379,12 @@ 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);
m_display->writeDStarRSSI(m_rssi);
}
LogDebug("D-Star, fast data sequence no. %u", m_rfN);
m_rfBits += 48U;
@@ -391,7 +396,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
if (m_duplex)
writeQueueDataRF(data);
m_rfSlowData.peakSlowData(data + 1U, m_rfN);
m_rfSlowData.peakSlowData(data + 1U);
bool complete = m_rfSlowData.isComplete();
if (complete) {
@@ -405,8 +410,10 @@ 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)
if (m_rfN == 0U) {
CSync::addDStarSync(data + 1U);
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) {
@@ -422,7 +429,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, m_rfN);
const unsigned char* text = m_rfSlowData.addText(data + 1U);
if (text != nullptr)
LogMessage("D-Star, RF slow data text = \"%s\"", text);
}
@@ -442,14 +449,11 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
// 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.reset();
m_rfN = 0U;
return false;
} else {
CDStarHeader* header = m_rfSlowData.addHeader(data + 1U, m_rfN);
if (header == nullptr) {
m_rfN = (m_rfN + 1U) % 21U;
CDStarHeader* header = m_rfSlowData.addHeader(data + 1U);
if (header == nullptr)
return false;
}
m_rfHeader = *header;
delete header;
@@ -744,7 +748,7 @@ void CDStarControl::writeNetwork()
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
m_netSlowData.start();
} else {
m_netSlowData.peakSlowData(data + 1U, n);
m_netSlowData.peakSlowData(data + 1U);
if (m_netState == RPT_NET_STATE::AUDIO) {
unsigned char type = m_netSlowData.getType();
@@ -782,7 +786,7 @@ void CDStarControl::writeNetwork()
CSync::addDStarSync(data + 2U);
m_netSlowData.start();
} else {
const unsigned char* text = m_netSlowData.addText(data + 2U, m_netN);
const unsigned char* text = m_netSlowData.addText(data + 2U);
if (text != nullptr)
LogMessage("D-Star, network slow data text = \"%s\"", text);
}
@@ -808,7 +812,7 @@ void CDStarControl::writeNetwork()
CSync::addDStarSync(data + 2U);
m_netSlowData.start();
} else {
m_netSlowData.peakSlowData(data + 2U, m_netN);
m_netSlowData.peakSlowData(data + 2U);
bool complete = m_netSlowData.isComplete();
if (complete) {
unsigned char type = m_netSlowData.getType();