<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12675">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Piotr Krysik: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps/grgsm_trx: add RadioInterface driver selection argument<br><br>Change-Id: Ic11f878c176bad16b057f25725ab0cfecc01782f<br>---<br>M apps/grgsm_trx<br>M python/trx/__init__.py<br>2 files changed, 10 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/grgsm_trx b/apps/grgsm_trx</span><br><span>index b911719..7da9e06 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -29,7 +29,6 @@</span><br><span> from argparse import ArgumentTypeError</span><br><span> from gnuradio import eng_notation</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from grgsm.trx import RadioInterfaceUHD</span><br><span> from grgsm.trx import RadioInterface</span><br><span> from grgsm.trx import Transceiver</span><br><span> </span><br><span>@@ -58,8 +57,13 @@</span><br><span>           # Set up signal handlers</span><br><span>             signal.signal(signal.SIGINT, self.sig_handler)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+            if argv.driver == "uhd":</span><br><span style="color: hsl(120, 100%, 40%);">+                    from grgsm.trx.radio_if_uhd import RadioInterfaceUHD as Radio</span><br><span style="color: hsl(120, 100%, 40%);">+         else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 raise ValueError("Unknown RadioInterface driver '%s'" % argv.driver)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>             # Init Radio interface</span><br><span style="color: hsl(0, 100%, 40%);">-          self.radio = RadioInterfaceUHD(self.phy_args, self.phy_sample_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+           self.radio = Radio(self.phy_args, self.phy_sample_rate,</span><br><span>                      self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,</span><br><span>                    self.phy_rx_antenna, self.phy_tx_antenna,</span><br><span>                    self.phy_freq_offset, self.bind_addr,</span><br><span>@@ -111,6 +115,10 @@</span><br><span> </span><br><span>     # PHY specific</span><br><span>       phy_group = parser.add_argument_group("PHY parameters")</span><br><span style="color: hsl(120, 100%, 40%);">+     phy_group.add_argument("--driver",</span><br><span style="color: hsl(120, 100%, 40%);">+          dest = "driver", type = str, default = "uhd",</span><br><span style="color: hsl(120, 100%, 40%);">+             choices = ["uhd"],</span><br><span style="color: hsl(120, 100%, 40%);">+          help = "Set device driver (default %(default)s)")</span><br><span>  phy_group.add_argument("-a", "--args",</span><br><span>           dest = "args", type = str, default = "",</span><br><span>                 help = "Set device arguments")</span><br><span>diff --git a/python/trx/__init__.py b/python/trx/__init__.py</span><br><span>index 17ff9d7..c8bddbe 100644</span><br><span>--- a/python/trx/__init__.py</span><br><span>+++ b/python/trx/__init__.py</span><br><span>@@ -23,9 +23,7 @@</span><br><span> from udp_link import UDPLink</span><br><span> from ctrl_if import CTRLInterface</span><br><span> from ctrl_if_bb import CTRLInterfaceBB</span><br><span style="color: hsl(0, 100%, 40%);">-from radio_if_grc import RadioInterfaceGRC</span><br><span> from radio_if import RadioInterface</span><br><span style="color: hsl(0, 100%, 40%);">-from radio_if import RadioInterfaceUHD</span><br><span> from transceiver import Transceiver</span><br><span> </span><br><span> from dict_toggle_sign import dict_toggle_sign</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12675">change 12675</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/12675"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic11f878c176bad16b057f25725ab0cfecc01782f </div>
<div style="display:none"> Gerrit-Change-Number: 12675 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Piotr Krysik <ptrkrysik@gmail.com> </div>