MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-24 07:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the unified rewriting code.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-05-14 18:14:09 +01:00
parent 25bc41e408
commit 1e5d387d81
14 changed files with 396 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Conf.h
View File

@@ -22,13 +22,21 @@
#include <string>
#include <vector>
struct CRewriteStruct {
struct CTGRewriteStruct {
unsigned int m_fromSlot;
unsigned int m_fromTG;
unsigned int m_toSlot;
unsigned int m_toTG;
};
struct CPCRewriteStruct {
unsigned int m_fromSlot;
unsigned int m_fromId;
unsigned int m_toSlot;
unsigned int m_toId;
unsigned int m_range;
};
class CConf
{
public:
@@ -65,9 +73,8 @@ public:
unsigned int getDMRNetwork1Local() const;
std::string getDMRNetwork1Password() const;
bool getDMRNetwork1Debug() const;
std::vector<CRewriteStruct> getDMRNetwork1TGRewrites() const;
bool getDMRNetwork1PrivateSlot1() const;
bool getDMRNetwork1PrivateSlot2() const;
std::vector<CTGRewriteStruct> getDMRNetwork1TGRewrites() const;
std::vector<CPCRewriteStruct> getDMRNetwork1PCRewrites() const;
// The DMR Network 2 section
bool getDMRNetwork2Enabled() const;
@@ -77,9 +84,8 @@ public:
unsigned int getDMRNetwork2Local() const;
std::string getDMRNetwork2Password() const;
bool getDMRNetwork2Debug() const;
std::vector<CRewriteStruct> getDMRNetwork2TGRewrites() const;
bool getDMRNetwork2PrivateSlot1() const;
bool getDMRNetwork2PrivateSlot2() const;
std::vector<CTGRewriteStruct> getDMRNetwork2TGRewrites() const;
std::vector<CPCRewriteStruct> getDMRNetwork2PCRewrites() const;
// The XLX Network section
bool getXLXNetworkEnabled() const;
@@ -119,9 +125,8 @@ private:
unsigned int m_dmrNetwork1Local;
std::string m_dmrNetwork1Password;
bool m_dmrNetwork1Debug;
std::vector<CRewriteStruct> m_dmrNetwork1TGRewrites;
bool m_dmrNetwork1PrivateSlot1;
bool m_dmrNetwork1PrivateSlot2;
std::vector<CTGRewriteStruct> m_dmrNetwork1TGRewrites;
std::vector<CPCRewriteStruct> m_dmrNetwork1PCRewrites;
bool m_dmrNetwork2Enabled;
unsigned int m_dmrNetwork2Id;
@@ -130,9 +135,8 @@ private:
unsigned int m_dmrNetwork2Local;
std::string m_dmrNetwork2Password;
bool m_dmrNetwork2Debug;
std::vector<CRewriteStruct> m_dmrNetwork2TGRewrites;
bool m_dmrNetwork2PrivateSlot1;
bool m_dmrNetwork2PrivateSlot2;
std::vector<CTGRewriteStruct> m_dmrNetwork2TGRewrites;
std::vector<CPCRewriteStruct> m_dmrNetwork2PCRewrites;
bool m_xlxNetworkEnabled;
unsigned int m_xlxNetworkId;