mirror of
https://github.com/g4klx/MMDVMHost
synced 2025-12-21 23:45:49 +08:00
Merge branch 'master' into nxdn
This commit is contained in:
4
Conf.h
4
Conf.h
@@ -104,7 +104,7 @@ public:
|
||||
|
||||
// The DMR section
|
||||
bool getDMREnabled() const;
|
||||
bool getDMRBeacons() const;
|
||||
unsigned int getDMRBeacons() const;
|
||||
unsigned int getDMRId() const;
|
||||
unsigned int getDMRColorCode() const;
|
||||
bool getDMREmbeddedLCOnly() const;
|
||||
@@ -297,7 +297,7 @@ private:
|
||||
unsigned int m_dstarModeHang;
|
||||
|
||||
bool m_dmrEnabled;
|
||||
bool m_dmrBeacons;
|
||||
unsigned int m_dmrBeacons;
|
||||
unsigned int m_dmrId;
|
||||
unsigned int m_dmrColorCode;
|
||||
bool m_dmrSelfOnly;
|
||||
|
||||
Reference in New Issue
Block a user