MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-24 07:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2024-02-02 11:35:50 +00:00
parent f6b4698f14 2b81fe225b
commit b205134508
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DMRNetwork.cpp
View File

@@ -103,6 +103,10 @@ bool CDMRNetwork::open()
LogMessage("%s, Opening DMR Network", m_name.c_str());
WriteJSONStatus("Opening DMR Network: " + m_name);
bool ret = m_socket.open(m_addr);
if (!ret)
return false;
m_status = WAITING_CONNECT;
m_timeoutTimer.stop();
m_retryTimer.start();
@@ -326,16 +330,12 @@ void CDMRNetwork::clock(unsigned int ms)
if (m_status == WAITING_CONNECT) {
m_retryTimer.clock(ms);
if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) {
bool ret = m_socket.open(m_addr);
if (ret) {
ret = writeLogin();
if (!ret)
return;
m_status = WAITING_LOGIN;
m_timeoutTimer.start();
}
bool ret = writeLogin();
if (!ret)
return;
m_status = WAITING_LOGIN;
m_timeoutTimer.start();
m_retryTimer.start();
}