From 9acd523bc309629865a9b3091885e7cd25122bfe Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 19 Apr 2020 16:36:29 +0200 Subject: [PATCH] Fix Set FM params after creating modem, not before --- MMDVMHost.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index 751d25f..bddfd65 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1199,6 +1199,14 @@ bool CMMDVMHost::createModem() LogInfo(" FM RX Level: %.1f%%", fmRXLevel); LogInfo(" TX Frequency: %uHz (%uHz)", txFrequency, txFrequency + txOffset); + m_modem = CModem::createModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); + m_modem->setSerialParams(protocol,address); + m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled, m_p25Enabled, m_nxdnEnabled, m_pocsagEnabled, m_fmEnabled); + m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, fmRXLevel); + m_modem->setRFParams(rxFrequency, rxOffset, txFrequency, txOffset, txDCOffset, rxDCOffset, rfLevel, pocsagFrequency); + m_modem->setDMRParams(colorCode); + m_modem->setYSFParams(lowDeviation, txHang); + if (m_fmEnabled) { std::string callsign = m_conf.getFMCallsign(); unsigned int callsignSpeed = m_conf.getFMCallsignSpeed(); @@ -1252,14 +1260,6 @@ bool CMMDVMHost::createModem() m_modem->setFMMiscParams(timeout, timeoutLevel, ctcssFrequency, ctcssThreshold, ctcssLevel, kerchunkTime, hangTime); } - m_modem = CModem::createModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); - m_modem->setSerialParams(protocol,address); - m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled, m_p25Enabled, m_nxdnEnabled, m_pocsagEnabled, m_fmEnabled); - m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, fmRXLevel); - m_modem->setRFParams(rxFrequency, rxOffset, txFrequency, txOffset, txDCOffset, rxDCOffset, rfLevel, pocsagFrequency); - m_modem->setDMRParams(colorCode); - m_modem->setYSFParams(lowDeviation, txHang); - bool ret = m_modem->open(); if (!ret) { delete m_modem;