<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10930">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: remove unnecessary checks of freq_offset<br><br>Checking if freq_offset is None doesn't make sense currently<br>as it's always set to a float value by argparse (to 0 by default).<br><br>Change-Id: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7<br>---<br>M apps/grgsm_trx<br>M python/trx/radio_if.py<br>2 files changed, 8 insertions(+), 15 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 5c3dace..b53d12a 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -66,10 +66,6 @@</span><br><span>                  self.phy_freq_offset_hz, self.bind_addr,</span><br><span>                     self.remote_addr, self.base_port)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           # Optional frequency offset</span><br><span style="color: hsl(0, 100%, 40%);">-             if self.phy_freq_offset_hz is not None:</span><br><span style="color: hsl(0, 100%, 40%);">-                 self.radio.freq_offset_hz = self.phy_freq_offset_hz</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>          # Power measurement emulation</span><br><span>                # Noise: -120 .. -105</span><br><span>                # BTS: -75 .. -50</span><br><span>diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py</span><br><span>index 11f1d40..a9b0358 100644</span><br><span>--- a/python/trx/radio_if.py</span><br><span>+++ b/python/trx/radio_if.py</span><br><span>@@ -60,7 +60,6 @@</span><br><span> </span><br><span> class radio_if(gr.top_block):</span><br><span>      # PHY specific variables</span><br><span style="color: hsl(0, 100%, 40%);">-        freq_offset_hz = None</span><br><span>        rx_freq = 935e6</span><br><span>      tx_freq = 890e6</span><br><span>      osr = 4</span><br><span>@@ -280,21 +279,19 @@</span><br><span>              return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate</span><br><span> </span><br><span>         def set_rx_freq(self, fc):</span><br><span style="color: hsl(0, 100%, 40%);">-              if self.freq_offset_hz is not None:</span><br><span style="color: hsl(0, 100%, 40%);">-                     fc += self.freq_offset_hz</span><br><span style="color: hsl(0, 100%, 40%);">-                       print("[#] Shifting RX freq. to %s (offset is %s)"</span><br><span style="color: hsl(0, 100%, 40%);">-                            % (eng_notation.num_to_str(fc),</span><br><span style="color: hsl(0, 100%, 40%);">-                                 eng_notation.num_to_str(self.freq_offset_hz)))</span><br><span style="color: hsl(120, 100%, 40%);">+                fc += self.freq_offset_hz</span><br><span style="color: hsl(120, 100%, 40%);">+             print("[#] Shifting RX freq. to %s (offset is %s)"</span><br><span style="color: hsl(120, 100%, 40%);">+                  % (eng_notation.num_to_str(fc),</span><br><span style="color: hsl(120, 100%, 40%);">+                               eng_notation.num_to_str(self.freq_offset_hz)))</span><br><span>               self.phy_src.set_center_freq(fc, 0)</span><br><span>          self.rotator_src.set_phase_inc(self.calc_phase_inc(fc))</span><br><span>              self.rx_freq = fc</span><br><span> </span><br><span>        def set_tx_freq(self, fc):</span><br><span style="color: hsl(0, 100%, 40%);">-              if self.freq_offset_hz is not None:</span><br><span style="color: hsl(0, 100%, 40%);">-                     fc += self.freq_offset_hz</span><br><span style="color: hsl(0, 100%, 40%);">-                       print("[#] Shifting TX freq. to %s (offset is %s)"</span><br><span style="color: hsl(0, 100%, 40%);">-                            % (eng_notation.num_to_str(fc),</span><br><span style="color: hsl(0, 100%, 40%);">-                                 eng_notation.num_to_str(self.freq_offset_hz)))</span><br><span style="color: hsl(120, 100%, 40%);">+                fc += self.freq_offset_hz</span><br><span style="color: hsl(120, 100%, 40%);">+             print("[#] Shifting TX freq. to %s (offset is %s)"</span><br><span style="color: hsl(120, 100%, 40%);">+                  % (eng_notation.num_to_str(fc),</span><br><span style="color: hsl(120, 100%, 40%);">+                               eng_notation.num_to_str(self.freq_offset_hz)))</span><br><span>               self.phy_sink.set_center_freq(fc, 0)</span><br><span>                 self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc))</span><br><span>            self.tx_freq = fc</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10930">change 10930</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/10930"/><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: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7 </div>
<div style="display:none"> Gerrit-Change-Number: 10930 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Piotr Krysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Piotr Krysik <ptrkrysik@gmail.com> </div>