summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/python
diff options
context:
space:
mode:
authorTom Rondeau2010-02-08 21:30:09 -0800
committerTom Rondeau2010-02-08 21:30:09 -0800
commitf6010974b8f0af65a8b1a875587bb4a7810565ce (patch)
treecd5bb4169035a74d9b1b681920ac8e801d8ac968 /gnuradio-core/src/python
parentfe3150d5e5a0bb7bf98b5f44ad0b68a107bd7f9a (diff)
downloadgnuradio-f6010974b8f0af65a8b1a875587bb4a7810565ce.tar.gz
gnuradio-f6010974b8f0af65a8b1a875587bb4a7810565ce.tar.bz2
gnuradio-f6010974b8f0af65a8b1a875587bb4a7810565ce.zip
Setting up code to handle setting of samples per symbol properly. Still buggy in the transmitter due to the make packet padding to 512 bytes.
Diffstat (limited to 'gnuradio-core/src/python')
-rw-r--r--gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
index e9fb3df89..a5c5fa164 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
@@ -83,7 +83,7 @@ class dbpsk2_mod(gr.hier_block2):
self._excess_bw = excess_bw
self._gray_code = gray_code
- if not isinstance(self._samples_per_symbol, int) or self._samples_per_symbol < 2:
+ if self._samples_per_symbol < 2:
raise TypeError, ("sbp must be an integer >= 2, is %d" % self._samples_per_symbol)
arity = pow(2,self.bits_per_symbol())
@@ -103,7 +103,7 @@ class dbpsk2_mod(gr.hier_block2):
# pulse shaping filter
nfilts = 32
- ntaps = nfilts * 11 * self._samples_per_symbol # make nfilts filters of ntaps each
+ ntaps = nfilts * 11 * int(self._samples_per_symbol) # make nfilts filters of ntaps each
self.rrc_taps = gr.firdes.root_raised_cosine(
nfilts, # gain
nfilts, # sampling rate based on 32 filters in resampler