diff options
Diffstat (limited to 'gnuradio-examples/python/hier/sounder')
7 files changed, 20 insertions, 48 deletions
diff --git a/gnuradio-examples/python/hier/sounder/Makefile.am b/gnuradio-examples/python/hier/sounder/Makefile.am index ecbbb4718d..1d26e0cb71 100644 --- a/gnuradio-examples/python/hier/sounder/Makefile.am +++ b/gnuradio-examples/python/hier/sounder/Makefile.am @@ -27,4 +27,4 @@ EXTRA_DIST = \ sounder_rx.py \ sounder_tx.py -MOSTLYCLEANFILES = *.pyc *~ +MOSTLYCLEANFILES = *.pyc *~ *.dat diff --git a/gnuradio-examples/python/hier/sounder/sounder_rx.py b/gnuradio-examples/python/hier/sounder/sounder_rx.py index 336e604a3d..e1b64001b2 100644 --- a/gnuradio-examples/python/hier/sounder/sounder_rx.py +++ b/gnuradio-examples/python/hier/sounder/sounder_rx.py @@ -50,6 +50,4 @@ class sounder_rx(gr.hier_block2): print "Using PN sequence of degree", self._degree, "length", self._length print "Sequence repetition rate is", n2s(self._rep_rate), "per sec" - self.define_component("corr", gr.pn_correlator_cc(self._degree)) - self.connect("self", 0, "corr", 0) - self.connect("corr", 0, "self", 0) + self.connect(self, gr.pn_correlator_cc(self._degree), self) diff --git a/gnuradio-examples/python/hier/sounder/sounder_tx.py b/gnuradio-examples/python/hier/sounder/sounder_tx.py index 7d91f36e16..c6810b01af 100644 --- a/gnuradio-examples/python/hier/sounder/sounder_tx.py +++ b/gnuradio-examples/python/hier/sounder/sounder_tx.py @@ -42,5 +42,4 @@ class sounder_tx(gr.hier_block2): self._length = 2**degree-1 # Connect PN source to block output - self.define_component("glfsr", gr.glfsr_source_f(degree)) - self.connect("glfsr", 0, "self", 0) + self.connect(gr.glfsr_source_f(degree), self) diff --git a/gnuradio-examples/python/hier/sounder/usrp_sink.py b/gnuradio-examples/python/hier/sounder/usrp_sink.py index 000b831f5d..03a987d41c 100644 --- a/gnuradio-examples/python/hier/sounder/usrp_sink.py +++ b/gnuradio-examples/python/hier/sounder/usrp_sink.py @@ -46,10 +46,7 @@ class usrp_sink_c(gr.hier_block2): self.set_if_rate(if_rate) self.set_calibration(calibration) self.tune(freq) - - self.define_component("usrp", self._u) - self.connect("self", 0, "usrp", 0) - + self.connect(self, self._u) def set_subdev(self, subdev_spec): if subdev_spec is None: diff --git a/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py b/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py index 72ebeccfa6..094ae4bcd0 100755 --- a/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py +++ b/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py @@ -28,12 +28,9 @@ from sounder_rx import sounder_rx n2s = eng_notation.num_to_str -class usrp_sounder_rx(gr.hier_block2): +class usrp_sounder_rx(gr.top_block): def __init__(self, options): - gr.hier_block2.__init__(self, "usrp_sounder_rx", - gr.io_signature(0,0,0), - gr.io_signature(0,0,0)) - + gr.top_block.__init__(self, "usrp_sounder_rx") self._options = options self._u = usrp_source_c(0, self._options.rx_subdev_spec, @@ -50,22 +47,14 @@ class usrp_sounder_rx(gr.hier_block2): samples = 100 * self._length**2 - self.define_component("usrp", self._u) - self.define_component("head", gr.head(gr.sizeof_gr_complex, samples)) - self.define_component("rx", self._receiver) - self.define_component("c2m", gr.complex_to_mag()) - self.define_component("s2v", gr.stream_to_vector(gr.sizeof_float, self._length)) - self.define_component("lpf", gr.single_pole_iir_filter_ff(self._options.alpha, self._length)) - self.define_component("v2s", gr.vector_to_stream(gr.sizeof_float, self._length)) - self.define_component("sink", gr.file_sink(gr.sizeof_float, "impulse.dat")) + head = gr.head(gr.sizeof_gr_complex, samples) + c2m = gr.complex_to_mag() + s2v = gr.stream_to_vector(gr.sizeof_float, self._length) + lpf = gr.single_pole_iir_filter_ff(self._options.alpha, self._length) + v2s = gr.vector_to_stream(gr.sizeof_float, self._length) + sink = gr.file_sink(gr.sizeof_float, "impulse.dat") - self.connect("usrp", 0, "head", 0) - self.connect("head", 0, "rx", 0) - self.connect("rx", 0, "c2m", 0) - self.connect("c2m", 0, "s2v", 0) - self.connect("s2v", 0, "lpf", 0) - self.connect("lpf", 0, "v2s", 0) - self.connect("v2s", 0, "sink", 0) + self.connect(self._u, head, self._receiver, c2m, s2v, lpf, v2s, sink) if self._options.verbose: print "Chip rate is", n2s(self._options.chip_rate), "chips/sec" diff --git a/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py b/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py index 00146146ce..e1ee5b8444 100755 --- a/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py +++ b/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py @@ -28,16 +28,12 @@ from sounder_tx import sounder_tx n2s = eng_notation.num_to_str -class usrp_sounder_tx(gr.hier_block2): +class usrp_sounder_tx(gr.top_block): def __init__(self, subdev_spec, freq, cal, verbose, degree, chip_rate, amplitude): # Call hierarchical block constructor # Top-level blocks have no inputs or outputs - gr.hier_block2.__init__(self, - "usrp_sounder_tx", # Block typename - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature - + gr.top_block.__init__(self, "usrp_sounder_tx") self._freq = freq self._cal = cal self._verbose = verbose @@ -46,12 +42,12 @@ class usrp_sounder_tx(gr.hier_block2): self._amplitude = amplitude self._u = usrp_sink_c(0, subdev_spec, chip_rate, self._freq, self._cal, self._verbose) - self.define_component("usrp", self._u) self._chip_rate = self._u._if_rate self._max_time = float(self._length)/self._chip_rate - self.define_component("pn", sounder_tx(self._degree, self._chip_rate, self._verbose)) - self.define_component("gain", gr.multiply_const_ff(amplitude)); - self.define_component("f2c", gr.float_to_complex()) + self._pn = sounder_tx(self._degree, self._chip_rate, self._verbose) + self._gain = gr.multiply_const_ff(amplitude) + self._f2c = gr.float_to_complex() + self.connect(self._pn, self._gain, self._f2c, self._u) if self._verbose: print "Chip rate is", n2s(self._chip_rate), "chips/sec" @@ -60,11 +56,6 @@ class usrp_sounder_tx(gr.hier_block2): print "Maximum measurable impulse response is", n2s(self._max_time), "sec" print "Output amplitude is", amplitude - # Ultimately this will be - # self.connect("pn gain f2c usrp") - self.connect("pn", 0, "gain", 0) - self.connect("gain", 0, "f2c", 0) - self.connect("f2c", 0, "usrp", 0) def main(): parser = OptionParser(option_class=eng_option) diff --git a/gnuradio-examples/python/hier/sounder/usrp_source.py b/gnuradio-examples/python/hier/sounder/usrp_source.py index 0ba9e61611..9dc471d9e1 100644 --- a/gnuradio-examples/python/hier/sounder/usrp_source.py +++ b/gnuradio-examples/python/hier/sounder/usrp_source.py @@ -47,9 +47,7 @@ class usrp_source_c(gr.hier_block2): self.set_gain(gain) self.set_calibration(calibration) self.tune(freq) - - self.define_component("usrp", self._u) - self.connect("usrp", 0, "self", 0) + self.connect(self._u, self) def set_subdev(self, subdev_spec): if subdev_spec is None: |