MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "New way to detect D-Star fast data mode."

Browse Source 
This reverts commit a9b7179d13.
This commit is contained in:
Tim Stewart
2020-11-27 17:47:51 -05:00
parent 2d2b736c54
commit b8ae0febb0
2 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
DStarControl.cpp
View File

@@ -356,20 +356,31 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
return false;
}
// Fix any scrambled null data frames
if (CUtils::compare(data + 1U, DSTAR_NULL_FRAME_DATA_SRAMBLED_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 1U, DSTAR_NULL_FRAME_DATA_SRAMBLED_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES);
// Check for the fast data signature
if (m_rfState == RS_RF_AUDIO) {
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");
// Data signatures only appear at the beginning of the frame
if (m_rfState == RS_RF_AUDIO && m_rfFrames < 21U) {
if (CUtils::compare(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) {
LogMessage("D-Star, switching to data mode (Kenwood)");
m_rfState = RS_RF_DATA;
} else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) {
LogMessage("D-Star, switching to data mode (Icom)");
m_rfState = RS_RF_DATA;
} else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) {
LogMessage("D-Star, switching to data mode (Icom)");
m_rfState = RS_RF_DATA;
}
}
if (m_rfState == RS_RF_DATA) {
// Regenerate the data mode markers
if (m_rfFrames < 21U) {
if (CUtils::compare(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES);
else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES);
else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES);
}
m_rfBits += 72U;
m_rfErrs = 0U;
m_rfFrames++;
@@ -725,20 +736,31 @@ void CDStarControl::writeNetwork()
writeEndNet();
}
} else if (type == TAG_DATA) {
// Fix any scrambled null data frames
if (CUtils::compare(data + 2U, DSTAR_NULL_FRAME_DATA_SRAMBLED_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 2U, DSTAR_NULL_FRAME_DATA_SRAMBLED_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES);
// Check for the fast data signature
if (m_netState == RS_NET_AUDIO) {
unsigned char slowDataType = data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U] & 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");
// Data signatures only appear at the beginning of the frame
if (m_netState == RS_NET_AUDIO && m_netFrames < 21U) {
if (CUtils::compare(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) {
LogMessage("D-Star, switching to data mode (Kenwood)");
m_netState = RS_NET_DATA;
} else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) {
LogMessage("D-Star, switching to data mode (Icom)");
m_netState = RS_NET_DATA;
} else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) {
LogMessage("D-Star, switching to data mode (Icom)");
m_netState = RS_NET_DATA;
}
}
if (m_netState == RS_NET_DATA) {
// Regenerate the data mode markers
if (m_netFrames < 21U) {
if (CUtils::compare(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES);
else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES);
else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U)
::memcpy(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES);
}
unsigned char n = data[1U];
data[1U] = TAG_DATA;