<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12673">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;">python/trx: fork RadioInterfaceUHD from RadioInterface<br><br>Change-Id: I1644a3f6b8da0d5f2a1a133058269e5383948fda<br>---<br>M apps/grgsm_trx<br>M python/trx/CMakeLists.txt<br>M python/trx/__init__.py<br>M python/trx/radio_if.py<br>A python/trx/radio_if_uhd.py<br>5 files changed, 97 insertions(+), 36 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 5e5e3be..b911719 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -29,6 +29,7 @@</span><br><span> from argparse import ArgumentTypeError</span><br><span> from gnuradio import eng_notation</span><br><span> </span><br><span style="color: hsl(120, 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,7 +59,7 @@</span><br><span> signal.signal(signal.SIGINT, self.sig_handler)</span><br><span> </span><br><span> # Init Radio interface</span><br><span style="color: hsl(0, 100%, 40%);">- self.radio = RadioInterface(self.phy_args, self.phy_sample_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.radio = RadioInterfaceUHD(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>diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt</span><br><span>index 11290f3..dbb3daa9 100644</span><br><span>--- a/python/trx/CMakeLists.txt</span><br><span>+++ b/python/trx/CMakeLists.txt</span><br><span>@@ -24,6 +24,7 @@</span><br><span> ctrl_if.py</span><br><span> ctrl_if_bb.py</span><br><span> radio_if.py</span><br><span style="color: hsl(120, 100%, 40%);">+ radio_if_uhd.py</span><br><span> radio_if_grc.py</span><br><span> transceiver.py</span><br><span> dict_toggle_sign.py</span><br><span>diff --git a/python/trx/__init__.py b/python/trx/__init__.py</span><br><span>index 00d370b..17ff9d7 100644</span><br><span>--- a/python/trx/__init__.py</span><br><span>+++ b/python/trx/__init__.py</span><br><span>@@ -25,6 +25,7 @@</span><br><span> from ctrl_if_bb import CTRLInterfaceBB</span><br><span> from radio_if_grc import RadioInterfaceGRC</span><br><span> from radio_if import RadioInterface</span><br><span style="color: hsl(120, 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>diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py</span><br><span>index 4c678e7..c4d4bd1 100644</span><br><span>--- a/python/trx/radio_if.py</span><br><span>+++ b/python/trx/radio_if.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> # -*- coding: utf-8 -*-</span><br><span> </span><br><span> # GR-GSM based transceiver</span><br><span style="color: hsl(0, 100%, 40%);">-# Follow graph implementation</span><br><span style="color: hsl(120, 100%, 40%);">+# Generic (device independent) flow-graph implementation</span><br><span> #</span><br><span> # (C) 2016-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> # (C) 2017 by Piotr Krysik <ptrkrysik@gmail.com></span><br><span>@@ -33,7 +33,6 @@</span><br><span> from gnuradio import eng_notation</span><br><span> from gnuradio import digital</span><br><span> from gnuradio import blocks</span><br><span style="color: hsl(0, 100%, 40%);">-from gnuradio import uhd</span><br><span> from gnuradio import gr</span><br><span> </span><br><span> from gnuradio import filter</span><br><span>@@ -57,11 +56,6 @@</span><br><span> GSM_SYM_RATE = (1.0 / GSM_SYM_PERIOD_uS) * 1e6</span><br><span> SAMPLE_RATE = GSM_SYM_RATE * osr</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # FIXME: shall be measured (automatically?) for</span><br><span style="color: hsl(0, 100%, 40%);">- # particular device and particular clock rate.</span><br><span style="color: hsl(0, 100%, 40%);">- # The current value is measured for USRP B2X0 at 26e6.</span><br><span style="color: hsl(0, 100%, 40%);">- delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Dummy freq. value that is used during initialization</span><br><span> # basically, the DL freq. of ARFCN 0</span><br><span> DUMMY_FREQ = 935e6</span><br><span>@@ -83,6 +77,10 @@</span><br><span> self.ppm = phy_ppm</span><br><span> self.freq_offset = phy_freq_offset</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_args = phy_args</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rx_antenna = phy_rx_antenna</span><br><span style="color: hsl(120, 100%, 40%);">+ self.tx_antenna = phy_tx_antenna</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> gr.top_block.__init__(self, "GR-GSM TRX")</span><br><span> </span><br><span> # TRX Burst Interface</span><br><span>@@ -91,15 +89,7 @@</span><br><span> str(trx_base_port))</span><br><span> </span><br><span> # RX path definition</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src = uhd.usrp_source(phy_args,</span><br><span style="color: hsl(0, 100%, 40%);">- uhd.stream_args(cpu_format="fc32",</span><br><span style="color: hsl(0, 100%, 40%);">- channels=range(1)))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_antenna(phy_rx_antenna, 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_samp_rate(phy_sample_rate)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_bandwidth(650e3, 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_gain(phy_rx_gain)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_init_source()</span><br><span> </span><br><span> self.msg_to_tag_src = grgsm.msg_to_tag()</span><br><span> </span><br><span>@@ -115,7 +105,7 @@</span><br><span> </span><br><span> # Connections</span><br><span> self.connect(</span><br><span style="color: hsl(0, 100%, 40%);">- (self.phy_src, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ (self._phy_src, 0),</span><br><span> (self.msg_to_tag_src, 0))</span><br><span> </span><br><span> self.connect(</span><br><span>@@ -140,18 +130,11 @@</span><br><span> </span><br><span> </span><br><span> # TX Path Definition</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink = uhd.usrp_sink(phy_args,</span><br><span style="color: hsl(0, 100%, 40%);">- uhd.stream_args(cpu_format="fc32",</span><br><span style="color: hsl(0, 100%, 40%);">- channels=range(1)), "packet_len")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_antenna(phy_tx_antenna, 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_samp_rate(phy_sample_rate)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_gain(self.tx_gain)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_init_sink()</span><br><span> </span><br><span> self.tx_time_setter = grgsm.txtime_setter(</span><br><span> 0xffffffff, 0, 0, 0, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- self.delay_correction + self.GSM_UL_DL_SHIFT_uS * 1e-6)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_proc_delay + self.GSM_UL_DL_SHIFT_uS * 1e-6)</span><br><span> </span><br><span> self.tx_burst_proc = grgsm.preprocess_tx_burst()</span><br><span> </span><br><span>@@ -200,7 +183,7 @@</span><br><span> </span><br><span> self.connect(</span><br><span> (self.rotator_sink, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- (self.phy_sink, 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ (self._phy_sink, 0))</span><br><span> </span><br><span> </span><br><span> # RX & TX synchronization</span><br><span>@@ -245,11 +228,11 @@</span><br><span> (self.dict_toggle_sign, 'dict_out'),</span><br><span> (self.msg_to_tag_sink, 'msg'))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_init_source(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise NotImplementedError</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Some UHD devices (such as UmTRX) do start the clock</span><br><span style="color: hsl(0, 100%, 40%);">- # not from 0, so it's required to reset it manually.</span><br><span style="color: hsl(0, 100%, 40%);">- # Resetting UHD source will also affect the sink.</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_time_now(uhd.time_spec(0.0))</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_init_sink(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise NotImplementedError</span><br><span> </span><br><span> def shutdown(self):</span><br><span> print("[i] Shutdown Radio interface")</span><br><span>@@ -281,9 +264,10 @@</span><br><span> print("[#] Shifting RX freq. to %s (offset is %s)"</span><br><span> % (eng_notation.num_to_str(fc),</span><br><span> eng_notation.num_to_str(self.freq_offset)))</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_center_freq(fc, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.rotator_src.set_phase_inc(self.calc_phase_inc(fc))</span><br><span> self.gsm_clck_ctrl.set_fc(fc)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_set_rx_freq(fc)</span><br><span> self.rx_freq = fc</span><br><span> </span><br><span> def set_tx_freq(self, fc):</span><br><span>@@ -292,16 +276,17 @@</span><br><span> print("[#] Shifting TX freq. to %s (offset is %s)"</span><br><span> % (eng_notation.num_to_str(fc),</span><br><span> eng_notation.num_to_str(self.freq_offset)))</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_center_freq(fc, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_set_tx_freq(fc)</span><br><span> self.tx_freq = fc</span><br><span> </span><br><span> def set_rx_gain(self, gain):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_gain(gain, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_set_rx_gain(gain)</span><br><span> self.rx_gain = gain</span><br><span> </span><br><span> def set_tx_gain(self, gain):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_gain(gain, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_set_tx_gain(gain)</span><br><span> self.tx_gain = gain</span><br><span> </span><br><span> def set_slot(self, slot, config):</span><br><span>diff --git a/python/trx/radio_if_uhd.py b/python/trx/radio_if_uhd.py</span><br><span>new file mode 100644</span><br><span>index 0000000..b431fb6</span><br><span>--- /dev/null</span><br><span>+++ b/python/trx/radio_if_uhd.py</span><br><span>@@ -0,0 +1,73 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python2</span><br><span style="color: hsl(120, 100%, 40%);">+# -*- coding: utf-8 -*-</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# GR-GSM based transceiver</span><br><span style="color: hsl(120, 100%, 40%);">+# Radio interface for UHD devices</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+# it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+# the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+# (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+# but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+# GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+# with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span style="color: hsl(120, 100%, 40%);">+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from gnuradio import uhd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from radio_if import RadioInterface</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class RadioInterfaceUHD(RadioInterface):</span><br><span style="color: hsl(120, 100%, 40%);">+ @property</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_proc_delay(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # FIXME: shall be measured (automatically?) for</span><br><span style="color: hsl(120, 100%, 40%);">+ # particular device and particular clock rate.</span><br><span style="color: hsl(120, 100%, 40%);">+ # The current value is measured for USRP B2X0 at 26e6.</span><br><span style="color: hsl(120, 100%, 40%);">+ return (285.616 + 2 * self.GSM_SYM_PERIOD_uS) * 1e-6</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_init_source(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src = uhd.usrp_source(self.phy_args,</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd.stream_args(cpu_format = "fc32",</span><br><span style="color: hsl(120, 100%, 40%);">+ channels = range(1)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_antenna(self.rx_antenna, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_samp_rate(self.sample_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_bandwidth(650e3, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_gain(self.rx_gain)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Some UHD devices (such as UmTRX) do start the clock</span><br><span style="color: hsl(120, 100%, 40%);">+ # not from 0, so it's required to reset it manually.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Resetting UHD source will also affect the sink.</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_time_now(uhd.time_spec(0.0))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_init_sink(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink = uhd.usrp_sink(self.phy_args,</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd.stream_args(cpu_format = "fc32",</span><br><span style="color: hsl(120, 100%, 40%);">+ channels = range(1)), "packet_len")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink.set_antenna(self.tx_antenna, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink.set_samp_rate(self.sample_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink.set_gain(self.tx_gain)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_set_rx_freq(self, freq):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_center_freq(freq, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_set_tx_freq(self, freq):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink.set_center_freq(freq, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_set_rx_gain(self, gain):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_src.set_gain(gain, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def phy_set_tx_gain(self, gain):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._phy_sink.set_gain(gain, 0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12673">change 12673</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/12673"/><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: I1644a3f6b8da0d5f2a1a133058269e5383948fda </div>
<div style="display:none"> Gerrit-Change-Number: 12673 </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>