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

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-16 12:24:03 +01:00
parent d563acbe4a d3f8c17bc8
commit 99d6ea8b63
6 changed files with 203 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
DStarControl.cpp
View File

@@ -60,7 +60,8 @@ m_netHeader(),
m_rfState(RS_RF_LISTENING),
m_netState(RS_NET_IDLE),
m_net(false),
m_slowData(),
m_rfSlowData(),
m_netSlowData(),
m_rfN(0U),
m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U),
@@ -384,6 +385,8 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rssiAccum = m_rssi;
m_rssiCount = 1U;
m_rfSlowData.start();
if (m_duplex) {
// Modify the header
header.setRepeater(false);
@@ -465,15 +468,17 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
} else 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_rfSlowData.start();
m_rfState = RS_RF_LATE_ENTRY;
}
return false;
} else if (m_rfState == RS_RF_AUDIO) {
// 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)
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
m_rfSlowData.start();
m_rfN = 0U;
}
// Regenerate the sync and send the RSSI data to the display
if (m_rfN == 0U) {
@@ -495,6 +500,10 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
writeJSONBER();
const unsigned char* text = m_rfSlowData.addText(data + 1U);
if (text != NULL)
LogMessage("D-Star, slow data text = \"%s\"", text);
if (m_net) {
if (m_rfN == 1U)
writeNetworkDataRF(m_rfVoiceSyncData, 0U, false);
@@ -513,11 +522,11 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
} 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();
m_rfSlowData.reset();
return false;
}
CDStarHeader* header = m_slowData.add(data + 1U);
CDStarHeader* header = m_rfSlowData.addHeader(data + 1U);
if (header == NULL)
return false;
@@ -841,8 +850,14 @@ void CDStarControl::writeNetwork()
m_netN = n;
// Regenerate the sync
if (n == 0U)
if (n == 0U) {
CSync::addDStarSync(data + 2U);
m_netSlowData.start();
}
const unsigned char* text = m_netSlowData.addText(data + 2U);
if (text != NULL)
LogMessage("D-Star, slow data text = \"%s\"", text);
m_packetTimer.start();
m_netFrames++;
@@ -1255,12 +1270,12 @@ void CDStarControl::sendAck()
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
}
m_slowData.setText(text);
m_rfSlowData.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);
m_rfSlowData.getSlowData(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES);
writeQueueDataRF(data);
}
@@ -1320,12 +1335,12 @@ void CDStarControl::sendError()
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
}
m_slowData.setText(text);
m_rfSlowData.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);
m_rfSlowData.getSlowData(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES);
writeQueueDataRF(data);
}