From 00c15f116c4b4a47ca012e72976315f986afcb4e Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 1 Feb 2016 20:54:08 +0000 Subject: [PATCH] Modem D-Star EOT contains no audio...... --- DStarControl.cpp | 12 +++--------- Version.h | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index 9683eab..4a53565 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -181,18 +181,14 @@ void CDStarControl::writeModem(unsigned char *data) } } else if (type == TAG_EOT) { if (m_state == RS_RELAYING_RF_AUDIO) { - unsigned int errors = m_fec.regenerateDStar(data + 1U); - m_errs += errors; - m_bits += 48U; - if (m_net) { for (unsigned int i = 0U; i < 2U; i++) - writeNetworkData(data, errors, true, false); + writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, false); } if (m_duplex) { for (unsigned int i = 0U; i < 3U; i++) - writeQueueData(data); + writeQueueData(DSTAR_END_PATTERN_BYTES); } m_ackTimer.start(); @@ -202,11 +198,9 @@ void CDStarControl::writeModem(unsigned char *data) writeEndOfTransmission(); } else if (m_state == RS_RELAYING_NETWORK_AUDIO) { - m_fec.regenerateDStar(data + 1U); - if (m_net) { for (unsigned int i = 0U; i < 2U; i++) - writeNetworkData(data, 0U, true, true); + writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, true); } } } else { diff --git a/Version.h b/Version.h index 47dcb63..8ba53ad 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20160131"; +const char* VERSION = "20160201"; #endif