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

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2025-08-27 17:02:37 +01:00
parent dc0c6b146c 010c1249ee
commit d085ca8b0f
40 changed files with 211 additions and 3813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
DStarControl.cpp
View File

@@ -831,6 +831,9 @@ void CDStarControl::clock()
if (m_network != nullptr)
writeNetwork();
if (!m_enabled)
return;
m_ackTimer.clock(ms);
if (m_ackTimer.isRunning() && m_ackTimer.hasExpired()) {
sendAck();
@@ -1289,11 +1292,33 @@ void CDStarControl::enable(bool enabled)
m_queue.clear();
// Reset the RF section
switch (m_rfState) {
case RPT_RF_STATE::LISTENING:
case RPT_RF_STATE::REJECTED:
case RPT_RF_STATE::INVALID:
break;
default:
if (m_rfTimeoutTimer.isRunning()) {
LogMessage("D-Star, RF user has timed out");
}
break;
}
m_rfState = RPT_RF_STATE::LISTENING;
m_rfTimeoutTimer.stop();
// Reset the networking section
switch(m_netState) {
case RPT_NET_STATE::IDLE:
break;
default:
if (m_netTimeoutTimer.isRunning()) {
LogMessage("D-Star, network user has timed out");
}
break;
}
m_netState = RPT_NET_STATE::IDLE;
m_lastFrameValid = false;