diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2018-09-13 14:53:26 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2018-09-13 15:35:44 +0200 |
| commit | d6e8bb744e05a749ed1fa55479c0d702da37166c (patch) | |
| tree | 208f382f7ec2d2d60f2f0781f9056a433908ee5d | |
| parent | 11583adb9dc69cd9ad4bdfd8c651937e4cbea136 (diff) | |
apps/grgsm_trx: remove unnecessary checks of freq_offset
Checking if freq_offset is None doesn't make sense currently
as it's always set to a float value by argparse (to 0 by default).
Change-Id: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7
| -rwxr-xr-x | apps/grgsm_trx | 4 | ||||
| -rw-r--r-- | python/trx/radio_if.py | 19 |
2 files changed, 8 insertions, 15 deletions
diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 5c3dace..b53d12a 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -66,10 +66,6 @@ class Application: self.phy_freq_offset_hz, self.bind_addr, self.remote_addr, self.base_port) - # Optional frequency offset - if self.phy_freq_offset_hz is not None: - self.radio.freq_offset_hz = self.phy_freq_offset_hz - # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 11f1d40..a9b0358 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -60,7 +60,6 @@ class dict_toggle_sign(gr.basic_block): class radio_if(gr.top_block): # PHY specific variables - freq_offset_hz = None rx_freq = 935e6 tx_freq = 890e6 osr = 4 @@ -280,21 +279,19 @@ class radio_if(gr.top_block): return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting RX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + fc += self.freq_offset_hz + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting TX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + fc += self.freq_offset_hz + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc |