Merge branch 'master' into M17_AX25_FM

This commit is contained in:
Jonathan Naylor
2020-12-06 16:46:10 +00:00
26 changed files with 1871 additions and 534 deletions

2
Conf.h
View File

@@ -228,6 +228,7 @@ public:
// The DMR Network section
bool getDMRNetworkEnabled() const;
std::string getDMRNetworkType() const;
std::string getDMRNetworkAddress() const;
unsigned int getDMRNetworkPort() const;
unsigned int getDMRNetworkLocal() const;
@@ -530,6 +531,7 @@ private:
bool m_dstarNetworkDebug;
bool m_dmrNetworkEnabled;
std::string m_dmrNetworkType;
std::string m_dmrNetworkAddress;
unsigned int m_dmrNetworkPort;
unsigned int m_dmrNetworkLocal;