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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Transceiver: Move calculation of normalized values (rssiOffset) to pullRadioVector()<br><br>That's where all the filling logic happens, while in driveReceiveFIFO we<br>mostly want to take the burst, generate a message and sent it over the<br>socket.<br>In pullRadioVector this way we always provide normalized values based on<br>user configuration (VTY rssi-offset).<br><br>Related: OS#4006<br>Change-Id: I1ee28daf21dc287bec564d45d58086d63655c0f6<br>---<br>M Transceiver52M/Transceiver.cpp<br>M Transceiver52M/Transceiver.h<br>2 files changed, 11 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index a0ff4cd..5a6b652 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -606,19 +606,19 @@</span><br><span>   burst = radio_burst->getVector(max_i);</span><br><span>   avg = sqrt(avg / radio_burst->chans());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  bi->rssi = 20.0 * log10(rxFullScale / avg);</span><br><span style="color: hsl(120, 100%, 40%);">+  bi->rssi = 20.0 * log10(rxFullScale / avg) + rssiOffset;</span><br><span> </span><br><span>   if (type == IDLE) {</span><br><span>     /* Update noise levels */</span><br><span>     state->mNoises.insert(avg);</span><br><span>     state->mNoiseLev = state->mNoises.avg();</span><br><span style="color: hsl(0, 100%, 40%);">-    bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev);</span><br><span style="color: hsl(120, 100%, 40%);">+    bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset;</span><br><span> </span><br><span>     delete radio_burst;</span><br><span>     return false;</span><br><span>   } else {</span><br><span>     /* Do not update noise levels */</span><br><span style="color: hsl(0, 100%, 40%);">-    bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev);</span><br><span style="color: hsl(120, 100%, 40%);">+    bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset;</span><br><span>   }</span><br><span> </span><br><span>   unsigned max_toa = (type == RACH || type == EXT_RACH) ?</span><br><span>@@ -906,22 +906,21 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi, double dbm)</span><br><span style="color: hsl(120, 100%, 40%);">+void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi)</span><br><span> {</span><br><span>   LOG(DEBUG) << std::fixed << std::right</span><br><span>     << " chan: "   << chan</span><br><span>     << " time: "   << bi->burstTime</span><br><span style="color: hsl(0, 100%, 40%);">-    << " RSSI: "   << std::setw(5) << std::setprecision(1) << bi->rssi</span><br><span style="color: hsl(0, 100%, 40%);">-                   << "dBFS/" << std::setw(6) << -dbm << "dBm"</span><br><span style="color: hsl(0, 100%, 40%);">-    << " noise: "  << std::setw(5) << std::setprecision(1) << bi->noise</span><br><span style="color: hsl(0, 100%, 40%);">-                   << "dBFS/" << std::setw(6) << -(bi->noise + rssiOffset) << "dBm"</span><br><span style="color: hsl(120, 100%, 40%);">+    << " RSSI: "   << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset)</span><br><span style="color: hsl(120, 100%, 40%);">+                   << "dBFS/" << std::setw(6) << -bi->rssi << "dBm"</span><br><span style="color: hsl(120, 100%, 40%);">+    << " noise: "  << std::setw(5) << std::setprecision(1) << (bi->noise - rssiOffset)</span><br><span style="color: hsl(120, 100%, 40%);">+                   << "dBFS/" << std::setw(6) << -bi->noise << "dBm"</span><br><span>     << " TOA: "    << std::setw(5) << std::setprecision(2) << bi->toa</span><br><span>     << " bits: "   << *(bi->rxBurst);</span><br><span> }</span><br><span> </span><br><span> void Transceiver::driveReceiveFIFO(size_t chan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  double dBm;  // in dBm</span><br><span>   int TOAint;  // in 1/256 symbols</span><br><span> </span><br><span>   struct trx_ul_burst_ind bi;</span><br><span>@@ -932,8 +931,7 @@</span><br><span>   // Convert -1..+1 soft bits to 0..1 soft bits</span><br><span>   vectorSlicer(bi.rxBurst);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  dBm = bi.rssi + rssiOffset;</span><br><span style="color: hsl(0, 100%, 40%);">-  logRxBurst(chan, &bi, dBm);</span><br><span style="color: hsl(120, 100%, 40%);">+  logRxBurst(chan, &bi);</span><br><span> </span><br><span>   TOAint = (int) (bi.toa * 256.0 + 0.5); // round to closest integer</span><br><span> </span><br><span>@@ -943,7 +941,7 @@</span><br><span>   pkt->common.reserved = 0;</span><br><span>   pkt->common.tn = bi.burstTime.TN();</span><br><span>   osmo_store32be(bi.burstTime.FN(), &pkt->common.fn);</span><br><span style="color: hsl(0, 100%, 40%);">-  pkt->v0.rssi = dBm;</span><br><span style="color: hsl(120, 100%, 40%);">+  pkt->v0.rssi = bi.rssi;</span><br><span>   osmo_store16be(TOAint, &pkt->v0.toa);</span><br><span>   SoftVector::iterator burstItr = bi.rxBurst->begin();</span><br><span> </span><br><span>diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h</span><br><span>index d7c6182..7963519 100644</span><br><span>--- a/Transceiver52M/Transceiver.h</span><br><span>+++ b/Transceiver52M/Transceiver.h</span><br><span>@@ -271,7 +271,7 @@</span><br><span>   /** set priority on current thread */</span><br><span>   void setPriority(float prio = 0.5) { mRadioInterface->setPriority(prio); }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi, double dbm);</span><br><span style="color: hsl(120, 100%, 40%);">+  void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi);</span><br><span> };</span><br><span> </span><br><span> void *RxUpperLoopAdapter(TransceiverChannel *);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/14640">change 14640</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/+/14640"/><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: I1ee28daf21dc287bec564d45d58086d63655c0f6 </div>
<div style="display:none"> Gerrit-Change-Number: 14640 </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: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </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>