diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-01-23 11:00:02 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-01-23 11:00:02 +0100 |
| commit | 201d711a1d3dfbe46d622871731005937598e790 (patch) | |
| tree | e43a95ee027e1be6ca8621f9e2c78aaf932a3421 /src/output | |
| parent | 674228bedb325384f12602350ab36d075b5509a3 (diff) | |
| parent | e0abfc3728fb56519fa2507d2468214e2a633c98 (diff) | |
| download | dabmod-201d711a1d3dfbe46d622871731005937598e790.tar.gz dabmod-201d711a1d3dfbe46d622871731005937598e790.tar.bz2 dabmod-201d711a1d3dfbe46d622871731005937598e790.zip | |
Merge branch 'next' into lime
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/SDR.cpp | 10 | ||||
| -rw-r--r-- | src/output/Soapy.cpp | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp index 068b5af..23a947b 100644 --- a/src/output/SDR.cpp +++ b/src/output/SDR.cpp @@ -66,10 +66,12 @@ SDR::SDR(SDRDeviceConfig& config, std::shared_ptr<SDRDevice> device) : m_device_thread = std::thread(&SDR::process_thread_entry, this); - m_dpd_feedback_server = make_shared<DPDFeedbackServer>( - m_device, - m_config.dpdFeedbackServerPort, - m_config.sampleRate); + if (m_config.dpdFeedbackServerPort > 0) { + m_dpd_feedback_server = make_shared<DPDFeedbackServer>( + m_device, + m_config.dpdFeedbackServerPort, + m_config.sampleRate); + } RC_ADD_PARAMETER(txgain, "TX gain"); RC_ADD_PARAMETER(rxgain, "RX gain for DPD feedback"); diff --git a/src/output/Soapy.cpp b/src/output/Soapy.cpp index 86ed3e0..8c84b84 100644 --- a/src/output/Soapy.cpp +++ b/src/output/Soapy.cpp @@ -71,8 +71,10 @@ Soapy::Soapy(SDRDeviceConfig& config) : throw std::runtime_error("Cannot create SoapySDR output"); } - m_device->setMasterClockRate(m_conf.masterClockRate); - etiLog.level(info) << "SoapySDR master clock rate set to " << + if (m_conf.masterClockRate != 0) { + m_device->setMasterClockRate(m_conf.masterClockRate); + } + etiLog.level(info) << "SoapySDR:Actual master clock rate: " << std::fixed << std::setprecision(4) << m_device->getMasterClockRate()/1000.0 << " kHz"; |