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

Modem D-Star EOT contains no audio......

Browse Source
This commit is contained in:
Jonathan Naylor
2016-02-01 20:54:08 +00:00
parent 2947888cad
commit 00c15f116c
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DStarControl.cpp
View File

@@ -181,18 +181,14 @@ void CDStarControl::writeModem(unsigned char *data)
} }
} else if (type == TAG_EOT) { } else if (type == TAG_EOT) {
if (m_state == RS_RELAYING_RF_AUDIO) { if (m_state == RS_RELAYING_RF_AUDIO) {
unsigned int errors = m_fec.regenerateDStar(data + 1U);
m_errs += errors;
m_bits += 48U;
if (m_net) { if (m_net) {
for (unsigned int i = 0U; i < 2U; i++) for (unsigned int i = 0U; i < 2U; i++)
writeNetworkData(data, errors, true, false); writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, false);
} }
if (m_duplex) { if (m_duplex) {
for (unsigned int i = 0U; i < 3U; i++) for (unsigned int i = 0U; i < 3U; i++)
writeQueueData(data); writeQueueData(DSTAR_END_PATTERN_BYTES);
} }
m_ackTimer.start(); m_ackTimer.start();
@@ -202,11 +198,9 @@ void CDStarControl::writeModem(unsigned char *data)
writeEndOfTransmission(); writeEndOfTransmission();
} else if (m_state == RS_RELAYING_NETWORK_AUDIO) { } else if (m_state == RS_RELAYING_NETWORK_AUDIO) {
m_fec.regenerateDStar(data + 1U);
if (m_net) { if (m_net) {
for (unsigned int i = 0U; i < 2U; i++) for (unsigned int i = 0U; i < 2U; i++)
writeNetworkData(data, 0U, true, true); writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, true);
} }
} }
} else { } else {

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20160131"; const char* VERSION = "20160201";
#endif #endif