Merge branch 'SimpleDMR' into M17

This commit is contained in:
Jonathan Naylor 2020-10-30 13:58:32 +00:00
commit cd5624c2fb
8 changed files with 39 additions and 12 deletions

2
Conf.h
View file

@ -107,6 +107,7 @@ public:
std::string getDStarModule() const;
bool getDStarSelfOnly() const;
std::vector<std::string> getDStarBlackList() const;
std::vector<std::string> getDStarWhiteList() const;
bool getDStarAckReply() const;
unsigned int getDStarAckTime() const;
bool getDStarAckMessage() const;
@ -389,6 +390,7 @@ private:
std::string m_dstarModule;
bool m_dstarSelfOnly;
std::vector<std::string> m_dstarBlackList;
std::vector<std::string> m_dstarWhiteList;
bool m_dstarAckReply;
unsigned int m_dstarAckTime;
bool m_dstarAckMessage;