Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2023-06-07 11:38:23 +01:00
12 changed files with 182 additions and 139 deletions

View File

@@ -656,6 +656,8 @@ void CDStarControl::writeEndRF()
{
m_rfState = RS_RF_LISTENING;
m_rfTimeoutTimer.stop();
if (m_netState == RS_NET_IDLE) {
m_display->clearDStar();
@@ -663,8 +665,6 @@ void CDStarControl::writeEndRF()
if (m_network != NULL)
m_network->reset();
} else {
m_rfTimeoutTimer.stop();
}
}