<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11083">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Add timing offset tolerance module parameter to support real HW<br><br>When we don't use trxcon (ie we run real HW) we need to relax template<br>matching when we receive UL measurements in that case.<br><br>Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 15 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 809a403..a74b3fe 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -51,11 +51,14 @@</span><br><span> charstring mp_bb_trxc_ip := "127.0.0.1";</span><br><span> integer mp_bb_trxc_port := 6701;</span><br><span> charstring mp_pcu_socket := PCU_SOCK_DEFAULT;</span><br><span style="color: hsl(0, 100%, 40%);">- integer mp_tolerance_rxqual := 1;</span><br><span style="color: hsl(0, 100%, 40%);">- integer mp_tolerance_rxlev := 3;</span><br><span> charstring mp_ctrl_ip := "127.0.0.1";</span><br><span> integer mp_ctrl_port := 4238;</span><br><span style="color: hsl(120, 100%, 40%);">+ integer mp_tolerance_rxqual := 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ integer mp_tolerance_rxlev := 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ integer mp_tolerance_timing_offset_256syms := 0;</span><br><span> integer mp_rxlev_exp := 57;</span><br><span style="color: hsl(120, 100%, 40%);">+ integer mp_ms_actual_ta_exp := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ integer mp_timing_offset_256syms_exp := 512;</span><br><span> }</span><br><span> </span><br><span> type record of RslChannelNr ChannelNrs;</span><br><span>@@ -521,10 +524,10 @@</span><br><span> rxqual := 0</span><br><span> }</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- timing_offset_256syms := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ timing_offset_256syms := mp_timing_offset_256syms_exp,</span><br><span> bs_power_level := 0,</span><br><span> ms_power_level := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_actual_ta := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_actual_ta := mp_ms_actual_ta_exp</span><br><span> },</span><br><span> spec := omit,</span><br><span> encr := omit</span><br><span>@@ -1258,7 +1261,7 @@</span><br><span> if (l1p.toa256_enabled) {</span><br><span> ul_meas.len := (3+8);</span><br><span> ul_meas.supp_meas_info := {</span><br><span style="color: hsl(0, 100%, 40%);">- toa256_mean := l1p.timing_offset_256syms,</span><br><span style="color: hsl(120, 100%, 40%);">+ toa256_mean := f_tolerance(l1p.timing_offset_256syms, -63*256, 192*256, mp_tolerance_timing_offset_256syms),</span><br><span> toa256_min := ?,</span><br><span> toa256_max := ?,</span><br><span> toa256_std_dev := ?</span><br><span>@@ -1279,10 +1282,10 @@</span><br><span> ms_power_lvl := l1p.ms_power_level,</span><br><span> fpc := false,</span><br><span> reserved := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- actual_ta := l1p.ms_actual_ta</span><br><span style="color: hsl(120, 100%, 40%);">+ actual_ta := f_tolerance(l1p.ms_actual_ta, 0, 63, mp_tolerance_timing_offset_256syms/256)</span><br><span> };</span><br><span> var uint8_t offs := toffs256s_to_rsl(l1p.timing_offset_256syms);</span><br><span style="color: hsl(0, 100%, 40%);">- var template uint8_t t_toffs := (offs-1 .. offs+1); /* some tolerance */</span><br><span style="color: hsl(120, 100%, 40%);">+ var template uint8_t t_toffs := f_tolerance(offs, 0, 255, mp_tolerance_timing_offset_256syms/256);</span><br><span> return tr_RSL_MEAS_RES_OSMO(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power, l1_info,</span><br><span> ?, t_toffs);</span><br><span> }</span><br><span>@@ -1399,17 +1402,12 @@</span><br><span> f_l1_tune(L1CTL);</span><br><span> RSL.clear;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_bb_trxc_port != -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-100);</span><br><span style="color: hsl(0, 100%, 40%);">- f_trxc_fake_rssi(100);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.l1_pars.timing_offset_256syms := 512; /* 2 symbols */</span><br><span style="color: hsl(0, 100%, 40%);">- f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.l1_pars.timing_offset_256syms := 0; /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-55); /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-100);</span><br><span> g_pars.l1_pars.meas_ul.sub.rxlev := g_pars.l1_pars.meas_ul.full.rxlev;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_bb_trxc_port != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_trxc_fake_rssi(100);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> f_est_dchan();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11083">change 11083</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/11083"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b </div>
<div style="display:none"> Gerrit-Change-Number: 11083 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>