Revert "Don't forget to descramble the byte first."
This reverts commit 16bf9d5745
.
This commit is contained in:
parent
449ca905ee
commit
2d2b736c54
2 changed files with 1 additions and 5 deletions
|
@ -362,7 +362,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
||||||
|
|
||||||
// Check for the fast data signature
|
// Check for the fast data signature
|
||||||
if (m_rfState == RS_RF_AUDIO) {
|
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) {
|
if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) {
|
||||||
LogMessage("D-Star, switching to fast data mode");
|
LogMessage("D-Star, switching to fast data mode");
|
||||||
m_rfState = RS_RF_DATA;
|
m_rfState = RS_RF_DATA;
|
||||||
|
|
|
@ -67,10 +67,6 @@ const unsigned char DSTAR_ACK_FLAG = 0x03U;
|
||||||
const unsigned char DSTAR_NO_RESPONSE = 0x02U;
|
const unsigned char DSTAR_NO_RESPONSE = 0x02U;
|
||||||
const unsigned char DSTAR_RELAY_UNAVAILABLE = 0x01U;
|
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_SYNC_BYTES[] = {0x55U, 0x2DU, 0x16U};
|
||||||
|
|
||||||
const unsigned char DSTAR_DTMF_MASK[] = { 0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U };
|
const unsigned char DSTAR_DTMF_MASK[] = { 0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U };
|
||||||
|
|
Loading…
Reference in a new issue