diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-07-01 13:56:17 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-07-02 15:04:40 +0200 |
commit | 607a414967dc6ca4258bf6a391210c437943fad4 (patch) | |
tree | a7fd36328c7e69999ae31eeab1fc73c63c48bb49 /Transceiver52M/Transceiver.cpp | |
parent | 0e67cf24eb048b92bf3c2da366e8c0ca1ddffbfe (diff) |
Transceiver: Move calculation of normalized values (rssiOffset) to pullRadioVector()
That's where all the filling logic happens, while in driveReceiveFIFO we
mostly want to take the burst, generate a message and sent it over the
socket.
In pullRadioVector this way we always provide normalized values based on
user configuration (VTY rssi-offset).
Related: OS#4006
Change-Id: I1ee28daf21dc287bec564d45d58086d63655c0f6
Diffstat (limited to 'Transceiver52M/Transceiver.cpp')
-rw-r--r-- | Transceiver52M/Transceiver.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index a0ff4cd..5a6b652 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -606,19 +606,19 @@ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi) burst = radio_burst->getVector(max_i); avg = sqrt(avg / radio_burst->chans()); - bi->rssi = 20.0 * log10(rxFullScale / avg); + bi->rssi = 20.0 * log10(rxFullScale / avg) + rssiOffset; if (type == IDLE) { /* Update noise levels */ state->mNoises.insert(avg); state->mNoiseLev = state->mNoises.avg(); - bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev); + bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset; delete radio_burst; return false; } else { /* Do not update noise levels */ - bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev); + bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset; } unsigned max_toa = (type == RACH || type == EXT_RACH) ? @@ -906,22 +906,21 @@ void Transceiver::driveReceiveRadio() } } -void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi, double dbm) +void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi) { LOG(DEBUG) << std::fixed << std::right << " chan: " << chan << " time: " << bi->burstTime - << " RSSI: " << std::setw(5) << std::setprecision(1) << bi->rssi - << "dBFS/" << std::setw(6) << -dbm << "dBm" - << " noise: " << std::setw(5) << std::setprecision(1) << bi->noise - << "dBFS/" << std::setw(6) << -(bi->noise + rssiOffset) << "dBm" + << " RSSI: " << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset) + << "dBFS/" << std::setw(6) << -bi->rssi << "dBm" + << " noise: " << std::setw(5) << std::setprecision(1) << (bi->noise - rssiOffset) + << "dBFS/" << std::setw(6) << -bi->noise << "dBm" << " TOA: " << std::setw(5) << std::setprecision(2) << bi->toa << " bits: " << *(bi->rxBurst); } void Transceiver::driveReceiveFIFO(size_t chan) { - double dBm; // in dBm int TOAint; // in 1/256 symbols struct trx_ul_burst_ind bi; @@ -932,8 +931,7 @@ void Transceiver::driveReceiveFIFO(size_t chan) // Convert -1..+1 soft bits to 0..1 soft bits vectorSlicer(bi.rxBurst); - dBm = bi.rssi + rssiOffset; - logRxBurst(chan, &bi, dBm); + logRxBurst(chan, &bi); TOAint = (int) (bi.toa * 256.0 + 0.5); // round to closest integer @@ -943,7 +941,7 @@ void Transceiver::driveReceiveFIFO(size_t chan) pkt->common.reserved = 0; pkt->common.tn = bi.burstTime.TN(); osmo_store32be(bi.burstTime.FN(), &pkt->common.fn); - pkt->v0.rssi = dBm; + pkt->v0.rssi = bi.rssi; osmo_store16be(TOAint, &pkt->v0.toa); SoftVector::iterator burstItr = bi.rxBurst->begin(); |