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

Merge branch 'master' into DualInputs

Browse Source
This commit is contained in:
Jonathan Naylor
2021-03-22 22:26:01 +00:00
parent 9725179f85 68b81086a4
commit 53241f2d5f
14 changed files with 544 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DMRNetwork.cpp
View File

@@ -41,6 +41,7 @@ m_name(name),
m_location(location),
m_debug(debug),
m_socket(local),
m_enabled(false),
m_status(WAITING_CONNECT),
m_retryTimer(1000U, 10U),
m_timeoutTimer(1000U, 60U),
@@ -103,6 +104,14 @@ bool CDMRNetwork::open()
return true;
}
void CDMRNetwork::enable(bool enabled)
{
if (!enabled && m_enabled)
m_rxData.clear();
m_enabled = enabled;
}
bool CDMRNetwork::read(CDMRData& data)
{
if (m_status != RUNNING)
@@ -358,10 +367,12 @@ void CDMRNetwork::clock(unsigned int ms)
}
if (::memcmp(m_buffer, "DMRD", 4U) == 0) {
unsigned char len = length;
m_rxData.addData(&len, 1U);
m_rxData.addData(m_buffer, len);
} else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) {
if (m_enabled) {
unsigned char len = length;
m_rxData.addData(&len, 1U);
m_rxData.addData(m_buffer, len);
}
} else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) {
if (m_status == RUNNING) {
LogWarning("%s, Login to the master has failed, retrying login ...", m_name.c_str());
m_status = WAITING_LOGIN;