From 6d719353c6fb9fc05b83ec6aba97469dcbe25215 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 30 Jan 2019 20:20:15 +0000 Subject: [PATCH] Loosen fast data admission criteria. --- DStarControl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index c37e730..cd3b262 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -345,7 +345,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) if (m_rfState == RS_RF_AUDIO && (m_rfN % 2U) == 1U) { unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U] ^ DSTAR_SCRAMBLER_BYTES[0U]) & DSTAR_SLOW_DATA_TYPE_MASK; unsigned char guard = data[4U + 1U] ^ DSTAR_SCRAMBLER_BYTES[4U]; - if ((slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) && guard == DSTAR_FAST_DATA_GUARD_BYTE) { + if ((slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) /* && guard == DSTAR_FAST_DATA_GUARD_BYTE */) { LogMessage("D-Star, switching to fast data mode"); m_rfState = RS_RF_DATA; } @@ -715,7 +715,7 @@ void CDStarControl::writeNetwork() if (m_netState == RS_NET_AUDIO && (n % 2U) == 1U) { unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U] ^ DSTAR_SCRAMBLER_BYTES[0U]) & DSTAR_SLOW_DATA_TYPE_MASK; unsigned char guard = data[4U + 2U] ^ DSTAR_SCRAMBLER_BYTES[4U]; - if ((slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) && guard == DSTAR_FAST_DATA_GUARD_BYTE) { + if ((slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) /* && guard == DSTAR_FAST_DATA_GUARD_BYTE */) { LogMessage("D-Star, switching to fast data mode"); m_netState = RS_NET_DATA; }