<p>Piotr Krysik has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10933">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps/grgsm_trx: remove redundant unit from freq_offset variable name<br><br>Frequency is always in Hz so there is no need to add that<br>information in the variable name.<br><br>Change-Id: I509771c3fe072069a680f66b0763ae6825f6d529<br>---<br>M apps/grgsm_trx<br>M python/trx/radio_if.py<br>2 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/33/10933/1</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 b53d12a..efb9c24 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -52,7 +52,7 @@</span><br><span> self.phy_tx_gain = argv.tx_gain</span><br><span> self.phy_rx_antenna = argv.rx_antenna</span><br><span> self.phy_tx_antenna = argv.tx_antenna</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_freq_offset_hz = argv.freq_offset</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_freq_offset = argv.freq_offset</span><br><span> self.phy_ppm = argv.ppm</span><br><span> </span><br><span> # Set up signal handlers</span><br><span>@@ -63,7 +63,7 @@</span><br><span> self.radio = radio_if(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 style="color: hsl(0, 100%, 40%);">- self.phy_freq_offset_hz, self.bind_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_freq_offset, self.bind_addr,</span><br><span> self.remote_addr, self.base_port)</span><br><span> </span><br><span> # Power measurement emulation</span><br><span>diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py</span><br><span>index a9b0358..85970a9 100644</span><br><span>--- a/python/trx/radio_if.py</span><br><span>+++ b/python/trx/radio_if.py</span><br><span>@@ -85,7 +85,7 @@</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 style="color: hsl(0, 100%, 40%);">- phy_freq_offset_hz, trx_bind_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ phy_freq_offset, trx_bind_addr,</span><br><span> trx_remote_addr, trx_base_port):</span><br><span> </span><br><span> print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"</span><br><span>@@ -97,7 +97,7 @@</span><br><span> self.rx_gain = phy_rx_gain</span><br><span> self.tx_gain = phy_tx_gain</span><br><span> self.ppm = phy_ppm</span><br><span style="color: hsl(0, 100%, 40%);">- self.freq_offset_hz = phy_freq_offset_hz</span><br><span style="color: hsl(120, 100%, 40%);">+ self.freq_offset = phy_freq_offset</span><br><span> </span><br><span> gr.top_block.__init__(self, "GR-GSM TRX")</span><br><span> </span><br><span>@@ -279,19 +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%);">- fc += self.freq_offset_hz</span><br><span style="color: hsl(120, 100%, 40%);">+ fc += self.freq_offset</span><br><span> print("[#] Shifting RX freq. to %s (offset is %s)"</span><br><span> % (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%);">+ eng_notation.num_to_str(self.freq_offset)))</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%);">- fc += self.freq_offset_hz</span><br><span style="color: hsl(120, 100%, 40%);">+ fc += self.freq_offset</span><br><span> print("[#] Shifting TX freq. to %s (offset is %s)"</span><br><span> % (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%);">+ eng_notation.num_to_str(self.freq_offset)))</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/10933">change 10933</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/10933"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I509771c3fe072069a680f66b0763ae6825f6d529 </div>
<div style="display:none"> Gerrit-Change-Number: 10933 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Piotr Krysik <ptrkrysik@gmail.com> </div>