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

Allow the USRP audio format to be used natively by the FM networking.

Browse source
This commit is contained in:
Jonathan Naylor 2021-03-14 12:16:39 +00:00
parent 7c14a6ec40
commit fb0d1ef5e2
7 changed files with 139 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MMDVMHost.cpp
View file

@ -1796,6 +1796,7 @@ bool CMMDVMHost::createPOCSAGNetwork()
bool CMMDVMHost::createFMNetwork()
{
std::string format = m_conf.getFMNetworkFormat();
std::string gatewayAddress = m_conf.getFMGatewayAddress();
unsigned int gatewayPort = m_conf.getFMGatewayPort();
std::string localAddress = m_conf.getFMLocalAddress();
@ -1805,6 +1806,7 @@ bool CMMDVMHost::createFMNetwork()
bool debug = m_conf.getFMNetworkDebug();
LogInfo("FM Network Parameters");
LogInfo(" Format: %s", format.c_str());
LogInfo(" Gateway Address: %s", gatewayAddress.c_str());
LogInfo(" Gateway Port: %u", gatewayPort);
LogInfo(" Local Address: %s", localAddress.c_str());
@ -1812,7 +1814,7 @@ bool CMMDVMHost::createFMNetwork()
LogInfo(" Sample Rate: %u", sampleRate);
LogInfo(" Mode Hang: %us", m_fmNetModeHang);
m_fmNetwork = new CFMNetwork(localAddress, localPort, gatewayAddress, gatewayPort, sampleRate, debug);
m_fmNetwork = new CFMNetwork(format, localAddress, localPort, gatewayAddress, gatewayPort, sampleRate, debug);
bool ret = m_fmNetwork->open();
if (!ret) {