diff options
| author | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-06-04 16:08:44 +0000 |
|---|---|---|
| committer | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-06-04 16:08:44 +0000 |
| commit | c7dbfcc7d78275f76d8c2a8ef21e3100721874be (patch) | |
| tree | c57b7b49ba153b6858a86de8714c2737f55bbc26 /gnuradio-examples/python/ofdm/transmit_path.py | |
| parent | d476abb6debdf8ef5c0adf97af50a9b704605e2a (diff) | |
merge ordm/receiver branch -r5574:5659. Reworks OFDM receiver with refactored OFDM blocks. A few bug fixes for other blocks have also been slipped in.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5661 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/ofdm/transmit_path.py')
| -rw-r--r-- | gnuradio-examples/python/ofdm/transmit_path.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gnuradio-examples/python/ofdm/transmit_path.py b/gnuradio-examples/python/ofdm/transmit_path.py index 308ec0851f..e684c442cc 100644 --- a/gnuradio-examples/python/ofdm/transmit_path.py +++ b/gnuradio-examples/python/ofdm/transmit_path.py @@ -26,9 +26,6 @@ from gnuradio import eng_notation import copy import sys -# from current dir -import ofdm - # ///////////////////////////////////////////////////////////////////////////// # transmit path # ///////////////////////////////////////////////////////////////////////////// @@ -44,13 +41,11 @@ class transmit_path(gr.hier_block): self._verbose = options.verbose self._tx_amplitude = options.tx_amplitude # digital amplitude sent to USRP - self.ofdm_mod = ofdm.ofdm_mod(fg, options) - self.packet_transmitter = \ + self.ofdm_transmitter = \ blks.mod_ofdm_pkts(fg, - self.ofdm_mod, - access_code=None, + options, msgq_limit=4, - pad_for_usrp=True) + pad_for_usrp=False) self.amp = gr.multiply_const_cc(1) self.set_tx_amplitude(self._tx_amplitude) @@ -60,7 +55,7 @@ class transmit_path(gr.hier_block): self._print_verbage() # Create and setup transmit path flow graph - fg.connect(self.packet_transmitter, self.amp) + fg.connect(self.ofdm_transmitter, self.amp) gr.hier_block.__init__(self, fg, None, self.amp) def set_tx_amplitude(self, ampl): @@ -75,7 +70,7 @@ class transmit_path(gr.hier_block): """ Calls the transmitter method to send a packet """ - return self.packet_transmitter.send_pkt(payload, eof) + return self.ofdm_transmitter.send_pkt(payload, eof) def bitrate(self): return self._bitrate @@ -87,7 +82,7 @@ class transmit_path(gr.hier_block): """ Adds transmitter-specific options to the Options Parser """ - normal.add_option("", "--tx-amplitude", type="eng_float", default=12000, metavar="AMPL", + normal.add_option("", "--tx-amplitude", type="eng_float", default=1, 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("", "--log", action="store_true", default=False, |