From a87449bf51fdeb2ce35b467a4b2120b12663f92f Mon Sep 17 00:00:00 2001 From: Tim Stewart Date: Fri, 27 Nov 2020 17:14:10 -0500 Subject: [PATCH] Revert "Loosen fast data admission criteria." This reverts commit 6d719353c6fb9fc05b83ec6aba97469dcbe25215. --- DStarControl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index add4b24..f7f568d 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -360,7 +360,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; } @@ -737,7 +737,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; }