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

Regenerate the data mode markers.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-11-13 08:47:40 +00:00
parent 18398efe97
commit 54fbacb487
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DStarControl.cpp
View File

@@ -352,6 +352,16 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
} }
if (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_rfBits += 72U;
m_rfErrs = 0U; m_rfErrs = 0U;
m_rfFrames++; m_rfFrames++;
@@ -712,6 +722,16 @@ void CDStarControl::writeNetwork()
} }
if (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]; unsigned char n = data[1U];
data[1U] = TAG_DATA; data[1U] = TAG_DATA;