<p>fixeria <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14917">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/burst_gen.py: basic TRXD header version 1 support<br><br>Change-Id: Icd4505d211816dc80e91d65094be92f2aed856bd<br>---<br>M src/target/trx_toolkit/burst_gen.py<br>1 file changed, 27 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py</span><br><span>index 5f39e6a..a777246 100755</span><br><span>--- a/src/target/trx_toolkit/burst_gen.py</span><br><span>+++ b/src/target/trx_toolkit/burst_gen.py</span><br><span>@@ -5,7 +5,7 @@</span><br><span> # Auxiliary tool to generate and send random bursts via TRX DATA</span><br><span> # interface, which may be useful for fuzzing and testing</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# (C) 2017-2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2017-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> #</span><br><span> # All Rights Reserved</span><br><span> #</span><br><span>@@ -23,7 +23,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2019", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -68,9 +68,9 @@</span><br><span> </span><br><span> # Init an empty DATA message</span><br><span> if self.argv.conn_mode == "TRX":</span><br><span style="color: hsl(0, 100%, 40%);">- msg = DATAMSG_L12TRX()</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = DATAMSG_L12TRX(ver = self.argv.hdr_ver)</span><br><span> elif self.argv.conn_mode == "L1":</span><br><span style="color: hsl(0, 100%, 40%);">- msg = DATAMSG_TRX2L1()</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = DATAMSG_TRX2L1(ver = self.argv.hdr_ver)</span><br><span> </span><br><span> # Generate a random frame number or use provided one</span><br><span> fn_init = msg.rand_fn() if self.argv.tdma_fn is None \</span><br><span>@@ -102,6 +102,17 @@</span><br><span> if self.argv.rssi is not None:</span><br><span> msg.rssi = self.argv.rssi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if msg.ver >= 0x01:</span><br><span style="color: hsl(120, 100%, 40%);">+ # TODO: Only GMSK and TSC set 0 for now</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.mod_type = Modulation.ModGMSK</span><br><span style="color: hsl(120, 100%, 40%);">+ self.tsc_set = 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.argv.tsc is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.tsc = self.argv.tsc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.argv.ci is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.ci = self.argv.ci</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Generate a random burst</span><br><span> if self.argv.burst_type == "NB":</span><br><span> burst = burst_gen.gen_nb()</span><br><span>@@ -163,6 +174,10 @@</span><br><span> bg_group.add_argument("-c", "--burst-count", metavar = "N",</span><br><span> dest = "burst_count", type = int, default = 1,</span><br><span> help = "How many bursts to send (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ bg_group.add_argument("-v", "--hdr-version", metavar = "VER",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "hdr_ver", type = int,</span><br><span style="color: hsl(120, 100%, 40%);">+ default = 0, choices = DATAMSG.known_versions,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "TRXD header version (default %(default)s)")</span><br><span> bg_group.add_argument("-f", "--frame-number", metavar = "FN",</span><br><span> dest = "tdma_fn", type = int,</span><br><span> help = "Set TDMA frame number (default random)")</span><br><span>@@ -186,6 +201,14 @@</span><br><span> dest = "toa256", type = int,</span><br><span> help = "Set Timing of Arrival in 1/256 symbol periods")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bg_group.add_argument("--tsc", metavar = "TSC",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "tsc", type = int, choices = range(0, 8),</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set Training Sequence Code (default random)")</span><br><span style="color: hsl(120, 100%, 40%);">+ bg_group.add_argument("--ci", metavar = "CI",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "ci", type = int,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "C/I: Carrier-to-Interference ratio "</span><br><span style="color: hsl(120, 100%, 40%);">+ "in centiBels (default random)")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return parser.parse_args()</span><br><span> </span><br><span> def sig_handler(self, signum, frame):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14917">change 14917</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/+/14917"/><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: Icd4505d211816dc80e91d65094be92f2aed856bd </div>
<div style="display:none"> Gerrit-Change-Number: 14917 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>