diff options
author | Josh Blum | 2011-09-28 22:59:51 -0700 |
---|---|---|
committer | Josh Blum | 2011-09-28 22:59:51 -0700 |
commit | b06328b4adee941fe62f12a848cc903097711bdd (patch) | |
tree | fa8b6d5aaadd6bb70786e57891b52a7a17b0b3f6 /gr-digital/examples/transmit_path.py | |
parent | 3f7db0afa99caeecb18428d7514dadd380d88d56 (diff) | |
parent | 3e8c3125da6234c4d1f8c0eaf869bc86923cb292 (diff) | |
download | gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.gz gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.bz2 gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.zip |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gr-digital/lib/Makefile.am
gr-digital/python/__init__.py
Diffstat (limited to 'gr-digital/examples/transmit_path.py')
-rw-r--r-- | gr-digital/examples/transmit_path.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gr-digital/examples/transmit_path.py b/gr-digital/examples/transmit_path.py index f22ffb327..3af37f330 100644 --- a/gr-digital/examples/transmit_path.py +++ b/gr-digital/examples/transmit_path.py @@ -36,16 +36,15 @@ class transmit_path(gr.hier_block2): 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(1, 1, gr.sizeof_gr_complex)) # Output signature + gr.io_signature(0,0,0), + gr.io_signature(1,1,gr.sizeof_gr_complex)) options = copy.copy(options) # make a copy so we can destructively modify - self._verbose = options.verbose - self._tx_amplitude = options.tx_amplitude # digital amplitude sent to USRP - self._bitrate = options.bitrate # desired bit rate - - self._modulator_class = modulator_class # the modulator_class we are using + self._verbose = options.verbose + self._tx_amplitude = options.tx_amplitude # digital amplitude sent to USRP + self._bitrate = options.bitrate # desired bit rate + self._modulator_class = modulator_class # the modulator_class we are using # Get mod_kwargs mod_kwargs = self._modulator_class.extract_kwargs_from_options(options) @@ -103,7 +102,7 @@ class transmit_path(gr.hier_block2): help="set transmitter digital amplitude: 0 <= AMPL < 1 [default=%default]") normal.add_option("-v", "--verbose", action="store_true", default=False) - expert.add_option("-S", "--samples-per-symbol", type="float", default=None, + expert.add_option("-S", "--samples-per-symbol", type="float", default=2, help="set samples/symbol [default=%default]") expert.add_option("", "--log", action="store_true", default=False, help="Log all parts of flow graph to file (CAUTION: lots of data)") |