mirror of
https://github.com/g4klx/MMDVMHost
synced 2025-12-20 22:45:44 +08:00
Merge branch 'master' into M17_AX25_FM
This commit is contained in:
4
Conf.h
4
Conf.h
@@ -120,7 +120,7 @@ public:
|
||||
std::vector<std::string> getDStarWhiteList() const;
|
||||
bool getDStarAckReply() const;
|
||||
unsigned int getDStarAckTime() const;
|
||||
bool getDStarAckMessage() const;
|
||||
DSTAR_ACK_MESSAGE getDStarAckMessage() const;
|
||||
bool getDStarErrorReply() const;
|
||||
bool getDStarRemoteGateway() const;
|
||||
unsigned int getDStarModeHang() const;
|
||||
@@ -452,7 +452,7 @@ private:
|
||||
std::vector<std::string> m_dstarWhiteList;
|
||||
bool m_dstarAckReply;
|
||||
unsigned int m_dstarAckTime;
|
||||
bool m_dstarAckMessage;
|
||||
DSTAR_ACK_MESSAGE m_dstarAckMessage;
|
||||
bool m_dstarErrorReply;
|
||||
bool m_dstarRemoteGateway;
|
||||
unsigned int m_dstarModeHang;
|
||||
|
||||
Reference in New Issue
Block a user