<p>roh has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13662">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start (bw, freq, power need to be set)<br><br>Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>2 files changed, 50 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/13662/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index cb41858..ab4e868 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -153,8 +153,8 @@</span><br><span> {</span><br><span> //lms_info_str_t dev_str;</span><br><span> lms_info_str_t* info_list;</span><br><span style="color: hsl(0, 100%, 40%);">- lms_range_t range_lpfbw_rx, range_lpfbw_tx, range_sr;</span><br><span style="color: hsl(0, 100%, 40%);">- float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ lms_range_t range_sr;</span><br><span style="color: hsl(120, 100%, 40%);">+ float_type sr_host, sr_rf;</span><br><span> uint16_t dac_val;</span><br><span> unsigned int i, n;</span><br><span> int rc, dev_id;</span><br><span>@@ -244,36 +244,11 @@</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_rx))</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_close;</span><br><span style="color: hsl(0, 100%, 40%);">- print_range("LPFBWRange Rx", &range_lpfbw_rx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_tx))</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_close;</span><br><span style="color: hsl(0, 100%, 40%);">- print_range("LPFBWRange Tx", &range_lpfbw_tx);</span><br><span style="color: hsl(0, 100%, 40%);">- lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max);</span><br><span style="color: hsl(0, 100%, 40%);">- lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, INFO) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (!set_antennas()) {</span><br><span> LOGC(DDEV, ALERT) << "LMS antenna setting failed";</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Perform Rx and Tx calibration */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i=0; i<chans; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, INFO) << "Setting LPFBW chan " << i;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_SetLPFBW(m_lms_dev, LMS_CH_RX, i, lpfbw_rx) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_close;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_SetLPFBW(m_lms_dev, LMS_CH_TX, i, lpfbw_tx) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_close;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, INFO) << "Calibrating chan " << i;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_Calibrate(m_lms_dev, LMS_CH_RX, i, LMS_CALIBRATE_BW_HZ, 0) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_close;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_Calibrate(m_lms_dev, LMS_CH_TX, i, LMS_CALIBRATE_BW_HZ, 0) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_close;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> samplesRead = 0;</span><br><span> samplesWritten = 0;</span><br><span> started = false;</span><br><span>@@ -304,6 +279,13 @@</span><br><span> setTxGain((minTxGain() + maxTxGain()) / 2, i);</span><br><span> setRxGain((minRxGain() + maxRxGain()) / 2, i);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* set up Rx and Tx filters */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!do_filters(i))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Perform Rx and Tx calibration */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!do_calib(i))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> m_lms_stream_rx[i] = {};</span><br><span> m_lms_stream_rx[i].isTx = false;</span><br><span> m_lms_stream_rx[i].channel = i;</span><br><span>@@ -362,6 +344,45 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* do rx and tx calibration - depends on gain, freq and bw */</span><br><span style="color: hsl(120, 100%, 40%);">+bool LMSDevice::do_calib(size_t chan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, INFO) << "Calibrating chan " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_Calibrate(m_lms_dev, LMS_CH_RX, chan, LMS_CALIBRATE_BW_HZ, 0) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_Calibrate(m_lms_dev, LMS_CH_TX, chan, LMS_CALIBRATE_BW_HZ, 0) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* do filter config - depends on bw only? */</span><br><span style="color: hsl(120, 100%, 40%);">+bool LMSDevice::do_filters(size_t chan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ lms_range_t range_lpfbw_rx, range_lpfbw_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ float_type lpfbw_rx, lpfbw_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, INFO) << "Setting filters on chan " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_rx))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ print_range("LPFBWRange Rx", &range_lpfbw_rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_tx))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ print_range("LPFBWRange Tx", &range_lpfbw_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max);</span><br><span style="color: hsl(120, 100%, 40%);">+ lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, INFO) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, INFO) << "Setting LPFBW chan " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_SetLPFBW(m_lms_dev, LMS_CH_RX, chan, lpfbw_rx) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_SetLPFBW(m_lms_dev, LMS_CH_TX, chan, lpfbw_tx) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> double LMSDevice::maxTxGain()</span><br><span> {</span><br><span> return 73.0;</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index fde2408..67f4691 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -65,6 +65,8 @@</span><br><span> </span><br><span> double rxGain;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bool do_calib(size_t chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ bool do_filters(size_t chan);</span><br><span> int get_ant_idx(const std::string & name, bool dir_tx, size_t chan);</span><br><span> bool flush_recv(size_t num_pkts);</span><br><span> void update_stream_stats(size_t chan, bool * underrun, bool * overrun);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13662">change 13662</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13662"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37 </div>
<div style="display:none"> Gerrit-Change-Number: 13662 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: roh <jsteiger@sysmocom.de> </div>