diff options
| author | Tom Rondeau | 2011-10-06 18:57:39 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-06 18:57:39 -0400 |
| commit | 132a3c185b47263398d38b6b454e5c990b02b52f (patch) | |
| tree | 2adb62830b9e5f0fe187a745e6b310f2a82f8987 /gr-digital/python | |
| parent | e0e396d541673260fcab7b48f3c462b390b508c8 (diff) | |
| parent | 42b034d07f7d27f3c645bebd0aed01f358e669bb (diff) | |
| download | gnuradio-132a3c185b47263398d38b6b454e5c990b02b52f.tar.gz gnuradio-132a3c185b47263398d38b6b454e5c990b02b52f.tar.bz2 gnuradio-132a3c185b47263398d38b6b454e5c990b02b52f.zip | |
Merge branch 'digital' of github.com:trondeau/gnuradio into digital
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/gmsk.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-digital/python/gmsk.py b/gr-digital/python/gmsk.py index ba122821e..4db62e40d 100644 --- a/gr-digital/python/gmsk.py +++ b/gr-digital/python/gmsk.py @@ -78,8 +78,8 @@ class gmsk_mod(gr.hier_block2): self._samples_per_symbol = samples_per_symbol self._bt = bt - if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2: - raise TypeError, ("samples_per_symbol must be an integer >= 2, is %r" % \ + if samples_per_symbol < 2: + raise TypeError, ("samples_per_symbol must >= 2, is %r" % \ (samples_per_symbol,)) ntaps = 4 * samples_per_symbol # up to 3 bits in filter at once @@ -94,12 +94,12 @@ class gmsk_mod(gr.hier_block2): 1, # gain samples_per_symbol, # symbol_rate bt, # bandwidth * symbol time - ntaps # number of taps + int(ntaps) # number of taps ) - self.sqwave = (1,) * samples_per_symbol # rectangular window + self.sqwave = (1,) * int(samples_per_symbol) # rectangular window self.taps = numpy.convolve(numpy.array(self.gaussian_taps),numpy.array(self.sqwave)) - self.gaussian_filter = gr.interp_fir_filter_fff(samples_per_symbol, self.taps) + self.gaussian_filter = gr.pfb_arb_resampler_fff(samples_per_symbol, self.taps) # FM modulation self.fmmod = gr.frequency_modulator_fc(sensitivity) |