<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14691">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/rand_burst_gen.py: use TrainingSeqGMSK and BurstType enums<br><br>Change-Id: I8a3faceae4a8d9b57d86d42600db839da073dad6<br>---<br>M src/target/trx_toolkit/rand_burst_gen.py<br>1 file changed, 16 insertions(+), 56 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/91/14691/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/rand_burst_gen.py b/src/target/trx_toolkit/rand_burst_gen.py</span><br><span>index 46c1e09..80ff3f2 100644</span><br><span>--- a/src/target/trx_toolkit/rand_burst_gen.py</span><br><span>+++ b/src/target/trx_toolkit/rand_burst_gen.py</span><br><span>@@ -28,50 +28,6 @@</span><br><span> </span><br><span> class RandBurstGen:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # GSM 05.02 Chapter 5.2.3 Normal Burst</span><br><span style="color: hsl(0, 100%, 40%);">- nb_tsc_list = [</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- [</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ],</span><br><span style="color: hsl(0, 100%, 40%);">- ]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # GSM 05.02 Chapter 5.2.5 SCH training sequence</span><br><span style="color: hsl(0, 100%, 40%);">- sb_tsc = [</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- ]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # GSM 05.02 Chapter 5.2.6 Dummy Burst</span><br><span> db_bits = [</span><br><span> 0, 0, 0,</span><br><span>@@ -87,15 +43,13 @@</span><br><span> 0, 0, 0,</span><br><span> ]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # GSM 05.02 Chapter 5.2.7 Access burst</span><br><span style="color: hsl(0, 100%, 40%);">- ab_tsc = [</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ]</span><br><span style="color: hsl(120, 100%, 40%);">+ # Pick a random TSC for a given burst type</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_rand_tsc(self, bt):</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc_list = filter(lambda seq: seq.bt == bt, list(TrainingSeqGMSK))</span><br><span style="color: hsl(120, 100%, 40%);">+ return random.choice(tsc_list)</span><br><span> </span><br><span> # Generate a normal burst</span><br><span style="color: hsl(0, 100%, 40%);">- def gen_nb(self, seq_idx = 0):</span><br><span style="color: hsl(120, 100%, 40%);">+ def gen_nb(self, tsc = None):</span><br><span> buf = []</span><br><span> </span><br><span> # Tailing bits</span><br><span>@@ -109,7 +63,9 @@</span><br><span> buf.append(random.randint(0, 1))</span><br><span> </span><br><span> # Training sequence</span><br><span style="color: hsl(0, 100%, 40%);">- buf += self.nb_tsc_list[seq_idx]</span><br><span style="color: hsl(120, 100%, 40%);">+ if tsc is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc = self.get_rand_tsc(BurstType.NORMAL)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += tsc.seq</span><br><span> </span><br><span> # Steal flag 2 / 2</span><br><span> buf.append(random.randint(0, 1))</span><br><span>@@ -128,7 +84,7 @@</span><br><span> return [0] * GSM_BURST_LEN</span><br><span> </span><br><span> # Generate a synchronization burst</span><br><span style="color: hsl(0, 100%, 40%);">- def gen_sb(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ def gen_sb(self, tsc = None):</span><br><span> buf = []</span><br><span> </span><br><span> # Tailing bits</span><br><span>@@ -139,7 +95,9 @@</span><br><span> buf.append(random.randint(0, 1))</span><br><span> </span><br><span> # Training sequence</span><br><span style="color: hsl(0, 100%, 40%);">- buf += self.sb_tsc</span><br><span style="color: hsl(120, 100%, 40%);">+ if tsc is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc = self.get_rand_tsc(BurstType.SYNC)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += tsc.seq</span><br><span> </span><br><span> # Random data 2 / 2</span><br><span> for i in range(0, 39):</span><br><span>@@ -155,14 +113,16 @@</span><br><span> return self.db_bits</span><br><span> </span><br><span> # Generate an access burst</span><br><span style="color: hsl(0, 100%, 40%);">- def gen_ab(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ def gen_ab(self, tsc = None):</span><br><span> buf = []</span><br><span> </span><br><span> # Tailing bits</span><br><span> buf += [0] * 8</span><br><span> </span><br><span> # Training sequence</span><br><span style="color: hsl(0, 100%, 40%);">- buf += self.ab_tsc</span><br><span style="color: hsl(120, 100%, 40%);">+ if tsc is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc = self.get_rand_tsc(BurstType.ACCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += tsc.seq</span><br><span> </span><br><span> # Random data</span><br><span> for i in range(0, 36):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14691">change 14691</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/osmocom-bb/+/14691"/><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-Change-Id: I8a3faceae4a8d9b57d86d42600db839da073dad6 </div>
<div style="display:none"> Gerrit-Change-Number: 14691 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>