g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-21 06:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the D-Star slow data processing.

Browse source
This commit is contained in:
Jonathan Naylor 2026-04-17 12:44:32 +01:00
parent 47467bd880
commit b5b119fa8e
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
DStarSlowData.cpp
View file

@ -69,7 +69,7 @@ void CDStarSlowData::add(const unsigned char* data)
m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
m_state = SDD_STATE::FIRST;
m_complete = true;
//CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
// CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
loadHeader();
loadText();
break;
@ -101,8 +101,8 @@ CDStarHeader* CDStarSlowData::getHeader()
// Check the CRC
bool ret = CCRC::checkCCITT161(m_header, DSTAR_HEADER_LENGTH_BYTES);
if (!ret) {
if (m_ptr == 45U)
LogMessage("D-Star, invalid slow data header");
// if (m_ptr == 45U)
// LogMessage("D-Star, invalid slow data header");
return nullptr;
}
@ -113,7 +113,7 @@ void CDStarSlowData::loadText()
{
switch (m_buffer[0U]) {
case DSTAR_SLOW_DATA_TYPE_TEXT | 0U:
//CUtils::dump(1U, "D-Star slow data text fragment 0", 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[1U] = m_buffer[2U] & 0x7FU;
m_text[2U] = m_buffer[3U] & 0x7FU;
@ -123,7 +123,7 @@ void CDStarSlowData::loadText()
break;
case DSTAR_SLOW_DATA_TYPE_TEXT | 1U:
//CUtils::dump(1U, "D-Star slow data text fragment 1", 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[6U] = m_buffer[2U] & 0x7FU;
m_text[7U] = m_buffer[3U] & 0x7FU;
@ -133,7 +133,7 @@ void CDStarSlowData::loadText()
break;
case DSTAR_SLOW_DATA_TYPE_TEXT | 2U:
//CUtils::dump(1U, "D-Star slow data text fragment 2", 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[11U] = m_buffer[2U] & 0x7FU;
m_text[12U] = m_buffer[3U] & 0x7FU;
@ -143,7 +143,7 @@ void CDStarSlowData::loadText()
break;
case DSTAR_SLOW_DATA_TYPE_TEXT | 3U:
//CUtils::dump(1U, "D-Star slow data text fragment 3", 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[16U] = m_buffer[2U] & 0x7FU;
m_text[17U] = m_buffer[3U] & 0x7FU;
@ -163,7 +163,7 @@ const unsigned char* CDStarSlowData::getText()
if (m_textBits != 0x0FU)
return nullptr;
//CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
// CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
m_textBits = 0x00U;