<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15518">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LMSDevice: Return previous txGain/rxGain if setting value failed<br><br>Change-Id: I11e853e11bec99fc88e81642f9b2cd87d5815398<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>2 files changed, 10 insertions(+), 6 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/18/15518/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 b7cb31d..feeb646 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -55,6 +55,8 @@</span><br><span> </span><br><span> m_lms_stream_rx.resize(chans);</span><br><span> m_lms_stream_tx.resize(chans);</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gains.resize(chans);</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gains.resize(chans);</span><br><span> </span><br><span> rx_buffers.resize(chans);</span><br><span> }</span><br><span>@@ -412,8 +414,9 @@</span><br><span> </span><br><span> if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)</span><br><span> LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return dB;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gains[chan] = dB;</span><br><span style="color: hsl(120, 100%, 40%);">+ return tx_gains[chan];</span><br><span> }</span><br><span> </span><br><span> double LMSDevice::setRxGain(double dB, size_t chan)</span><br><span>@@ -427,8 +430,9 @@</span><br><span> </span><br><span> if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0)</span><br><span> LOGCHAN(chan, DDEV, ERR) << "Error setting RX gain to " << dB << " dB";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return dB;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gains[chan] = dB;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rx_gains[chan];</span><br><span> }</span><br><span> </span><br><span> void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os)</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index ab45b08..71a706c 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -58,7 +58,7 @@</span><br><span> </span><br><span> TIMESTAMP ts_initial, ts_offset;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- double rxGain;</span><br><span style="color: hsl(120, 100%, 40%);">+ std::vector<double> tx_gains, rx_gains;</span><br><span> double maxTxGainClamp;</span><br><span> </span><br><span> bool do_calib(size_t chan);</span><br><span>@@ -150,7 +150,7 @@</span><br><span> </span><br><span> /** get the current receive gain */</span><br><span> double getRxGain(size_t chan = 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- return rxGain;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rx_gains[chan];</span><br><span> }</span><br><span> </span><br><span> /** return maximum Rx Gain **/</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15518">change 15518</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/c/osmo-trx/+/15518"/><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-Change-Id: I11e853e11bec99fc88e81642f9b2cd87d5815398 </div>
<div style="display:none"> Gerrit-Change-Number: 15518 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>