From 2d2b736c54f1c4c8a74f32a0148b3e24c1c328ce Mon Sep 17 00:00:00 2001 From: Tim Stewart Date: Fri, 27 Nov 2020 17:47:24 -0500 Subject: [PATCH] Revert "Don't forget to descramble the byte first." This reverts commit 16bf9d574535b232e8e635f9cf0def2fab8ca9e6. --- DStarControl.cpp | 2 +- DStarDefines.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index 68fbb13..18d161a 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -362,7 +362,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // Check for the fast data signature if (m_rfState == RS_RF_AUDIO) { - unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U] ^ DSTAR_SCRAMBLER_BYTE1) & DSTAR_SLOW_DATA_TYPE_MASK; + unsigned char slowDataType = data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U] & DSTAR_SLOW_DATA_TYPE_MASK; if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) { LogMessage("D-Star, switching to fast data mode"); m_rfState = RS_RF_DATA; diff --git a/DStarDefines.h b/DStarDefines.h index 3f826ac..821a7e2 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -67,10 +67,6 @@ const unsigned char DSTAR_ACK_FLAG = 0x03U; const unsigned char DSTAR_NO_RESPONSE = 0x02U; const unsigned char DSTAR_RELAY_UNAVAILABLE = 0x01U; -const unsigned char DSTAR_SCRAMBLER_BYTE1 = 0x70U; -const unsigned char DSTAR_SCRAMBLER_BYTE2 = 0x4FU; -const unsigned char DSTAR_SCRAMBLER_BYTE3 = 0x93U; - const unsigned char DSTAR_SYNC_BYTES[] = {0x55U, 0x2DU, 0x16U}; const unsigned char DSTAR_DTMF_MASK[] = { 0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U };