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

Final changes for splitting the state machines.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-02-28 17:18:13 +00:00
parent b3d5bec4ad
commit 14a30286c7
4 changed files with 75 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
DStarControl.cpp
View File

@@ -29,14 +29,15 @@ m_gateway(NULL),
m_network(network),
m_display(display),
m_duplex(duplex),
m_queue(1000U, "D-Star Control"),
m_rfQueue(1000U, "D-Star Control"),
m_rfHeader(),
m_netHeader(),
m_rfState(RS_RF_LISTENING),
m_netState(RS_NET_IDLE),
m_net(false),
m_slowData(),
m_n(0U),
m_rfN(0U),
m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U),
m_holdoffTimer(1000U, 0U, 500U),
m_rfTimeoutTimer(1000U, timeout),
@@ -147,6 +148,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_ackTimer.stop();
m_rfFrames = 1U;
m_rfN = 0U;
if (m_duplex) {
// Modify the header
@@ -201,7 +203,6 @@ bool CDStarControl::writeModem(unsigned char *data)
return false;
} 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_rfErrs += errors;
m_rfBits += 48U;
@@ -210,13 +211,15 @@ bool CDStarControl::writeModem(unsigned char *data)
// 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_n = 0U;
m_rfN = 0U;
// Regenerate the sync
if (m_n == 0U)
if (m_rfN == 0U)
CSync::addDStarSync(data + 1U);
m_n = (m_n + 1U) % 21U;
m_rfN = (m_rfN + 1U) % 21U;
LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_rfN, errors);
if (m_net)
writeNetworkDataRF(data, errors, false);
@@ -277,6 +280,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfHeader = *header;
m_rfN = 0U;
m_rfFrames = 1U;
if (m_duplex) {
@@ -309,11 +313,14 @@ bool CDStarControl::writeModem(unsigned char *data)
delete header;
unsigned int errors = m_fec.regenerateDStar(data + 1U);
LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_n, errors);
m_rfErrs += errors;
m_rfBits += 48U;
m_rfN = (m_rfN + 1U) % 21U;
LogDebug("D-Star, audio sequence no. %u, errs: %u/48", m_rfN, errors);
if (m_net)
writeNetworkDataRF(data, errors, false);
@@ -338,7 +345,7 @@ bool CDStarControl::writeModem(unsigned char *data)
unsigned int CDStarControl::readModem(unsigned char* data)
{
if (m_queue.isEmpty())
if (m_rfQueue.isEmpty())
return 0U;
// Don't relay data until the timer has stopped.
@@ -346,9 +353,9 @@ unsigned int CDStarControl::readModem(unsigned char* data)
return 0U;
unsigned char len = 0U;
m_queue.getData(&len, 1U);
m_rfQueue.getData(&len, 1U);
m_queue.getData(data, len);
m_rfQueue.getData(data, len);
return len;
}
@@ -427,7 +434,7 @@ void CDStarControl::writeNetwork()
m_netFrames = 0U;
m_netLost = 0U;
m_n = 0U;
m_netN = 0U;
m_netBits = 1U;
m_netErrs = 0U;
@@ -482,7 +489,7 @@ void CDStarControl::writeNetwork()
if (n == 0U)
CSync::addDStarSync(data + 2U);
m_n = n;
m_netN = n;
m_packetTimer.start();
m_netFrames++;
@@ -563,9 +570,9 @@ void CDStarControl::writeQueueHeaderRF(const unsigned char *data)
return;
unsigned char len = DSTAR_HEADER_LENGTH_BYTES + 1U;
m_queue.addData(&len, 1U);
m_rfQueue.addData(&len, 1U);
m_queue.addData(data, len);
m_rfQueue.addData(data, len);
}
void CDStarControl::writeQueueDataRF(const unsigned char *data)
@@ -579,9 +586,9 @@ void CDStarControl::writeQueueDataRF(const unsigned char *data)
return;
unsigned char len = DSTAR_FRAME_LENGTH_BYTES + 1U;
m_queue.addData(&len, 1U);
m_rfQueue.addData(&len, 1U);
m_queue.addData(data, len);
m_rfQueue.addData(data, len);
}
void CDStarControl::writeQueueEOTRF()
@@ -593,10 +600,10 @@ void CDStarControl::writeQueueEOTRF()
return;
unsigned char len = 1U;
m_queue.addData(&len, 1U);
m_rfQueue.addData(&len, 1U);
unsigned char data = TAG_EOT;
m_queue.addData(&data, len);
m_rfQueue.addData(&data, len);
}
void CDStarControl::writeQueueHeaderNet(const unsigned char *data)
@@ -607,9 +614,9 @@ void CDStarControl::writeQueueHeaderNet(const unsigned char *data)
return;
unsigned char len = DSTAR_HEADER_LENGTH_BYTES + 1U;
m_queue.addData(&len, 1U);
m_rfQueue.addData(&len, 1U);
m_queue.addData(data, len);
m_rfQueue.addData(data, len);
}
void CDStarControl::writeQueueDataNet(const unsigned char *data)
@@ -620,9 +627,9 @@ void CDStarControl::writeQueueDataNet(const unsigned char *data)
return;
unsigned char len = DSTAR_FRAME_LENGTH_BYTES + 1U;
m_queue.addData(&len, 1U);
m_rfQueue.addData(&len, 1U);
m_queue.addData(data, len);
m_rfQueue.addData(data, len);
}
void CDStarControl::writeQueueEOTNet()
@@ -631,10 +638,10 @@ void CDStarControl::writeQueueEOTNet()
return;
unsigned char len = 1U;
m_queue.addData(&len, 1U);
m_rfQueue.addData(&len, 1U);
unsigned char data = TAG_EOT;
m_queue.addData(&data, len);
m_rfQueue.addData(&data, len);
}
void CDStarControl::writeNetworkHeaderRF(const unsigned char* data)
@@ -710,14 +717,14 @@ void CDStarControl::insertSilence(const unsigned char* data, unsigned char seqNo
assert(data != NULL);
// Check to see if we have any spaces to fill?
unsigned char seq = (m_n + 1U) % 21U;
unsigned char seq = (m_netN + 1U) % 21U;
if (seq == seqNo) {
// Just copy the data, nothing else to do here
::memcpy(m_lastFrame, data, DSTAR_FRAME_LENGTH_BYTES + 1U);
return;
}
unsigned int oldSeqNo = (m_n + 1U) % 21U;
unsigned int oldSeqNo = (m_netN + 1U) % 21U;
unsigned int newSeqNo = seqNo;
unsigned int count;
@@ -734,7 +741,7 @@ void CDStarControl::insertSilence(const unsigned char* data, unsigned char seqNo
void CDStarControl::insertSilence(unsigned int count)
{
unsigned char n = (m_n + 1U) % 21U;
unsigned char n = (m_netN + 1U) % 21U;
for (unsigned int i = 0U; i < count; i++) {
if (i < 3U) {
@@ -746,7 +753,7 @@ void CDStarControl::insertSilence(unsigned int count)
writeQueueDataNet(DSTAR_NULL_FRAME_DATA_BYTES);
}
m_n = n;
m_netN = n;
m_netFrames++;
m_netLost++;