<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/18922">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;">{UHD,LMS}Dervice: Log expected resulting TxPower when setting device specific TxGain<br><br>Change-Id: I3c54c61cd6dd7e40bb2831fd4962ff72130b390d<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>2 files changed, 11 insertions(+), 7 deletions(-)<br><br></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 8bb5316..20b9856 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -563,7 +563,7 @@</span><br><span> </span><br><span> double LMSDevice::setPowerAttenuation(int atten, size_t chan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- double dB;</span><br><span style="color: hsl(120, 100%, 40%);">+ double tx_power, dB;</span><br><span> dev_band_desc desc;</span><br><span> </span><br><span> if (chan >= tx_gains.size()) {</span><br><span>@@ -572,12 +572,13 @@</span><br><span> }</span><br><span> </span><br><span> get_dev_band_desc(desc);</span><br><span style="color: hsl(0, 100%, 40%);">- dB = TxPower2TxGain(desc, desc.nom_out_tx_power - atten);</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_power = desc.nom_out_tx_power - atten;</span><br><span style="color: hsl(120, 100%, 40%);">+ dB = TxPower2TxGain(desc, tx_power);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGCHAN(chan, DDEV, NOTICE) << "Setting TX gain to " << dB << " dB";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCHAN(chan, DDEV, NOTICE) << "Setting TX gain to " << dB << " dB (~" << tx_power << " dBm)";</span><br><span> </span><br><span> if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB (~" << tx_power << " dBm)";</span><br><span> else</span><br><span> tx_gains[chan] = dB;</span><br><span> return desc.nom_out_tx_power - TxGain2TxPower(desc, tx_gains[chan]);</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index d1f61d3..0eb79fc 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -358,7 +358,7 @@</span><br><span> }</span><br><span> </span><br><span> double uhd_device::setPowerAttenuation(int atten, size_t chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- double db;</span><br><span style="color: hsl(120, 100%, 40%);">+ double tx_power, db;</span><br><span> dev_band_desc desc;</span><br><span> </span><br><span> if (chan >= tx_gains.size()) {</span><br><span>@@ -367,7 +367,8 @@</span><br><span> }</span><br><span> </span><br><span> get_dev_band_desc(desc);</span><br><span style="color: hsl(0, 100%, 40%);">- db = TxPower2TxGain(desc, desc.nom_out_tx_power - atten);</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_power = desc.nom_out_tx_power - atten;</span><br><span style="color: hsl(120, 100%, 40%);">+ db = TxPower2TxGain(desc, tx_power);</span><br><span> </span><br><span> if (dev_type == UMTRX) {</span><br><span> std::vector<std::string> gain_stages = usrp_dev->get_tx_gain_names(0);</span><br><span>@@ -388,7 +389,9 @@</span><br><span> </span><br><span> tx_gains[chan] = usrp_dev->get_tx_gain(chan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, INFO) << "Set TX gain to " << tx_gains[chan] << "dB (asked for " << db << "dB)";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, INFO) << "Set TX gain to " << tx_gains[chan] << "dB, ~"</span><br><span style="color: hsl(120, 100%, 40%);">+ << TxGain2TxPower(desc, tx_gains[chan]) << " dBm "</span><br><span style="color: hsl(120, 100%, 40%);">+ << "(asked for " << db << " dB, ~" << tx_power << " dBm)";</span><br><span> </span><br><span> return desc.nom_out_tx_power - TxGain2TxPower(desc, tx_gains[chan]);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/18922">change 18922</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/+/18922"/><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: I3c54c61cd6dd7e40bb2831fd4962ff72130b390d </div>
<div style="display:none"> Gerrit-Change-Number: 18922 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: roh <jsteiger@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>