g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions 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
Show stats Download patch file Download diff file Expand all files Collapse all files

50
DStarControl.cpp
View file

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

87
DStarSlowData.cpp
View file

@ -34,7 +34,7 @@ m_text(nullptr),
m_textPtr(0U), m_textPtr(0U),
m_textBits(0x00U), m_textBits(0x00U),
m_state(SDD_STATE::FIRST), m_state(SDD_STATE::FIRST),
m_type(0x00U) m_complete(false)
{ {
m_header = new unsigned char[50U]; // DSTAR_HEADER_LENGTH_BYTES m_header = new unsigned char[50U]; // DSTAR_HEADER_LENGTH_BYTES
m_buffer = new unsigned char[DSTAR_DATA_FRAME_LENGTH_BYTES * 2U]; m_buffer = new unsigned char[DSTAR_DATA_FRAME_LENGTH_BYTES * 2U];
@ -48,52 +48,45 @@ CDStarSlowData::~CDStarSlowData()
delete[] m_text; delete[] m_text;
} }
void CDStarSlowData::peakSlowData(const unsigned char* data) void CDStarSlowData::add(const unsigned char* data)
{ {
assert(data != nullptr); assert(data != nullptr);
switch (m_state) { switch (m_state) {
case SDD_STATE::FIRST: case SDD_STATE::FIRST:
m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_state = SDD_STATE::SECOND;
break;
case SDD_STATE::SECOND:
m_state = SDD_STATE::FIRST;
break;
}
}
CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data)
{
assert(data != nullptr);
switch (m_state) {
case SDD_STATE::FIRST:
m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_buffer[0U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[0U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_buffer[1U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U]; m_buffer[1U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U];
m_buffer[2U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U]; m_buffer[2U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
m_state = SDD_STATE::SECOND; m_state = SDD_STATE::SECOND;
return nullptr; m_complete = false;
return;
case SDD_STATE::SECOND: case SDD_STATE::SECOND:
m_buffer[3U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U]; m_buffer[3U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_buffer[4U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U]; m_buffer[4U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U];
m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U]; m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
m_state = SDD_STATE::FIRST; m_state = SDD_STATE::FIRST;
m_complete = true;
loadHeader();
loadText();
break; break;
} }
}
void CDStarSlowData::loadHeader()
{
if ((m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK) != DSTAR_SLOW_DATA_TYPE_HEADER) if ((m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK) != DSTAR_SLOW_DATA_TYPE_HEADER)
return nullptr; return;
if (m_ptr >= 45U) if (m_ptr >= 45U)
return nullptr; return;
::memcpy(m_header + m_ptr, m_buffer + 1U, 5U); ::memcpy(m_header + m_ptr, m_buffer + 1U, 5U);
m_ptr += 5U; m_ptr += 5U;
}
CDStarHeader* CDStarSlowData::getHeader()
{
// Clean up the data // Clean up the data
m_header[0U] &= (DSTAR_INTERRUPTED_MASK | DSTAR_URGENT_MASK | DSTAR_REPEATER_MASK); m_header[0U] &= (DSTAR_INTERRUPTED_MASK | DSTAR_URGENT_MASK | DSTAR_REPEATER_MASK);
m_header[1U] = 0x00U; m_header[1U] = 0x00U;
@ -113,30 +106,11 @@ CDStarHeader* CDStarSlowData::addHeader(const unsigned char* data)
return new CDStarHeader(m_header); return new CDStarHeader(m_header);
} }
const unsigned char* CDStarSlowData::addText(const unsigned char* data) void CDStarSlowData::loadText()
{ {
assert(data != nullptr);
switch (m_state) {
case SDD_STATE::FIRST:
m_type = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_buffer[0U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_buffer[1U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U];
m_buffer[2U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
m_state = SDD_STATE::SECOND;
return nullptr;
case SDD_STATE::SECOND:
m_buffer[3U] = data[9U] ^ DSTAR_SCRAMBLER_BYTES[0U];
m_buffer[4U] = data[10U] ^ DSTAR_SCRAMBLER_BYTES[1U];
m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
m_state = SDD_STATE::FIRST;
break;
}
switch (m_buffer[0U]) { switch (m_buffer[0U]) {
case DSTAR_SLOW_DATA_TYPE_TEXT | 0U: case DSTAR_SLOW_DATA_TYPE_TEXT | 0U:
CUtils::dump(1U, "D-Star slow data text fragment", m_buffer, 6U); CUtils::dump(1U, "D-Star slow data text fragment 0", m_buffer, 6U);
m_text[0U] = m_buffer[1U] & 0x7FU; m_text[0U] = m_buffer[1U] & 0x7FU;
m_text[1U] = m_buffer[2U] & 0x7FU; m_text[1U] = m_buffer[2U] & 0x7FU;
m_text[2U] = m_buffer[3U] & 0x7FU; m_text[2U] = m_buffer[3U] & 0x7FU;
@ -144,8 +118,9 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data)
m_text[4U] = m_buffer[5U] & 0x7FU; m_text[4U] = m_buffer[5U] & 0x7FU;
m_textBits |= 0x01U; m_textBits |= 0x01U;
break; break;
case DSTAR_SLOW_DATA_TYPE_TEXT | 1U: case DSTAR_SLOW_DATA_TYPE_TEXT | 1U:
CUtils::dump(1U, "D-Star slow data text fragment", m_buffer, 6U); CUtils::dump(1U, "D-Star slow data text fragment 1", m_buffer, 6U);
m_text[5U] = m_buffer[1U] & 0x7FU; m_text[5U] = m_buffer[1U] & 0x7FU;
m_text[6U] = m_buffer[2U] & 0x7FU; m_text[6U] = m_buffer[2U] & 0x7FU;
m_text[7U] = m_buffer[3U] & 0x7FU; m_text[7U] = m_buffer[3U] & 0x7FU;
@ -153,8 +128,9 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data)
m_text[9U] = m_buffer[5U] & 0x7FU; m_text[9U] = m_buffer[5U] & 0x7FU;
m_textBits |= 0x02U; m_textBits |= 0x02U;
break; break;
case DSTAR_SLOW_DATA_TYPE_TEXT | 2U: case DSTAR_SLOW_DATA_TYPE_TEXT | 2U:
CUtils::dump(1U, "D-Star slow data text fragment", m_buffer, 6U); CUtils::dump(1U, "D-Star slow data text fragment 2", m_buffer, 6U);
m_text[10U] = m_buffer[1U] & 0x7FU; m_text[10U] = m_buffer[1U] & 0x7FU;
m_text[11U] = m_buffer[2U] & 0x7FU; m_text[11U] = m_buffer[2U] & 0x7FU;
m_text[12U] = m_buffer[3U] & 0x7FU; m_text[12U] = m_buffer[3U] & 0x7FU;
@ -162,8 +138,9 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data)
m_text[14U] = m_buffer[5U] & 0x7FU; m_text[14U] = m_buffer[5U] & 0x7FU;
m_textBits |= 0x04U; m_textBits |= 0x04U;
break; break;
case DSTAR_SLOW_DATA_TYPE_TEXT | 3U: case DSTAR_SLOW_DATA_TYPE_TEXT | 3U:
CUtils::dump(1U, "D-Star slow data text fragment", m_buffer, 6U); CUtils::dump(1U, "D-Star slow data text fragment 3", m_buffer, 6U);
m_text[15U] = m_buffer[1U] & 0x7FU; m_text[15U] = m_buffer[1U] & 0x7FU;
m_text[16U] = m_buffer[2U] & 0x7FU; m_text[16U] = m_buffer[2U] & 0x7FU;
m_text[17U] = m_buffer[3U] & 0x7FU; m_text[17U] = m_buffer[3U] & 0x7FU;
@ -172,10 +149,14 @@ const unsigned char* CDStarSlowData::addText(const unsigned char* data)
m_text[20U] = 0x00U; m_text[20U] = 0x00U;
m_textBits |= 0x08U; m_textBits |= 0x08U;
break; break;
default:
return nullptr;
}
default:
break;
}
}
const unsigned char* CDStarSlowData::getText()
{
if (m_textBits != 0x0FU) if (m_textBits != 0x0FU)
return nullptr; return nullptr;
@ -192,16 +173,16 @@ void CDStarSlowData::start()
m_ptr = 0U; m_ptr = 0U;
m_state = SDD_STATE::FIRST; m_state = SDD_STATE::FIRST;
m_type = 0x00U;
m_textBits = 0x00U; m_textBits = 0x00U;
m_complete = false;
} }
void CDStarSlowData::reset() void CDStarSlowData::reset()
{ {
m_ptr = 0U; m_ptr = 0U;
m_state = SDD_STATE::FIRST; m_state = SDD_STATE::FIRST;
m_type = 0x00U;
m_textBits = 0x00U; m_textBits = 0x00U;
m_complete = false;
} }
void CDStarSlowData::setText(const char* text) void CDStarSlowData::setText(const char* text)
@ -257,10 +238,10 @@ void CDStarSlowData::getSlowData(unsigned char* data)
unsigned char CDStarSlowData::getType() const unsigned char CDStarSlowData::getType() const
{ {
return m_type & DSTAR_SLOW_DATA_TYPE_MASK; return m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK;
} }
bool CDStarSlowData::isComplete() const bool CDStarSlowData::isComplete() const
{ {
return m_state == SDD_STATE::FIRST; return m_complete;
} }

14
DStarSlowData.h
View file

@ -26,13 +26,12 @@ public:
CDStarSlowData(); CDStarSlowData();
~CDStarSlowData(); ~CDStarSlowData();
void peakSlowData(const unsigned char* data); void add(const unsigned char* data);
CDStarHeader* addHeader(const unsigned char* data);
const unsigned char* addText(const unsigned char* data);
CDStarHeader* getHeader();
const unsigned char* getText();
unsigned char getType() const; unsigned char getType() const;
bool isComplete() const; bool isComplete() const;
void start(); void start();
@ -55,7 +54,10 @@ private:
}; };
SDD_STATE m_state; SDD_STATE m_state;
unsigned char m_type; bool m_complete;
void loadHeader();
void loadText();
}; };
#endif #endif

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20250327"; const char* VERSION = "20250417";
#endif #endif