From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 9 Feb 2010 17:58:11 +0000 (-0800)
Subject: Removing resampler from usrp transmit path as its taken care of in the modulators.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=33a573f76291a32585f85df0c8a5a9f894bd27fd;p=debian%2Fgnuradio

Removing resampler from usrp transmit path as its taken care of in the modulators.
---

diff --git a/gnuradio-core/src/python/gnuradio/packet_utils.py b/gnuradio-core/src/python/gnuradio/packet_utils.py
index 1417c17f..e36b0541 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 f4bddf5a..5d841d3e 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())