diff options
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/examples/example_timing.py | 5 | ||||
| -rw-r--r-- | gr-digital/python/digital/gmsk.py | 4 | ||||
| -rw-r--r-- | gr-digital/python/digital/ofdm_receiver.py | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/gr-digital/examples/example_timing.py b/gr-digital/examples/example_timing.py index 348d62b6f3..51e9e06518 100644 --- a/gr-digital/examples/example_timing.py +++ b/gr-digital/examples/example_timing.py @@ -73,9 +73,8 @@ class example_timing(gr.top_block): self.taps = self.clk.taps() self.dtaps = self.clk.diff_taps() - self.delay = int(scipy.ceil((old_div((len(rrc_taps)-1) / 2 + - (len(self.taps[0])-1) / 2),float(sps)))) + 1 - + self.delay = int(scipy.ceil(((len(rrc_taps)-1)//2 + + (len(self.taps[0])-1)//2 )//float(sps))) + 1 self.vsnk_err = blocks.vector_sink_f() self.vsnk_rat = blocks.vector_sink_f() diff --git a/gr-digital/python/digital/gmsk.py b/gr-digital/python/digital/gmsk.py index 5e25a3d3a1..9428e5237f 100644 --- a/gr-digital/python/digital/gmsk.py +++ b/gr-digital/python/digital/gmsk.py @@ -93,7 +93,7 @@ class gmsk_mod(gr.hier_block2): raise TypeError("samples_per_symbol must be an integer >= 2, is %r" % (samples_per_symbol,)) ntaps = 4 * samples_per_symbol # up to 3 bits in filter at once - sensitivity = (old_div(pi / 2), samples_per_symbol) # phase change per bit = pi / 2 + sensitivity = (pi / 2) / samples_per_symbol # phase change per bit = pi / 2 # Turn it into NRZ data. #self.nrz = digital.bytes_to_syms() @@ -216,7 +216,7 @@ class gmsk_demod(gr.hier_block2): self._gain_omega = .25 * self._gain_mu * self._gain_mu # critically damped # Demodulate FM - sensitivity = (old_div(pi / 2), samples_per_symbol) + sensitivity = (pi / 2) / samples_per_symbol self.fmdemod = analog.quadrature_demod_cf(1.0 / sensitivity) # the clock recovery block tracks the symbol clock and resamples as needed. diff --git a/gr-digital/python/digital/ofdm_receiver.py b/gr-digital/python/digital/ofdm_receiver.py index d23b338b78..0a9d79f728 100644 --- a/gr-digital/python/digital/ofdm_receiver.py +++ b/gr-digital/python/digital/ofdm_receiver.py @@ -69,7 +69,7 @@ class ofdm_receiver(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature gr.io_signature2(2, 2, gr.sizeof_gr_complex*occupied_tones, gr.sizeof_char)) # Output signature - bw = (old_div(float(occupied_tones) / float(fft_length)), 2.0) + bw = (float(occupied_tones) / float(fft_length)) / 2.0 tb = bw*0.08 chan_coeffs = filter.firdes.low_pass (1.0, # gain 1.0, # sampling rate |