<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12632">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, but someone else must approve
Piotr Krysik: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx/radio_if.py: do not init both rx_freq and tx_freq<br><br>Change-Id: I9f251958ec90141d144fdb027aff20182131a1d1<br>---<br>M python/trx/radio_if.py<br>1 file changed, 11 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py</span><br><span>index 32b767a..93080c4 100644</span><br><span>--- a/python/trx/radio_if.py</span><br><span>+++ b/python/trx/radio_if.py</span><br><span>@@ -4,7 +4,7 @@</span><br><span> # GR-GSM based transceiver</span><br><span> # Follow graph implementation</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# (C) 2016-2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2016-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> # (C) 2017 by Piotr Krysik <ptrkrysik@gmail.com></span><br><span> #</span><br><span> # All Rights Reserved</span><br><span>@@ -43,8 +43,8 @@</span><br><span> </span><br><span> class RadioInterface(gr.top_block):</span><br><span> # PHY specific variables</span><br><span style="color: hsl(0, 100%, 40%);">- rx_freq = 935e6</span><br><span style="color: hsl(0, 100%, 40%);">- tx_freq = 890e6</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_freq = None</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_freq = None</span><br><span> osr = 4</span><br><span> </span><br><span> # Application state flags</span><br><span>@@ -65,6 +65,10 @@</span><br><span> # The current value is measured for USRP B2X0 at 26e6.</span><br><span> delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Dummy freq. value that is used during initialization</span><br><span style="color: hsl(120, 100%, 40%);">+ # basically, the DL freq. of ARFCN 0</span><br><span style="color: hsl(120, 100%, 40%);">+ DUMMY_FREQ = 935e6</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def __init__(self, phy_args, phy_sample_rate,</span><br><span> phy_rx_gain, phy_tx_gain, phy_ppm,</span><br><span> phy_rx_antenna, phy_tx_antenna,</span><br><span>@@ -95,7 +99,6 @@</span><br><span> channels=range(1)))</span><br><span> </span><br><span> self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_src.set_center_freq(self.rx_freq, 0)</span><br><span> self.phy_src.set_antenna(phy_rx_antenna, 0)</span><br><span> self.phy_src.set_samp_rate(phy_sample_rate)</span><br><span> self.phy_src.set_bandwidth(650e3, 0)</span><br><span>@@ -103,8 +106,7 @@</span><br><span> </span><br><span> self.msg_to_tag_src = grgsm.msg_to_tag()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.rotator_src = grgsm.controlled_rotator_cc(</span><br><span style="color: hsl(0, 100%, 40%);">- self.calc_phase_inc(self.rx_freq))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rotator_src = grgsm.controlled_rotator_cc(0.0)</span><br><span> </span><br><span> self.lpf = filter.fir_filter_ccf(1, firdes.low_pass(</span><br><span> 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76))</span><br><span>@@ -148,7 +150,6 @@</span><br><span> self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS)</span><br><span> self.phy_sink.set_antenna(phy_tx_antenna, 0)</span><br><span> self.phy_sink.set_samp_rate(phy_sample_rate)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sink.set_center_freq(self.tx_freq, 0)</span><br><span> self.phy_sink.set_gain(self.tx_gain)</span><br><span> </span><br><span> self.tx_time_setter = grgsm.txtime_setter(</span><br><span>@@ -169,8 +170,7 @@</span><br><span> </span><br><span> self.msg_to_tag_sink = grgsm.msg_to_tag()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.rotator_sink = grgsm.controlled_rotator_cc(</span><br><span style="color: hsl(0, 100%, 40%);">- -self.calc_phase_inc(self.tx_freq))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rotator_sink = grgsm.controlled_rotator_cc(0.0)</span><br><span> </span><br><span> # Connections</span><br><span> self.msg_connect(</span><br><span>@@ -225,8 +225,9 @@</span><br><span> </span><br><span> </span><br><span> # AFC (Automatic Frequency Correction)</span><br><span style="color: hsl(120, 100%, 40%);">+ # NOTE: dummy frequency is used during init</span><br><span> self.gsm_clck_ctrl = grgsm.clock_offset_control(</span><br><span style="color: hsl(0, 100%, 40%);">- self.rx_freq, phy_sample_rate, osr = self.osr)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.DUMMY_FREQ, phy_sample_rate, osr = self.osr)</span><br><span> </span><br><span> self.dict_toggle_sign = dict_toggle_sign()</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12632">change 12632</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/12632"/><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: I9f251958ec90141d144fdb027aff20182131a1d1 </div>
<div style="display:none"> Gerrit-Change-Number: 12632 </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: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Piotr Krysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>