diff --git a/DStarControl.cpp b/DStarControl.cpp index 945b541..17a0cd9 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -414,14 +414,6 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) return false; } - // 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) { unsigned char type = m_rfSlowData.getType(false); //as per specs, this could be any value bewtween 0x80 and 0x9C diff --git a/DStarSlowData.cpp b/DStarSlowData.cpp index 138e583..2a39244 100644 --- a/DStarSlowData.cpp +++ b/DStarSlowData.cpp @@ -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; diff --git a/Version.h b/Version.h index 81eb006..78a8161 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20260416"; +const char* VERSION = "20260417"; #endif