MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SimpleDMR' into AX25_FM

Browse Source
This commit is contained in:
Jonathan Naylor
2020-10-30 13:57:58 +00:00
parent e2a4ccfc05 bbe44df3e9
commit 098cc74c9e
8 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Conf.cpp
View File

@@ -124,6 +124,7 @@ m_dstarEnabled(false),
m_dstarModule("C"),
m_dstarSelfOnly(false),
m_dstarBlackList(),
m_dstarWhiteList(),
m_dstarAckReply(true),
m_dstarAckTime(750U),
m_dstarAckMessage(false),
@@ -571,6 +572,18 @@ bool CConf::read()
}
p = ::strtok(NULL, ",\r\n");
}
} else if (::strcmp(key, "WhiteList") == 0) {
char* p = ::strtok(value, ",\r\n");
while (p != NULL) {
if (::strlen(p) > 0U) {
for (unsigned int i = 0U; p[i] != 0; i++)
p[i] = ::toupper(p[i]);
std::string callsign = std::string(p);
callsign.resize(DSTAR_LONG_CALLSIGN_LENGTH, ' ');
m_dstarWhiteList.push_back(callsign);
}
p = ::strtok(NULL, ",\r\n");
}
} else if (::strcmp(key, "AckReply") == 0)
m_dstarAckReply = ::atoi(value) == 1;
else if (::strcmp(key, "AckTime") == 0)
@@ -1318,6 +1331,11 @@ std::vector<std::string> CConf::getDStarBlackList() const
return m_dstarBlackList;
}
std::vector<std::string> CConf::getDStarWhiteList() const
{
return m_dstarWhiteList;
}
bool CConf::getDStarAckReply() const
{
return m_dstarAckReply;