diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-02-09 09:58:11 -0800 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-02-09 09:58:11 -0800 |
| commit | 33a573f76291a32585f85df0c8a5a9f894bd27fd (patch) | |
| tree | e2f28f5c45be9f0b8dbbfdf4613ba4dbbe49f467 | |
| parent | f6010974b8f0af65a8b1a875587bb4a7810565ce (diff) | |
Removing resampler from usrp transmit path as its taken care of in the modulators.
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/packet_utils.py | 2 | ||||
| -rw-r--r-- | gnuradio-examples/python/digital/usrp_transmit_path.py | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/gnuradio-core/src/python/gnuradio/packet_utils.py b/gnuradio-core/src/python/gnuradio/packet_utils.py index 1417c17fa5..e36b05413e 100644 --- a/gnuradio-core/src/python/gnuradio/packet_utils.py +++ b/gnuradio-core/src/python/gnuradio/packet_utils.py @@ -143,7 +143,7 @@ def make_packet(payload, samples_per_symbol, bits_per_symbol, (payload_with_crc), '\x55')) if pad_for_usrp: - pkt = pkt + (_npadding_bytes(len(pkt), samples_per_symbol, bits_per_symbol) * '\x55') + pkt = pkt + (_npadding_bytes(len(pkt), int(samples_per_symbol), bits_per_symbol) * '\x55') #print "make_packet: len(pkt) =", len(pkt) return pkt diff --git a/gnuradio-examples/python/digital/usrp_transmit_path.py b/gnuradio-examples/python/digital/usrp_transmit_path.py index f4bddf5a83..5d841d3e6e 100644 --- a/gnuradio-examples/python/digital/usrp_transmit_path.py +++ b/gnuradio-examples/python/digital/usrp_transmit_path.py @@ -68,12 +68,8 @@ class usrp_transmit_path(gr.hier_block2): if not attr.startswith('_') and not hasattr(self, attr): setattr(self, attr, getattr(tx_path, attr)) - # Set up resampler based on rate determined by _setup_usrp_sink - rs_taps = gr.firdes.low_pass_2(32, 32, 0.45, 0.1, 60) - self.resampler = gr.pfb_arb_resampler_ccf(self.rs_rate, rs_taps) - #connect - self.connect(tx_path, self.resampler, self.u) + self.connect(tx_path, self.u) def _setup_usrp_sink(self, options): """ @@ -85,10 +81,7 @@ class usrp_transmit_path(gr.hier_block2): self.rs_rate = options.bitrate # Store requested bit rate if options.verbose: print 'USRP Sink:', self.u - #(self._bitrate, self._samples_per_symbol, self._interp) = \ - # pick_tx_bitrate(options.bitrate, self._modulator_class.bits_per_symbol(), \ - # options.samples_per_symbol, options.interp, dac_rate, \ - # self.u.get_interp_rates()) + (self._bitrate, self._samples_per_symbol, self._interp) = \ pick_tx_bitrate(options.bitrate, self._modulator_class.bits_per_symbol(), \ dac_rate, self.u.get_interp_rates()) |