brmlab/osmo-tetra
4
0
Fork 0
mirror of https://github.com/brmlab/osmo-tetra.git synced 2025-06-07 17:34:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

demod: Add new option to usrp1 demod

Browse source 
- Antenna selection
 - FPGA master freq
 - Better default subdevice picking

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2011-09-25 16:37:54 +02:00
parent abc2eb2b97
commit 4384428843
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/demod/python/usrp1-tetra_demod.py
View file

@ -14,6 +14,8 @@ except:
# applies frequency translation, resampling (interpolation/decimation) and cqpsk demodulation # applies frequency translation, resampling (interpolation/decimation) and cqpsk demodulation
class my_top_block(gr.top_block): class my_top_block(gr.top_block):
def __init__(self, options): def __init__(self, options):
gr.top_block.__init__(self) gr.top_block.__init__(self)
@ -22,14 +24,30 @@ class my_top_block(gr.top_block):
fusb_nblocks = gr.prefs().get_long('fusb', 'nblocks', 16) fusb_nblocks = gr.prefs().get_long('fusb', 'nblocks', 16)
self._u = usrp.source_c(decim_rate=options.decim, fusb_block_size=fusb_block_size, fusb_nblocks=fusb_nblocks) self._u = usrp.source_c(decim_rate=options.decim, fusb_block_size=fusb_block_size, fusb_nblocks=fusb_nblocks)
if options.rx_subdev_spec is None: # master clock
#options.rx_subdev_spec = pick_subdevice(self._u) if options.fpga_freq is not None:
options.rx_subdev_spec = (0, 0) self._u.set_fpga_master_clock_freq(long(options.fpga_freq))
# default subdev if use didn't pick one
if options.rx_subdev_spec is None:
if u.db(0, 0).dbid() >= 0:
options.rx_subdev_spec = (0, 0)
elif u.db(1, 0).dbid() >= 0:
options.rx_subdev_spec = (1, 0)
else:
options.rx_subdev_spec = (0, 0)
# configure usrp mux
self._u.set_mux(usrp.determine_rx_mux_value(self._u, options.rx_subdev_spec)) self._u.set_mux(usrp.determine_rx_mux_value(self._u, options.rx_subdev_spec))
# determine the daughterboard subdevice # determine the daughterboard subdevice
self.subdev = usrp.selected_subdev(self._u, options.rx_subdev_spec) self.subdev = usrp.selected_subdev(self._u, options.rx_subdev_spec)
# select antenna
if options.antenna is not None:
print "Selecting antenna %s" % (options.antenna,)
self.subdev.select_rx_antenna(options.antenna)
# set initial values # set initial values
if options.gain is None: if options.gain is None:
# if no gain was specified, use the mid-point in dB # if no gain was specified, use the mid-point in dB
@ -82,6 +100,10 @@ def get_options():
help="set gain in dB (default is midpoint)") help="set gain in dB (default is midpoint)")
parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None, parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
help="Select USRP Rx side A or B (default=first one with a daughterboard)") help="Select USRP Rx side A or B (default=first one with a daughterboard)")
parser.add_option("-A", "--antenna", default=None,
help="select Rx Antenna")
parser.add_option("-F", "--fpga-freq", type="eng_float", default=None,
help="set USRP reference clock frequency to FPGA_FREQ", metavar="FPGA_FREQ")
# demodulator related settings # demodulator related settings
parser.add_option("-c", "--calibration", type="int", default=0, help="freq offset") parser.add_option("-c", "--calibration", type="int", default=0, help="freq offset")