cleanup display and output of modem information in remote mode;

pull/12/head
Bryan Biedenkapp 4 years ago
parent aeb54095bc
commit f353e8f501

@ -261,7 +261,7 @@ int Host::run()
m_modem->clock(ms); m_modem->clock(ms);
// ------------------------------------------------------ // ------------------------------------------------------
// -- Modem, DMR, P25 and Network Clocking -- // -- Modem Clocking --
// ------------------------------------------------------ // ------------------------------------------------------
ms = stopWatch.elapsed(); ms = stopWatch.elapsed();
@ -2125,6 +2125,7 @@ bool Host::createModem()
if (portType == UART_PORT || portType == PTY_PORT) { if (portType == UART_PORT || portType == PTY_PORT) {
m_modemRemotePort = new port::UDPPort(g_remoteAddress, g_remotePort); m_modemRemotePort = new port::UDPPort(g_remoteAddress, g_remotePort);
m_modemRemote = true; m_modemRemote = true;
ignoreModemConfigArea = true;
} }
else { else {
@ -2137,7 +2138,7 @@ bool Host::createModem()
LogInfo(" UDP Address: %s", g_remoteAddress.c_str()); LogInfo(" UDP Address: %s", g_remoteAddress.c_str());
LogInfo(" UDP Port: %u", g_remotePort); LogInfo(" UDP Port: %u", g_remotePort);
} }
else {
LogInfo(" RX Invert: %s", rxInvert ? "yes" : "no"); LogInfo(" RX Invert: %s", rxInvert ? "yes" : "no");
LogInfo(" TX Invert: %s", txInvert ? "yes" : "no"); LogInfo(" TX Invert: %s", txInvert ? "yes" : "no");
LogInfo(" PTT Invert: %s", pttInvert ? "yes" : "no"); LogInfo(" PTT Invert: %s", pttInvert ? "yes" : "no");
@ -2175,6 +2176,7 @@ bool Host::createModem()
if (dumpModemStatus) { if (dumpModemStatus) {
LogInfo(" Dump Modem Status: yes"); LogInfo(" Dump Modem Status: yes");
} }
}
if (debug) { if (debug) {
LogInfo(" Debug: yes"); LogInfo(" Debug: yes");
@ -2182,6 +2184,7 @@ bool Host::createModem()
m_modem = new Modem(modemPort, m_duplex, rxInvert, txInvert, pttInvert, dcBlocker, cosLockout, fdmaPreamble, dmrRxDelay, p25CorrCount, m_modem = new Modem(modemPort, m_duplex, rxInvert, txInvert, pttInvert, dcBlocker, cosLockout, fdmaPreamble, dmrRxDelay, p25CorrCount,
packetPlayoutTime, disableOFlowReset, ignoreModemConfigArea, dumpModemStatus, trace, debug); packetPlayoutTime, disableOFlowReset, ignoreModemConfigArea, dumpModemStatus, trace, debug);
if (!m_modemRemote) {
m_modem->setModeParams(m_dmrEnabled, m_p25Enabled, m_nxdnEnabled); m_modem->setModeParams(m_dmrEnabled, m_p25Enabled, m_nxdnEnabled);
m_modem->setLevels(rxLevel, cwIdTXLevel, dmrTXLevel, p25TXLevel, nxdnTXLevel); m_modem->setLevels(rxLevel, cwIdTXLevel, dmrTXLevel, p25TXLevel, nxdnTXLevel);
m_modem->setSymbolAdjust(dmrSymLevel3Adj, dmrSymLevel1Adj, p25SymLevel3Adj, p25SymLevel1Adj, nxdnSymLevel3Adj, nxdnSymLevel1Adj); m_modem->setSymbolAdjust(dmrSymLevel3Adj, dmrSymLevel1Adj, p25SymLevel3Adj, p25SymLevel1Adj, nxdnSymLevel3Adj, nxdnSymLevel1Adj);
@ -2194,6 +2197,7 @@ bool Host::createModem()
#if defined(ENABLE_P25) && defined(ENABLE_DFSI) #if defined(ENABLE_P25) && defined(ENABLE_DFSI)
m_modem->setP25DFSI(m_useDFSI); m_modem->setP25DFSI(m_useDFSI);
#endif // defined(ENABLE_P25) && defined(ENABLE_DFSI) #endif // defined(ENABLE_P25) && defined(ENABLE_DFSI)
}
if (m_modemRemote) { if (m_modemRemote) {
m_modem->setOpenHandler(MODEM_OC_PORT_HANDLER_BIND(Host::rmtPortModemOpen, this)); m_modem->setOpenHandler(MODEM_OC_PORT_HANDLER_BIND(Host::rmtPortModemOpen, this));

Loading…
Cancel
Save

Powered by TurnKey Linux.