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

DStar SelfOnly with WhiteList (beautyfied)

Browse Source
This commit is contained in:
sp5lg
2019-10-06 16:29:57 +02:00
parent ed79a7176a
commit bb0bd4bb46
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Conf.cpp
View File

@@ -526,7 +526,7 @@ bool CConf::read()
} }
p = ::strtok(NULL, ",\r\n"); p = ::strtok(NULL, ",\r\n");
} }
} else if (::strcmp(key, "AckReply") == 0) } else if (::strcmp(key, "AckReply") == 0)
m_dstarAckReply = ::atoi(value) == 1; m_dstarAckReply = ::atoi(value) == 1;
else if (::strcmp(key, "AckTime") == 0) else if (::strcmp(key, "AckTime") == 0)
m_dstarAckTime = (unsigned int)::atoi(value); m_dstarAckTime = (unsigned int)::atoi(value);

2
DStarControl.h
View File

@@ -59,7 +59,7 @@ private:
bool m_errorReply; bool m_errorReply;
bool m_remoteGateway; bool m_remoteGateway;
std::vector<std::string> m_blackList; std::vector<std::string> m_blackList;
std::vector<std::string> m_whiteList; std::vector<std::string> m_whiteList;
CDStarNetwork* m_network; CDStarNetwork* m_network;
CDisplay* m_display; CDisplay* m_display;
bool m_duplex; bool m_duplex;

6
MMDVMHost.cpp
View File

@@ -402,7 +402,7 @@ int CMMDVMHost::run()
std::string module = m_conf.getDStarModule(); std::string module = m_conf.getDStarModule();
bool selfOnly = m_conf.getDStarSelfOnly(); bool selfOnly = m_conf.getDStarSelfOnly();
std::vector<std::string> blackList = m_conf.getDStarBlackList(); std::vector<std::string> blackList = m_conf.getDStarBlackList();
std::vector<std::string> whiteList = m_conf.getDStarWhiteList(); std::vector<std::string> whiteList = m_conf.getDStarWhiteList();
bool ackReply = m_conf.getDStarAckReply(); bool ackReply = m_conf.getDStarAckReply();
unsigned int ackTime = m_conf.getDStarAckTime(); unsigned int ackTime = m_conf.getDStarAckTime();
bool ackMessage = m_conf.getDStarAckMessage(); bool ackMessage = m_conf.getDStarAckMessage();
@@ -422,8 +422,8 @@ int CMMDVMHost::run()
if (blackList.size() > 0U) if (blackList.size() > 0U)
LogInfo(" Black List: %u", blackList.size()); LogInfo(" Black List: %u", blackList.size());
if (whiteList.size() > 0U) if (whiteList.size() > 0U)
LogInfo(" White List: %u", whiteList.size()); LogInfo(" White List: %u", whiteList.size());
m_dstar = new CDStarControl(m_callsign, module, selfOnly, ackReply, ackTime, ackMessage, errorReply, blackList, whiteList, m_dstarNetwork, m_display, m_timeout, m_duplex, remoteGateway, rssi); m_dstar = new CDStarControl(m_callsign, module, selfOnly, ackReply, ackTime, ackMessage, errorReply, blackList, whiteList, m_dstarNetwork, m_display, m_timeout, m_duplex, remoteGateway, rssi);
} }