g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-06 06:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into mqtt

Browse source
This commit is contained in:
Jonathan Naylor 2025-08-27 17:02:37 +01:00
commit d085ca8b0f
40 changed files with 211 additions and 3813 deletions
Download patch file Download diff file Expand all files Collapse all files

25
NXDNControl.cpp
View file

@ -995,6 +995,9 @@ void CNXDNControl::clock(unsigned int ms)
if (m_network != nullptr)
writeNetwork();
if (!m_enabled)
return;
m_rfTimeoutTimer.clock(ms);
m_netTimeoutTimer.clock(ms);
@ -1084,6 +1087,18 @@ void CNXDNControl::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("NXDN, RF user has timed out");
}
break;
}
m_rfState = RPT_RF_STATE::LISTENING;
m_rfMask = 0x00U;
@ -1092,6 +1107,16 @@ void CNXDNControl::enable(bool enabled)
m_rfTimeoutTimer.stop();
// Reset the networking section
switch(m_netState) {
case RPT_NET_STATE::IDLE:
break;
default:
if (m_netTimeoutTimer.isRunning()) {
LogMessage("NXDN, network user has timed out");
}
break;
}
m_netState = RPT_NET_STATE::IDLE;
m_netMask = 0x00U;