Merge branch 'M17_AX25_FM' into I2C

This commit is contained in:
Jonathan Naylor
2020-12-06 17:06:48 +00:00
26 changed files with 1874 additions and 534 deletions

View File

@@ -227,6 +227,7 @@ m_dstarLocalPort(0U),
m_dstarNetworkModeHang(3U),
m_dstarNetworkDebug(false),
m_dmrNetworkEnabled(false),
m_dmrNetworkType("Gateway"),
m_dmrNetworkAddress(),
m_dmrNetworkPort(0U),
m_dmrNetworkLocal(0U),
@@ -869,6 +870,8 @@ bool CConf::read()
} else if (section == SECTION_DMR_NETWORK) {
if (::strcmp(key, "Enable") == 0)
m_dmrNetworkEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Type") == 0)
m_dmrNetworkType = value;
else if (::strcmp(key, "Address") == 0)
m_dmrNetworkAddress = value;
else if (::strcmp(key, "Port") == 0)
@@ -1884,6 +1887,11 @@ bool CConf::getDMRNetworkEnabled() const
return m_dmrNetworkEnabled;
}
std::string CConf::getDMRNetworkType() const
{
return m_dmrNetworkType;
}
std::string CConf::getDMRNetworkAddress() const
{
return m_dmrNetworkAddress;