diff options
author | Eric Blossom | 2010-12-21 13:31:58 -0800 |
---|---|---|
committer | Eric Blossom | 2010-12-21 13:31:58 -0800 |
commit | 75b650ef2506fe5c607517a3d5188b0705f60fde (patch) | |
tree | 99cb6fd6adc3e91edc832cbaee236d2fe30fa3fd /gnuradio-core/src/python | |
parent | 1984aab345857296564e174395cf3af1375e1469 (diff) | |
parent | ed78ba5d9999bbe50507373a1aa2877ef0da64c6 (diff) | |
download | gnuradio-75b650ef2506fe5c607517a3d5188b0705f60fde.tar.gz gnuradio-75b650ef2506fe5c607517a3d5188b0705f60fde.tar.bz2 gnuradio-75b650ef2506fe5c607517a3d5188b0705f60fde.zip |
Merge branch 'next' into guile.
Passes distcheck.
* next: (32 commits)
volk: Fix for popcnt's 64/32-bit issues.
Using a copy of config.guess and config.sub instead of sym links.
Including time header to qa files.
Changed python env variable to more globally usable version.
gr_uhd: Quick fix for make distcheck failures if UHD is not installed.
PFB resampler: fix it this way to avoid the signed/unsigned warning.
PFB resampler: fixes bug where filter could be looking past the number of inputs.
resampler PFB: Sets relative rate when rate is changed.
Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC.
volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags.
volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit.
volk: May be a hack, but it was required for my 32-bit Fedora 13 to work.
volk: Removing unnecessary shell script; last commit takes care if its functions.
volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script.
volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error.
volk: Adding a few more generic-only test cases.
volk: adding generic QA test for 16sc_magnitude_32f.
volk: modified the configure scripts to output which architectures it will be building based on the configure tests.
uhd: update notes in grc blocks for addressing scheme
volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps).
...
Diffstat (limited to 'gnuradio-core/src/python')
-rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py index cd9289fa5..74eae58dc 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py @@ -48,9 +48,14 @@ class pfb_arb_resampler_ccf(gr.hier_block2): self._taps = gr.firdes.low_pass_2(self._size, self._size, bw, tb, atten) self.pfb = gr.pfb_arb_resampler_ccf(self._rate, self._taps, self._size) - + #print "PFB has %d taps\n" % (len(self._taps),) + self.connect(self, self.pfb) self.connect(self.pfb, self) - + + # Note -- set_taps not implemented in base class yet def set_taps(self, taps): self.pfb.set_taps(taps) + + def set_rate(self, rate): + self.pfb.set_rate(rate) |