<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15517">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">USRPDevice: Return previous txGain if setting value failed<br><br>Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8<br>---<br>M Transceiver52M/device/usrp1/USRPDevice.cpp<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>2 files changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index ef3f92a..03a4f80 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -71,6 +71,7 @@</span><br><span>   decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps));</span><br><span>   actualSampleRate = masterClockRate/decimRate;</span><br><span>   rxGain = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+  txGain = 0;</span><br><span> </span><br><span>   /*</span><br><span>    * Undetermined delay b/w ping response timestamp and true</span><br><span>@@ -279,10 +280,11 @@</span><br><span> </span><br><span>   if (!m_dbTx->set_gain(dB))</span><br><span>     LOGC(DDEV, ERR) << "Error setting TX gain";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+  else</span><br><span style="color: hsl(120, 100%, 40%);">+    txGain = dB;</span><br><span>   writeLock.unlock();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  return dB;</span><br><span style="color: hsl(120, 100%, 40%);">+  return txGain;</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 4123c7d..734b361 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -80,6 +80,7 @@</span><br><span>   unsigned long lastPktTimestamp;</span><br><span> </span><br><span>   double rxGain;</span><br><span style="color: hsl(120, 100%, 40%);">+  double txGain;</span><br><span> </span><br><span> #ifdef SWLOOPBACK</span><br><span>   short loopbackBuffer[1000000];</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15517">change 15517</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/+/15517"/><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: I0d8fd51586ef01141d4e5896f0fc3029a22743f8 </div>
<div style="display:none"> Gerrit-Change-Number: 15517 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>