<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10304">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/burst_fwd.py: separate burst preprocessing<br><br>This change separates burst preprocessing (i.e. both RSSI and ToA<br>calculation) from BurstForwarder.transform_msg() because it's not<br>actually related to the message transformation process.<br><br>Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11<br>---<br>M src/target/trx_toolkit/burst_fwd.py<br>1 file changed, 24 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/10304/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py</span><br><span>index 144ae5f..bfbe0d6 100644</span><br><span>--- a/src/target/trx_toolkit/burst_fwd.py</span><br><span>+++ b/src/target/trx_toolkit/burst_fwd.py</span><br><span>@@ -131,8 +131,22 @@</span><br><span> # Generate a random RSSI value</span><br><span> return random.randint(rssi_min, rssi_max)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # DL burst preprocessing</span><br><span style="color: hsl(120, 100%, 40%);">+ def preprocess_dl_burst(self, msg):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Calculate both RSSI and ToA values</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.toa256 = self.calc_dl_toa256()</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.rssi = self.calc_dl_rssi()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # UL burst preprocessing</span><br><span style="color: hsl(120, 100%, 40%);">+ def preprocess_ul_burst(self, msg):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Calculate both RSSI and ToA values,</span><br><span style="color: hsl(120, 100%, 40%);">+ # also apply Timing Advance</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.toa256 = self.calc_ul_toa256()</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.toa256 -= self.calc_ta256()</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.rssi = self.calc_ul_rssi()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Converts a L12TRX message to TRX2L1 message</span><br><span style="color: hsl(0, 100%, 40%);">- def transform_msg(self, msg_raw, dl = True):</span><br><span style="color: hsl(120, 100%, 40%);">+ def transform_msg(self, msg_raw):</span><br><span> # Attempt to parse a message</span><br><span> try:</span><br><span> msg_l12trx = DATAMSG_L12TRX()</span><br><span>@@ -142,18 +156,7 @@</span><br><span> return None</span><br><span> </span><br><span> # Compose a new message for L1</span><br><span style="color: hsl(0, 100%, 40%);">- msg_trx2l1 = msg_l12trx.gen_trx2l1()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Randomize both RSSI and ToA values</span><br><span style="color: hsl(0, 100%, 40%);">- if dl:</span><br><span style="color: hsl(0, 100%, 40%);">- msg_trx2l1.toa256 = self.calc_dl_toa256()</span><br><span style="color: hsl(0, 100%, 40%);">- msg_trx2l1.rssi = self.calc_dl_rssi()</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- msg_trx2l1.toa256 = self.calc_ul_toa256()</span><br><span style="color: hsl(0, 100%, 40%);">- msg_trx2l1.toa256 -= self.calc_ta256()</span><br><span style="color: hsl(0, 100%, 40%);">- msg_trx2l1.rssi = self.calc_ul_rssi()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return msg_trx2l1</span><br><span style="color: hsl(120, 100%, 40%);">+ return msg_l12trx.gen_trx2l1()</span><br><span> </span><br><span> # Downlink handler: BTS -> BB</span><br><span> def bts2bb(self):</span><br><span>@@ -169,7 +172,7 @@</span><br><span> return None</span><br><span> </span><br><span> # Process a message</span><br><span style="color: hsl(0, 100%, 40%);">- msg = self.transform_msg(data, dl = True)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = self.transform_msg(data)</span><br><span> if msg is None:</span><br><span> return None</span><br><span> </span><br><span>@@ -177,6 +180,9 @@</span><br><span> if msg.tn != self.ts_pass:</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Burst preprocessing</span><br><span style="color: hsl(120, 100%, 40%);">+ self.preprocess_dl_burst(msg)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Validate and generate the payload</span><br><span> payload = msg.gen_msg()</span><br><span> </span><br><span>@@ -201,10 +207,13 @@</span><br><span> return None</span><br><span> </span><br><span> # Process a message</span><br><span style="color: hsl(0, 100%, 40%);">- msg = self.transform_msg(data, dl = False)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = self.transform_msg(data)</span><br><span> if msg is None:</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Burst preprocessing</span><br><span style="color: hsl(120, 100%, 40%);">+ self.preprocess_ul_burst(msg)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Validate and generate the payload</span><br><span> payload = msg.gen_msg()</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10304">change 10304</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/10304"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11 </div>
<div style="display:none"> Gerrit-Change-Number: 10304 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>