From bc0a3ff98377e41fa1e31d448d45b2b377b54cea Mon Sep 17 00:00:00 2001
From: trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 17 Jun 2009 02:14:59 +0000
Subject: Merging trondeau/digital branch r11185:11205 to improve digital
example interfacing and remove redundancy.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11209 221aa14e-8319-0410-a670-987f0aec2ac5
---
gnuradio-examples/python/digital/transmit_path.py | 126 ++++------------------
1 file changed, 20 insertions(+), 106 deletions(-)
(limited to 'gnuradio-examples/python/digital/transmit_path.py')
diff --git a/gnuradio-examples/python/digital/transmit_path.py b/gnuradio-examples/python/digital/transmit_path.py
index 2819e87f48..11d3702694 100644
--- a/gnuradio-examples/python/digital/transmit_path.py
+++ b/gnuradio-examples/python/digital/transmit_path.py
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -20,74 +20,43 @@
#
from gnuradio import gr, gru, blks2
-from gnuradio import usrp
from gnuradio import eng_notation
import copy
import sys
-# from current dir
-from pick_bitrate import pick_tx_bitrate
-import usrp_options
-
# /////////////////////////////////////////////////////////////////////////////
# transmit path
# /////////////////////////////////////////////////////////////////////////////
-class transmit_path(gr.hier_block2):
+class transmit_path(gr.hier_block2):
def __init__(self, modulator_class, options):
'''
See below for what options should hold
'''
gr.hier_block2.__init__(self, "transmit_path",
- gr.io_signature(0, 0, 0), # Input signature
- gr.io_signature(0, 0, 0)) # Output signature
-
+ gr.io_signature(0, 0, 0), # Input signature
+ gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
+
options = copy.copy(options) # make a copy so we can destructively modify
self._verbose = options.verbose
- self._tx_freq = options.tx_freq # tranmitter's center frequency
self._tx_amplitude = options.tx_amplitude # digital amplitude sent to USRP
self._bitrate = options.bitrate # desired bit rate
- self._interp = options.interp # interpolating rate for the USRP (prelim)
self._samples_per_symbol = options.samples_per_symbol # desired samples/baud
- self._use_whitener_offset = options.use_whitener_offset # increment start of whitener XOR data
-
- self._modulator_class = modulator_class # the modulator_class we are using
-
- if self._tx_freq is None:
- sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be specified\n")
- raise SystemExit
-
- # Set up USRP sink; also adjusts interp, samples_per_symbol, and bitrate
- self._setup_usrp_sink(options)
- # copy the final answers back into options for use by modulator
- options.samples_per_symbol = self._samples_per_symbol
- options.bitrate = self._bitrate
- options.interp = self._interp
+ self._modulator_class = modulator_class # the modulator_class we are using
# Get mod_kwargs
mod_kwargs = self._modulator_class.extract_kwargs_from_options(options)
-
- # Set center frequency of USRP
- ok = self.set_freq(self._tx_freq)
- if not ok:
- print "Failed to set Tx frequency to %s" % (eng_notation.num_to_str(self._tx_freq),)
- raise ValueError
# transmitter
+ modulator = self._modulator_class(**mod_kwargs)
self.packet_transmitter = \
- blks2.mod_pkts(self._modulator_class(**mod_kwargs),
+ blks2.mod_pkts(modulator,
access_code=None,
msgq_limit=4,
- pad_for_usrp=True,
- use_whitener_offset=options.use_whitener_offset)
-
-
- # Set the USRP for maximum transmit gain
- # (Note that on the RFX cards this is a nop.)
- #self.set_gain(self.u.gain_range()[1])
+ pad_for_usrp=True)
self.amp = gr.multiply_const_cc(1)
self.set_tx_amplitude(self._tx_amplitude)
@@ -96,47 +65,17 @@ class transmit_path(gr.hier_block2):
if self._verbose:
self._print_verbage()
- # Create and setup transmit path flow graph
- self.connect(self.packet_transmitter, self.amp, self.u)
-
- def _setup_usrp_sink(self, options):
- """
- Creates a USRP sink, determines the settings for best bitrate,
- and attaches to the transmitter's subdevice.
- """
- self.u = usrp_options.create_usrp_sink(options)
- dac_rate = self.u.dac_rate();
-
- # derive values of bitrate, samples_per_symbol, and interp from desired info
- (self._bitrate, self._samples_per_symbol, self._interp) = \
- pick_tx_bitrate(self._bitrate, self._modulator_class.bits_per_symbol(),
- self._samples_per_symbol, self._interp, dac_rate, self.u.get_interp_rates())
-
- self.u.set_interp(self._interp)
-
-
- def set_freq(self, target_freq):
- """
- Set the center frequency we're interested in.
-
- @param target_freq: frequency in Hz
- @rypte: bool
-
- Tuning is a two step process. First we ask the front-end to
- tune as close to the desired frequency as it can. Then we use
- the result of that operation and our target_frequency to
- determine the value for the digital up converter.
- """
- return self.u.set_center_freq(target_freq)
+ # Connect components in the flowgraph
+ self.connect(self.packet_transmitter, self.amp, self)
def set_tx_amplitude(self, ampl):
"""
Sets the transmit amplitude sent to the USRP
- @param ampl the amplitude between 0.0 and 1.0
+ @param: ampl 0 <= ampl < 32768. Try 8000
"""
- self._tx_amplitude = max(0.0, min(ampl, 1.0))
+ self._tx_amplitude = max(0.0, min(ampl, 32767.0))
self.amp.set_k(self._tx_amplitude)
-
+
def send_pkt(self, payload='', eof=False):
"""
Calls the transmitter method to send a packet
@@ -149,29 +88,21 @@ class transmit_path(gr.hier_block2):
def samples_per_symbol(self):
return self._samples_per_symbol
- def interp(self):
- return self._interp
-
def add_options(normal, expert):
"""
Adds transmitter-specific options to the Options Parser
"""
- add_freq_option(normal)
if not normal.has_option('--bitrate'):
- normal.add_option("-r", "--bitrate", type="eng_float", default=None,
- help="specify bitrate. samples-per-symbol and interp/decim will be derived.")
- usrp_options.add_tx_options(normal)
- normal.add_option("--tx-amplitude", type="eng_float", default=0.15, metavar="AMPL",
- help="set transmitter digital amplitude (0.0-1.0) [default=%default].")
+ normal.add_option("-r", "--bitrate", type="eng_float", default=100e3,
+ help="specify bitrate [default=%default].")
+ normal.add_option("", "--tx-amplitude", type="eng_float", default=12000, metavar="AMPL",
+ help="set transmitter digital amplitude: 0 <= AMPL < 32768 [default=%default]")
normal.add_option("-v", "--verbose", action="store_true", default=False)
- expert.add_option("-S", "--samples-per-symbol", type="int", default=None,
+
+ expert.add_option("-S", "--samples-per-symbol", type="int", default=2,
help="set samples/symbol [default=%default]")
- expert.add_option("", "--tx-freq", type="eng_float", default=None,
- help="set transmit frequency to FREQ [default=%default]", metavar="FREQ")
expert.add_option("", "--log", action="store_true", default=False,
help="Log all parts of flow graph to file (CAUTION: lots of data)")
- expert.add_option("","--use-whitener-offset", action="store_true", default=False,
- help="make sequential packets use different whitening")
# Make a static method to call before instantiation
add_options = staticmethod(add_options)
@@ -180,25 +111,8 @@ class transmit_path(gr.hier_block2):
"""
Prints information about the transmit path
"""
- print "Using TX d'board %s" % (self.u,)
print "Tx amplitude %s" % (self._tx_amplitude)
print "modulation: %s" % (self._modulator_class.__name__)
print "bitrate: %sb/s" % (eng_notation.num_to_str(self._bitrate))
print "samples/symbol: %3d" % (self._samples_per_symbol)
- print "interp: %3d" % (self._interp)
- print "Tx Frequency: %s" % (eng_notation.num_to_str(self._tx_freq))
-
-def add_freq_option(parser):
- """
- Hackery that has the -f / --freq option set both tx_freq and rx_freq
- """
- def freq_callback(option, opt_str, value, parser):
- parser.values.rx_freq = value
- parser.values.tx_freq = value
-
- if not parser.has_option('--freq'):
- parser.add_option('-f', '--freq', type="eng_float",
- action="callback", callback=freq_callback,
- help="set Tx and/or Rx frequency to FREQ [default=%default]",
- metavar="FREQ")
--
cgit v1.2.3