Merge branch 'SimpleDMR' into M17

This commit is contained in:
Jonathan Naylor
2020-10-31 21:41:45 +00:00
9 changed files with 64 additions and 8 deletions

2
Conf.h
View File

@@ -48,6 +48,7 @@ public:
unsigned int getLogFileLevel() const;
std::string getLogFilePath() const;
std::string getLogFileRoot() const;
bool getLogFileRotate() const;
// The CW ID section
bool getCWIdEnabled() const;
@@ -338,6 +339,7 @@ private:
unsigned int m_logFileLevel;
std::string m_logFilePath;
std::string m_logFileRoot;
bool m_logFileRotate;
bool m_cwIdEnabled;
unsigned int m_cwIdTime;