sdr
/
gr-gsm
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Piotr Krysik 2018-09-13 14:53:26 +02:00
parent 0631767b24
commit 0f3bceb13d
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/grgsm_trx
View File

@ -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

19
python/trx/radio_if.py
View File

@ -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