g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-04-07 15:34:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into XLXs

Browse source
This commit is contained in:
Jonathan Naylor 2017-09-16 14:50:30 +01:00
commit 5faeeed423
5 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Conf.h
View file

@ -91,6 +91,7 @@ public:
unsigned int getDMRNetwork1Local() const;
std::string getDMRNetwork1Password() const;
std::string getDMRNetwork1Options() const;
bool getDMRNetwork1Location() const;
bool getDMRNetwork1Debug() const;
std::vector<CTGRewriteStruct> getDMRNetwork1TGRewrites() const;
std::vector<CPCRewriteStruct> getDMRNetwork1PCRewrites() const;
@ -108,6 +109,7 @@ public:
unsigned int getDMRNetwork2Local() const;
std::string getDMRNetwork2Password() const;
std::string getDMRNetwork2Options() const;
bool getDMRNetwork2Location() const;
bool getDMRNetwork2Debug() const;
std::vector<CTGRewriteStruct> getDMRNetwork2TGRewrites() const;
std::vector<CPCRewriteStruct> getDMRNetwork2PCRewrites() const;
@ -156,6 +158,7 @@ private:
unsigned int m_dmrNetwork1Local;
std::string m_dmrNetwork1Password;
std::string m_dmrNetwork1Options;
bool m_dmrNetwork1Location;
bool m_dmrNetwork1Debug;
std::vector<CTGRewriteStruct> m_dmrNetwork1TGRewrites;
std::vector<CPCRewriteStruct> m_dmrNetwork1PCRewrites;
@ -172,6 +175,7 @@ private:
unsigned int m_dmrNetwork2Local;
std::string m_dmrNetwork2Password;
std::string m_dmrNetwork2Options;
bool m_dmrNetwork2Location;
bool m_dmrNetwork2Debug;
std::vector<CTGRewriteStruct> m_dmrNetwork2TGRewrites;
std::vector<CPCRewriteStruct> m_dmrNetwork2PCRewrites;