[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4523 - gnuradio/branches/developers/n4hy/ofdm2/gnurad
From: |
matt |
Subject: |
[Commit-gnuradio] r4523 - gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm |
Date: |
Mon, 19 Feb 2007 15:46:12 -0700 (MST) |
Author: matt
Date: 2007-02-19 15:46:12 -0700 (Mon, 19 Feb 2007)
New Revision: 4523
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
Log:
set data rate using interp, do something fancy later
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
2007-02-19 22:30:37 UTC (rev 4522)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
2007-02-19 22:46:12 UTC (rev 4523)
@@ -41,7 +41,6 @@
self._tx_subdev_spec = options.tx_subdev_spec # daughterboard to
use
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._fusb_block_size = options.fusb_block_size # usb info for USRP
self._fusb_nblocks = options.fusb_nblocks # usb info for USRP
@@ -49,13 +48,11 @@
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
+ # Set up USRP sink; also adjusts interp, and bitrate
self._setup_usrp_sink()
# 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
+ #options.bitrate = self._bitrate
self.txpath = transmit_path(self, options)
@@ -68,13 +65,7 @@
"""
self.u = usrp.sink_c(fusb_block_size=self._fusb_block_size,
fusb_nblocks=self._fusb_nblocks)
- 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, 1,
- self._samples_per_symbol, self._interp, dac_rate)
-
self.u.set_interp_rate(self._interp)
# determine the daughterboard subdevice we're using
@@ -143,7 +134,7 @@
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("-i", "--interp", type="intx", default=None,
+ expert.add_option("-i", "--interp", type="intx", default=64,
help="set fpga interpolation rate to INTERP
[default=%default]")
# Make a static method to call before instantiation
add_options = staticmethod(add_options)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4523 - gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm,
matt <=