DStar SelfOnly with WhiteList (beautyfied)
This commit is contained in:
parent
ed79a7176a
commit
bb0bd4bb46
2
Conf.cpp
2
Conf.cpp
|
@ -526,7 +526,7 @@ bool CConf::read()
|
|||
}
|
||||
p = ::strtok(NULL, ",\r\n");
|
||||
}
|
||||
} else if (::strcmp(key, "AckReply") == 0)
|
||||
} else if (::strcmp(key, "AckReply") == 0)
|
||||
m_dstarAckReply = ::atoi(value) == 1;
|
||||
else if (::strcmp(key, "AckTime") == 0)
|
||||
m_dstarAckTime = (unsigned int)::atoi(value);
|
||||
|
|
|
@ -59,7 +59,7 @@ private:
|
|||
bool m_errorReply;
|
||||
bool m_remoteGateway;
|
||||
std::vector<std::string> m_blackList;
|
||||
std::vector<std::string> m_whiteList;
|
||||
std::vector<std::string> m_whiteList;
|
||||
CDStarNetwork* m_network;
|
||||
CDisplay* m_display;
|
||||
bool m_duplex;
|
||||
|
|
|
@ -402,7 +402,7 @@ int CMMDVMHost::run()
|
|||
std::string module = m_conf.getDStarModule();
|
||||
bool selfOnly = m_conf.getDStarSelfOnly();
|
||||
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();
|
||||
unsigned int ackTime = m_conf.getDStarAckTime();
|
||||
bool ackMessage = m_conf.getDStarAckMessage();
|
||||
|
@ -422,8 +422,8 @@ int CMMDVMHost::run()
|
|||
|
||||
if (blackList.size() > 0U)
|
||||
LogInfo(" Black List: %u", blackList.size());
|
||||
if (whiteList.size() > 0U)
|
||||
LogInfo(" White List: %u", whiteList.size());
|
||||
if (whiteList.size() > 0U)
|
||||
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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue