mirror of
https://github.com/g4klx/MMDVMHost
synced 2026-02-05 06:05:42 +08:00
Split RF and network statues for all modes.
This commit is contained in:
Jonathan Naylor
373
DStarControl.cpp
373
DStarControl.cpp
@@ -30,22 +30,28 @@ m_network(network),
|
||||
m_display(display),
|
||||
m_duplex(duplex),
|
||||
m_queue(1000U, "D-Star Control"),
|
||||
m_header(),
|
||||
m_state(RS_LISTENING),
|
||||
m_rfHeader(),
|
||||
m_netHeader(),
|
||||
m_rfState(RS_RF_LISTENING),
|
||||
m_netState(RS_NET_IDLE),
|
||||
m_net(false),
|
||||
m_slowData(),
|
||||
m_n(0U),
|
||||
m_networkWatchdog(1000U, 0U, 1500U),
|
||||
m_holdoffTimer(1000U, 0U, 500U),
|
||||
m_timeoutTimer(1000U, timeout),
|
||||
m_rfTimeoutTimer(1000U, timeout),
|
||||
m_netTimeoutTimer(1000U, timeout),
|
||||
m_packetTimer(1000U, 0U, 200U),
|
||||
m_ackTimer(1000U, 0U, 750U),
|
||||
m_elapsed(),
|
||||
m_frames(0U),
|
||||
m_lost(0U),
|
||||
m_rfFrames(0U),
|
||||
m_netFrames(0U),
|
||||
m_netLost(0U),
|
||||
m_fec(),
|
||||
m_bits(0U),
|
||||
m_errs(0U),
|
||||
m_rfBits(0U),
|
||||
m_netBits(0U),
|
||||
m_rfErrs(0U),
|
||||
m_netErrs(0U),
|
||||
m_lastFrame(NULL),
|
||||
m_fp(NULL)
|
||||
{
|
||||
@@ -83,17 +89,16 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
{
|
||||
unsigned char type = data[0U];
|
||||
|
||||
if (type == TAG_LOST && m_state == RS_RELAYING_RF_AUDIO) {
|
||||
if (m_bits == 0U) m_bits = 1U;
|
||||
LogMessage("D-Star, transmission lost, %.1f seconds, BER: %.1f%%", float(m_frames) / 50.0F, float(m_errs * 100U) / float(m_bits));
|
||||
m_ackTimer.start();
|
||||
writeEndOfTransmission();
|
||||
if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) {
|
||||
if (m_rfBits == 0U) m_rfBits = 1U;
|
||||
LogMessage("D-Star, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
writeEndRF();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (type == TAG_LOST) {
|
||||
if (m_state == RS_LATE_ENTRY)
|
||||
m_state = RS_LISTENING;
|
||||
if (m_rfState == RS_RF_LATE_ENTRY)
|
||||
m_rfState = RS_RF_LISTENING;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -129,98 +134,79 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
|
||||
m_net = ::memcmp(gateway, m_gateway, DSTAR_LONG_CALLSIGN_LENGTH) == 0;
|
||||
|
||||
if (m_state == RS_LISTENING) {
|
||||
// Only start the timeout if not already running
|
||||
if (!m_timeoutTimer.isRunning()) {
|
||||
m_timeoutTimer.start();
|
||||
m_bits = 1U;
|
||||
m_errs = 0U;
|
||||
}
|
||||
// Only start the timeout if not already running
|
||||
if (!m_rfTimeoutTimer.isRunning()) {
|
||||
m_rfTimeoutTimer.start();
|
||||
m_rfBits = 1U;
|
||||
m_rfErrs = 0U;
|
||||
}
|
||||
|
||||
m_header = header;
|
||||
m_rfHeader = header;
|
||||
|
||||
m_networkWatchdog.stop();
|
||||
m_holdoffTimer.stop();
|
||||
m_ackTimer.stop();
|
||||
m_holdoffTimer.stop();
|
||||
m_ackTimer.stop();
|
||||
|
||||
m_frames = 1U;
|
||||
m_lost = 0U;
|
||||
m_rfFrames = 1U;
|
||||
|
||||
m_n = 0U;
|
||||
if (m_duplex) {
|
||||
// Modify the header
|
||||
header.setRepeater(false);
|
||||
header.setRPTCall1(m_callsign);
|
||||
header.setRPTCall2(m_callsign);
|
||||
header.get(data + 1U);
|
||||
|
||||
if (m_duplex) {
|
||||
// Modify the header
|
||||
header.setRepeater(false);
|
||||
header.setRPTCall1(m_callsign);
|
||||
header.setRPTCall2(m_callsign);
|
||||
header.get(data + 1U);
|
||||
writeQueueHeaderRF(data);
|
||||
}
|
||||
|
||||
writeQueueHeader(data);
|
||||
}
|
||||
if (m_net) {
|
||||
// Modify the header
|
||||
header.setRepeater(false);
|
||||
header.setRPTCall1(m_callsign);
|
||||
header.setRPTCall2(m_gateway);
|
||||
header.get(data + 1U);
|
||||
|
||||
if (m_net) {
|
||||
// Modify the header
|
||||
header.setRepeater(false);
|
||||
header.setRPTCall1(m_callsign);
|
||||
header.setRPTCall2(m_gateway);
|
||||
header.get(data + 1U);
|
||||
for (unsigned i = 0U; i < 3U; i++)
|
||||
writeNetworkHeaderRF(data);
|
||||
}
|
||||
|
||||
for (unsigned i = 0U; i < 3U; i++)
|
||||
writeNetworkHeader(data, false);
|
||||
}
|
||||
|
||||
m_state = RS_RELAYING_RF_AUDIO;
|
||||
m_rfState = RS_RF_AUDIO;
|
||||
|
||||
if (m_netState == RS_NET_IDLE)
|
||||
m_display->writeDStar((char*)my1, (char*)my2, (char*)your);
|
||||
|
||||
LogMessage("D-Star, received RF header from %8.8s/%4.4s to %8.8s", my1, my2, your);
|
||||
} else if (m_state == RS_RELAYING_NETWORK_AUDIO) {
|
||||
if (m_net) {
|
||||
for (unsigned i = 0U; i < 3U; i++)
|
||||
writeNetworkHeader(data, true);
|
||||
}
|
||||
|
||||
LogMessage("D-Star, received RF busy header from %8.8s/%4.4s to %8.8s", my1, my2, your);
|
||||
|
||||
return false;
|
||||
}
|
||||
LogMessage("D-Star, received RF header from %8.8s/%4.4s to %8.8s", my1, my2, your);
|
||||
} else if (type == TAG_EOT) {
|
||||
if (m_state == RS_RELAYING_RF_AUDIO) {
|
||||
if (m_rfState == RS_RF_AUDIO) {
|
||||
if (m_net)
|
||||
writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, false);
|
||||
writeNetworkDataRF(DSTAR_END_PATTERN_BYTES, 0U, true);
|
||||
|
||||
if (m_duplex)
|
||||
writeQueueEOT();
|
||||
writeQueueEOTRF();
|
||||
|
||||
m_ackTimer.start();
|
||||
if (m_rfBits == 0U) m_rfBits = 1U;
|
||||
LogMessage("D-Star, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
|
||||
if (m_bits == 0U) m_bits = 1U;
|
||||
LogMessage("D-Star, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_frames) / 50.0F, float(m_errs * 100U) / float(m_bits));
|
||||
|
||||
writeEndOfTransmission();
|
||||
} else if (m_state == RS_RELAYING_NETWORK_AUDIO) {
|
||||
if (m_net)
|
||||
writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, true);
|
||||
writeEndRF();
|
||||
}
|
||||
|
||||
return false;
|
||||
} else if (type == TAG_DATA) {
|
||||
if (m_state == RS_LISTENING) {
|
||||
if (m_rfState == RS_RF_LISTENING) {
|
||||
// The sync is regenerated by the modem so can do exact match
|
||||
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
|
||||
m_slowData.start();
|
||||
m_state = RS_LATE_ENTRY;
|
||||
m_rfState = RS_RF_LATE_ENTRY;
|
||||
}
|
||||
|
||||
return false;
|
||||
} else if (m_state == RS_RELAYING_RF_AUDIO) {
|
||||
} else if (m_rfState == RS_RF_AUDIO) {
|
||||
unsigned int errors = m_fec.regenerateDStar(data + 1U);
|
||||
LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_n, errors);
|
||||
|
||||
m_errs += errors;
|
||||
m_bits += 48U;
|
||||
m_rfErrs += errors;
|
||||
m_rfBits += 48U;
|
||||
|
||||
m_frames++;
|
||||
m_rfFrames++;
|
||||
|
||||
// The sync is regenerated by the modem so can do exact match
|
||||
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0)
|
||||
@@ -233,20 +219,13 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
m_n = (m_n + 1U) % 21U;
|
||||
|
||||
if (m_net)
|
||||
writeNetworkData(data, errors, false, false);
|
||||
writeNetworkDataRF(data, errors, false);
|
||||
|
||||
if (m_duplex) {
|
||||
blankDTMF(data + 1U);
|
||||
writeQueueData(data);
|
||||
writeQueueDataRF(data);
|
||||
}
|
||||
} else if (m_state == RS_RELAYING_NETWORK_AUDIO) {
|
||||
m_fec.regenerateDStar(data + 1U);
|
||||
|
||||
if (m_net)
|
||||
writeNetworkData(data, 0U, false, true);
|
||||
|
||||
return false;
|
||||
} else if (m_state == RS_LATE_ENTRY) {
|
||||
} else if (m_rfState == RS_RF_LATE_ENTRY) {
|
||||
// The sync is regenerated by the modem so can do exact match
|
||||
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
|
||||
m_slowData.reset();
|
||||
@@ -287,22 +266,18 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
m_net = ::memcmp(gateway, m_gateway, DSTAR_LONG_CALLSIGN_LENGTH) == 0;
|
||||
|
||||
// Only reset the timeout if the timeout is not running
|
||||
if (!m_timeoutTimer.isRunning()) {
|
||||
m_timeoutTimer.start();
|
||||
m_bits = 1U;
|
||||
m_errs = 0U;
|
||||
if (!m_rfTimeoutTimer.isRunning()) {
|
||||
m_rfTimeoutTimer.start();
|
||||
m_rfBits = 1U;
|
||||
m_rfErrs = 0U;
|
||||
}
|
||||
|
||||
// Create a dummy start frame to replace the received frame
|
||||
m_networkWatchdog.stop();
|
||||
m_ackTimer.stop();
|
||||
|
||||
m_header = *header;
|
||||
m_rfHeader = *header;
|
||||
|
||||
m_frames = 1U;
|
||||
m_lost = 0U;
|
||||
|
||||
m_n = 1U;
|
||||
m_rfFrames = 1U;
|
||||
|
||||
if (m_duplex) {
|
||||
unsigned char start[DSTAR_HEADER_LENGTH_BYTES + 1U];
|
||||
@@ -314,7 +289,7 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
header->setRPTCall2(m_callsign);
|
||||
header->get(start + 1U);
|
||||
|
||||
writeQueueHeader(start);
|
||||
writeQueueHeaderRF(start);
|
||||
}
|
||||
|
||||
if (m_net) {
|
||||
@@ -328,7 +303,7 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
header->get(start + 1U);
|
||||
|
||||
for (unsigned int i = 0U; i < 3U; i++)
|
||||
writeNetworkHeader(start, false);
|
||||
writeNetworkHeaderRF(start);
|
||||
}
|
||||
|
||||
delete header;
|
||||
@@ -336,20 +311,21 @@ bool CDStarControl::writeModem(unsigned char *data)
|
||||
unsigned int errors = m_fec.regenerateDStar(data + 1U);
|
||||
LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_n, errors);
|
||||
|
||||
m_errs += errors;
|
||||
m_bits += 48U;
|
||||
m_rfErrs += errors;
|
||||
m_rfBits += 48U;
|
||||
|
||||
if (m_net)
|
||||
writeNetworkData(data, errors, false, false);
|
||||
writeNetworkDataRF(data, errors, false);
|
||||
|
||||
if (m_duplex) {
|
||||
blankDTMF(data + 1U);
|
||||
writeQueueData(data);
|
||||
writeQueueDataRF(data);
|
||||
}
|
||||
|
||||
m_state = RS_RELAYING_RF_AUDIO;
|
||||
m_rfState = RS_RF_AUDIO;
|
||||
|
||||
m_display->writeDStar((char*)my1, (char*)my2, (char*)your);
|
||||
if (m_netState == RS_NET_IDLE)
|
||||
m_display->writeDStar((char*)my1, (char*)my2, (char*)your);
|
||||
|
||||
LogMessage("D-Star, received RF late entry from %8.8s/%4.4s to %8.8s", my1, my2, your);
|
||||
}
|
||||
@@ -377,12 +353,28 @@ unsigned int CDStarControl::readModem(unsigned char* data)
|
||||
return len;
|
||||
}
|
||||
|
||||
void CDStarControl::writeEndOfTransmission()
|
||||
void CDStarControl::writeEndRF()
|
||||
{
|
||||
m_state = RS_LISTENING;
|
||||
m_rfState = RS_RF_LISTENING;
|
||||
|
||||
if (m_netState == RS_NET_IDLE) {
|
||||
m_display->clearDStar();
|
||||
m_ackTimer.start();
|
||||
|
||||
if (m_network != NULL)
|
||||
m_network->reset();
|
||||
} else {
|
||||
m_rfTimeoutTimer.stop();
|
||||
}
|
||||
}
|
||||
|
||||
void CDStarControl::writeEndNet()
|
||||
{
|
||||
m_netState = RS_NET_IDLE;
|
||||
|
||||
m_display->clearDStar();
|
||||
|
||||
m_netTimeoutTimer.stop();
|
||||
m_networkWatchdog.stop();
|
||||
m_packetTimer.stop();
|
||||
|
||||
@@ -403,7 +395,7 @@ void CDStarControl::writeNetwork()
|
||||
if (length == 0U)
|
||||
return;
|
||||
|
||||
if (m_state == RS_RELAYING_RF_AUDIO || m_state == RS_LATE_ENTRY)
|
||||
if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE)
|
||||
return;
|
||||
|
||||
m_networkWatchdog.start();
|
||||
@@ -411,7 +403,7 @@ void CDStarControl::writeNetwork()
|
||||
unsigned char type = data[0U];
|
||||
|
||||
if (type == TAG_HEADER) {
|
||||
if (m_state != RS_LISTENING)
|
||||
if (m_netState != RS_NET_IDLE)
|
||||
return;
|
||||
|
||||
CDStarHeader header(data + 1U);
|
||||
@@ -425,39 +417,39 @@ void CDStarControl::writeNetwork()
|
||||
unsigned char your[DSTAR_LONG_CALLSIGN_LENGTH];
|
||||
header.getYourCall(your);
|
||||
|
||||
m_header = header;
|
||||
m_netHeader = header;
|
||||
|
||||
m_timeoutTimer.start();
|
||||
m_netTimeoutTimer.start();
|
||||
m_packetTimer.start();
|
||||
m_elapsed.start();
|
||||
m_ackTimer.stop();
|
||||
|
||||
m_frames = 0U;
|
||||
m_lost = 0U;
|
||||
m_netFrames = 0U;
|
||||
m_netLost = 0U;
|
||||
|
||||
m_n = 0U;
|
||||
|
||||
m_bits = 1U;
|
||||
m_errs = 0U;
|
||||
m_netBits = 1U;
|
||||
m_netErrs = 0U;
|
||||
|
||||
writeQueueHeader(data);
|
||||
writeQueueHeaderNet(data);
|
||||
|
||||
#if defined(DUMP_DSTAR)
|
||||
openFile();
|
||||
writeFile(data + 1U, length - 1U);
|
||||
#endif
|
||||
m_state = RS_RELAYING_NETWORK_AUDIO;
|
||||
m_netState = RS_NET_AUDIO;
|
||||
|
||||
m_display->writeDStar((char*)my1, (char*)my2, (char*)your);
|
||||
|
||||
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
|
||||
} else if (type == TAG_EOT) {
|
||||
if (m_state != RS_RELAYING_NETWORK_AUDIO)
|
||||
if (m_netState != RS_NET_AUDIO)
|
||||
return;
|
||||
|
||||
m_timeoutTimer.stop();
|
||||
m_netTimeoutTimer.stop();
|
||||
|
||||
writeQueueEOT();
|
||||
writeQueueEOTNet();
|
||||
|
||||
data[1U] = TAG_EOT;
|
||||
|
||||
@@ -466,13 +458,13 @@ void CDStarControl::writeNetwork()
|
||||
closeFile();
|
||||
#endif
|
||||
// We've received the header and EOT haven't we?
|
||||
m_frames += 2U;
|
||||
if (m_bits == 0U) m_bits = 1U;
|
||||
LogMessage("D-Star, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_frames) / 50.0F, (m_lost * 100U) / m_frames, float(m_errs * 100U) / float(m_bits));
|
||||
m_netFrames += 2U;
|
||||
if (m_netBits == 0U) m_netBits = 1U;
|
||||
LogMessage("D-Star, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
|
||||
|
||||
writeEndOfTransmission();
|
||||
writeEndNet();
|
||||
} else if (type == TAG_DATA) {
|
||||
if (m_state != RS_RELAYING_NETWORK_AUDIO)
|
||||
if (m_netState != RS_NET_AUDIO)
|
||||
return;
|
||||
|
||||
unsigned char n = data[1U];
|
||||
@@ -481,8 +473,8 @@ void CDStarControl::writeNetwork()
|
||||
|
||||
unsigned int errors = m_fec.regenerateDStar(data + 2U);
|
||||
|
||||
m_errs += errors;
|
||||
m_bits += 48U;
|
||||
m_netErrs += errors;
|
||||
m_netBits += 48U;
|
||||
|
||||
blankDTMF(data + 2U);
|
||||
|
||||
@@ -493,14 +485,14 @@ void CDStarControl::writeNetwork()
|
||||
m_n = n;
|
||||
|
||||
m_packetTimer.start();
|
||||
m_frames++;
|
||||
m_netFrames++;
|
||||
|
||||
data[1U] = TAG_DATA;
|
||||
|
||||
#if defined(DUMP_DSTAR)
|
||||
writeFile(data + 1U, length - 1U);
|
||||
#endif
|
||||
writeQueueData(data + 1U);
|
||||
writeQueueDataNet(data + 1U);
|
||||
} else {
|
||||
CUtils::dump("D-Star, unknown data from network", data, DSTAR_FRAME_LENGTH_BYTES + 1U);
|
||||
}
|
||||
@@ -521,35 +513,36 @@ void CDStarControl::clock(unsigned int ms)
|
||||
if (m_holdoffTimer.isRunning() && m_holdoffTimer.hasExpired())
|
||||
m_holdoffTimer.stop();
|
||||
|
||||
m_timeoutTimer.clock(ms);
|
||||
m_rfTimeoutTimer.clock(ms);
|
||||
m_netTimeoutTimer.clock(ms);
|
||||
|
||||
if (m_state == RS_RELAYING_NETWORK_AUDIO) {
|
||||
if (m_netState == RS_NET_AUDIO) {
|
||||
m_networkWatchdog.clock(ms);
|
||||
|
||||
if (m_networkWatchdog.hasExpired()) {
|
||||
// We're received the header haven't we?
|
||||
m_frames += 1U;
|
||||
if (m_bits == 0U) m_bits = 1U;
|
||||
LogMessage("D-Star, network watchdog has expired, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_frames) / 50.0F, (m_lost * 100U) / m_frames, float(m_errs * 100U) / float(m_bits));
|
||||
m_timeoutTimer.stop();
|
||||
writeEndOfTransmission();
|
||||
m_netFrames += 1U;
|
||||
if (m_netBits == 0U) m_netBits = 1U;
|
||||
LogMessage("D-Star, network watchdog has expired, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
|
||||
m_netTimeoutTimer.stop();
|
||||
writeEndNet();
|
||||
#if defined(DUMP_DSTAR)
|
||||
closeFile();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
if (m_state == RS_RELAYING_NETWORK_AUDIO) {
|
||||
if (m_netState == RS_NET_AUDIO) {
|
||||
m_packetTimer.clock(ms);
|
||||
|
||||
if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
|
||||
unsigned int elapsed = m_elapsed.elapsed();
|
||||
unsigned int frames = elapsed / DSTAR_FRAME_TIME;
|
||||
|
||||
if (frames > m_frames) {
|
||||
unsigned int count = frames - m_frames;
|
||||
if (frames > m_netFrames) {
|
||||
unsigned int count = frames - m_netFrames;
|
||||
if (count > 5U) {
|
||||
LogMessage("D-Star, lost audio for 200ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_frames);
|
||||
LogMessage("D-Star, lost audio for 200ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames);
|
||||
insertSilence(count - 2U);
|
||||
}
|
||||
}
|
||||
@@ -559,11 +552,14 @@ void CDStarControl::clock(unsigned int ms)
|
||||
}
|
||||
}
|
||||
|
||||
void CDStarControl::writeQueueHeader(const unsigned char *data)
|
||||
void CDStarControl::writeQueueHeaderRF(const unsigned char *data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired())
|
||||
if (m_netState != RS_NET_IDLE)
|
||||
return;
|
||||
|
||||
if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
unsigned char len = DSTAR_HEADER_LENGTH_BYTES + 1U;
|
||||
@@ -572,11 +568,14 @@ void CDStarControl::writeQueueHeader(const unsigned char *data)
|
||||
m_queue.addData(data, len);
|
||||
}
|
||||
|
||||
void CDStarControl::writeQueueData(const unsigned char *data)
|
||||
void CDStarControl::writeQueueDataRF(const unsigned char *data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired())
|
||||
if (m_netState != RS_NET_IDLE)
|
||||
return;
|
||||
|
||||
if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
unsigned char len = DSTAR_FRAME_LENGTH_BYTES + 1U;
|
||||
@@ -585,9 +584,12 @@ void CDStarControl::writeQueueData(const unsigned char *data)
|
||||
m_queue.addData(data, len);
|
||||
}
|
||||
|
||||
void CDStarControl::writeQueueEOT()
|
||||
void CDStarControl::writeQueueEOTRF()
|
||||
{
|
||||
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired())
|
||||
if (m_netState != RS_NET_IDLE)
|
||||
return;
|
||||
|
||||
if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
unsigned char len = 1U;
|
||||
@@ -597,21 +599,45 @@ void CDStarControl::writeQueueEOT()
|
||||
m_queue.addData(&data, len);
|
||||
}
|
||||
|
||||
void CDStarControl::writeNetworkHeader(const unsigned char* data, bool busy)
|
||||
void CDStarControl::writeQueueHeaderNet(const unsigned char *data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
if (m_network == NULL)
|
||||
if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
// Don't send to the network if the timeout has expired
|
||||
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired())
|
||||
return;
|
||||
unsigned char len = DSTAR_HEADER_LENGTH_BYTES + 1U;
|
||||
m_queue.addData(&len, 1U);
|
||||
|
||||
m_network->writeHeader(data + 1U, DSTAR_HEADER_LENGTH_BYTES, busy);
|
||||
m_queue.addData(data, len);
|
||||
}
|
||||
|
||||
void CDStarControl::writeNetworkData(const unsigned char* data, unsigned int errors, bool end, bool busy)
|
||||
void CDStarControl::writeQueueDataNet(const unsigned char *data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
unsigned char len = DSTAR_FRAME_LENGTH_BYTES + 1U;
|
||||
m_queue.addData(&len, 1U);
|
||||
|
||||
m_queue.addData(data, len);
|
||||
}
|
||||
|
||||
void CDStarControl::writeQueueEOTNet()
|
||||
{
|
||||
if (m_netTimeoutTimer.isRunning() && m_netTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
unsigned char len = 1U;
|
||||
m_queue.addData(&len, 1U);
|
||||
|
||||
unsigned char data = TAG_EOT;
|
||||
m_queue.addData(&data, len);
|
||||
}
|
||||
|
||||
void CDStarControl::writeNetworkHeaderRF(const unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
@@ -619,11 +645,24 @@ void CDStarControl::writeNetworkData(const unsigned char* data, unsigned int err
|
||||
return;
|
||||
|
||||
// Don't send to the network if the timeout has expired
|
||||
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired())
|
||||
if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
// XXX
|
||||
m_network->writeData(data + 1U, DSTAR_FRAME_LENGTH_BYTES, errors, end, busy);
|
||||
m_network->writeHeader(data + 1U, DSTAR_HEADER_LENGTH_BYTES, m_netState != RS_NET_IDLE);
|
||||
}
|
||||
|
||||
void CDStarControl::writeNetworkDataRF(const unsigned char* data, unsigned int errors, bool end)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
if (m_network == NULL)
|
||||
return;
|
||||
|
||||
// Don't send to the network if the timeout has expired
|
||||
if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired())
|
||||
return;
|
||||
|
||||
m_network->writeData(data + 1U, DSTAR_FRAME_LENGTH_BYTES, errors, end, m_netState != RS_NET_IDLE);
|
||||
}
|
||||
|
||||
bool CDStarControl::openFile()
|
||||
@@ -699,18 +738,18 @@ void CDStarControl::insertSilence(unsigned int count)
|
||||
|
||||
for (unsigned int i = 0U; i < count; i++) {
|
||||
if (i < 3U) {
|
||||
writeQueueData(m_lastFrame);
|
||||
writeQueueDataNet(m_lastFrame);
|
||||
} else {
|
||||
if (n == 0U)
|
||||
writeQueueData(DSTAR_NULL_FRAME_SYNC_BYTES);
|
||||
writeQueueDataNet(DSTAR_NULL_FRAME_SYNC_BYTES);
|
||||
else
|
||||
writeQueueData(DSTAR_NULL_FRAME_DATA_BYTES);
|
||||
writeQueueDataNet(DSTAR_NULL_FRAME_DATA_BYTES);
|
||||
}
|
||||
|
||||
m_n = n;
|
||||
|
||||
m_frames++;
|
||||
m_lost++;
|
||||
m_netFrames++;
|
||||
m_netLost++;
|
||||
|
||||
n = (n + 1U) % 21U;
|
||||
}
|
||||
@@ -733,10 +772,10 @@ void CDStarControl::blankDTMF(unsigned char* data) const
|
||||
|
||||
void CDStarControl::sendAck()
|
||||
{
|
||||
m_timeoutTimer.stop();
|
||||
m_rfTimeoutTimer.stop();
|
||||
|
||||
unsigned char user[DSTAR_LONG_CALLSIGN_LENGTH];
|
||||
m_header.getMyCall1(user);
|
||||
m_rfHeader.getMyCall1(user);
|
||||
|
||||
CDStarHeader header;
|
||||
header.setUnavailable(true);
|
||||
@@ -749,9 +788,9 @@ void CDStarControl::sendAck()
|
||||
header.get(data + 1U);
|
||||
data[0U] = TAG_HEADER;
|
||||
|
||||
writeQueueHeader(data);
|
||||
writeQueueHeaderRF(data);
|
||||
|
||||
writeQueueData(DSTAR_NULL_FRAME_SYNC_BYTES);
|
||||
writeQueueDataRF(DSTAR_NULL_FRAME_SYNC_BYTES);
|
||||
|
||||
LINK_STATUS status = LS_NONE;
|
||||
unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH];
|
||||
@@ -760,17 +799,17 @@ void CDStarControl::sendAck()
|
||||
|
||||
char text[40U];
|
||||
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
|
||||
::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_errs * 100U) / float(m_bits));
|
||||
::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
else
|
||||
::sprintf(text, "BER: %.1f%% ", float(m_errs * 100U) / float(m_bits));
|
||||
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
|
||||
m_slowData.setText(text);
|
||||
|
||||
::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U);
|
||||
|
||||
for (unsigned int i = 0U; i < 19U; i++) {
|
||||
m_slowData.get(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES);
|
||||
writeQueueData(data);
|
||||
writeQueueDataRF(data);
|
||||
}
|
||||
|
||||
writeQueueEOT();
|
||||
writeQueueEOTRF();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user