g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-04 14:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the D-Star poll message to be run from the network class.

Browse source
This commit is contained in:
Jonathan Naylor 2016-01-25 23:08:34 +00:00
parent 8860b72e6c
commit c92434e474
6 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MMDVMHost.cpp
View file

@ -436,9 +436,6 @@ bool CMMDVMHost::createModem()
bool CMMDVMHost::createDStarNetwork()
{
if (!m_conf.getDStarNetworkEnabled())
return false;
std::string gatewayAddress = m_conf.getDStarGatewayAddress();
unsigned int gatewayPort = m_conf.getDStarGatewayPort();
unsigned int localPort = m_conf.getDStarLocalPort();
@ -449,7 +446,7 @@ bool CMMDVMHost::createDStarNetwork()
LogInfo(" Gateway Port: %u", gatewayPort);
LogInfo(" Local Port: %u", localPort);
m_dstarNetwork = new CDStarNetwork(gatewayAddress, gatewayPort, localPort, debug);
m_dstarNetwork = new CDStarNetwork(gatewayAddress, gatewayPort, localPort, VERSION, debug);
bool ret = m_dstarNetwork->open();
if (!ret) {
@ -465,9 +462,6 @@ bool CMMDVMHost::createDStarNetwork()
bool CMMDVMHost::createDMRNetwork()
{
if (!m_conf.getDMRNetworkEnabled())
return false;
std::string address = m_conf.getDMRNetworkAddress();
unsigned int port = m_conf.getDMRNetworkPort();
unsigned int id = m_conf.getDMRId();