[Commit-gnuradio] r5111 - gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect

[jcorgan]

Author: jcorgan
Date: 2007-04-25 14:15:46 -0600 (Wed, 25 Apr 2007)
New Revision: 5111

Modified:
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/dect_receiver.py
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/gmsk2.py
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/usrp_source.py
Log:
Converted dect receiver to new API, still debugging.

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/dect_receiver.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/dect_receiver.py
      2007-04-25 20:14:21 UTC (rev 5110)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/dect_receiver.py
      2007-04-25 20:15:46 UTC (rev 5111)
@@ -30,19 +30,15 @@
 
 # Top-level hierarchical block that implements DECT demodulation and
 # decoding.
-class dect_receiver(gr.hier_block2):
+class dect_receiver(gr.top_block):
     def __init__(self, options):
-       gr.hier_block2.__init__(self, 
-                                "dect_receiver",        # Block typename
-                               gr.io_signature(0,0,0), # Input signature
-                               gr.io_signature(0,0,0)) # Output signature
+       gr.top_block.__init__(self, "dect_receiver")
         self._options = options
 
         # Need greater than 2 samples per symbol. This makes a decimation
         # rate of 26 and a samples per symbol of 2.136752
         if_rate = 2.461538e6
-        self._usrp = usrp_source_c(self,
-                                   which=0,
+        self._usrp = usrp_source_c(which=0,
                                    subdev_spec=options.rx_subdev_spec,
                                    if_rate=if_rate,
                                    gain=options.gain,
@@ -67,25 +63,19 @@
         self._demod = gmsk2_demod(samples_per_symbol=if_rate/_dect_symbol_rate,
                                   verbose=options.verbose)
 
-        # Define and connect components
-        self.define_component("usrp", self._usrp)
-        self.define_component("channel", self._channel_filter)
-        self.define_component("demod", self._demod)
-        self.define_component("sink", gr.null_sink(gr.sizeof_char))
-        self.connect("usrp", 0, "channel", 0)
-        self.connect("channel", 0, "demod", 0)
-        self.connect("demod", 0, "sink", 0)
+        self._sink = gr.null_sink(gr.sizeof_char)
+        self.connect(usrp, channel, demod, sink)
 
         # Log baseband to file if requested
         if options.log_baseband is not None:
             if options.verbose:
                 print "Logging baseband to file", options.log_baseband
-            self.define_component("baseband_log", 
gr.file_sink(gr.sizeof_gr_complex, options.log_baseband))
-            self.connect("channel", 0, "baseband_log", 0)
+            self.baseband_log = gr.file_sink(gr.sizeof_gr_complex, 
options.log_baseband)
+            self.connect(channel, baseband_log)
 
         # Log demodulator output to file if requested
         if options.log_demod is not None:
             if options.verbose:
                 print "Logging demodulator to file", options.log_demod
-            self.define_component("demod_log", gr.file_sink(gr.sizeof_char, 
options.log_demod))
-            self.connect("demod", 0, "demod_log", 0)
+            self.demod_log = gr.file_sink(gr.sizeof_char, options.log_demod)
+            self.connect(demod, demod_log)

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/gmsk2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/gmsk2.py
      2007-04-25 20:14:21 UTC (rev 5110)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/gmsk2.py
      2007-04-25 20:15:46 UTC (rev 5111)
@@ -106,14 +106,7 @@
         if verbose:
             self._print_verbage()
          
-       # Define and connect components
-        self.define_component("nrz", self.nrz)
-        self.define_component("filter", self.gaussian_filter)
-        self.define_component("fmmod", self.fmmod)
-        self.connect("self", 0, "nrz", 0)
-        self.connect("nrz", 0, "filter", 0)
-        self.connect("filter", 0, "fmmod", 0)
-        self.connect("fmmod", 0, "self", 0)
+        self.connect(self, self.nrz, self.gaussian_filter, self.fmmod, self)
 
         if log:
             self._setup_logging()
@@ -125,7 +118,6 @@
         return 1
     bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.
 
-
     def _print_verbage(self):
         print "bits per symbol = %d" % self.bits_per_symbol()
         print "Gaussian filter bt = %.2f" % self._bt
@@ -133,12 +125,9 @@
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self.define_component("nrz_log", gr.file_sink(gr.sizeof_float, 
"nrz.dat"))
-        self.define_component("filter_log", gr.file_sink(gr.sizeof_float, 
"gaussian_filter.dat"))
-        self.define_component("fmmod_log", gr.file_sink(gr.sizeof_gr_complex, 
"fmmod.dat"))
-        self.connect("nrz", 0, "nrz_log", 0)
-        self.connect("filter", 0, "filter_log", 0)
-        self.connect("fmmod", 0, "fmmod_log", 0)
+        self.connect(self.nrz, gr.file_sink(gr.sizeof_float, "nrz.dat"))
+        self.connect(self.gaussian_filter, gr.file_sink(gr.sizeof_float, 
"gaussian_filter.dat"))
+        self.connect(self.fmmod, gr.file_sink(gr.sizeof_gr_complex, 
"fmmod.dat"))
 
     def add_options(parser):
         """
@@ -232,14 +221,7 @@
         if verbose:
             self._print_verbage()
 
-        # Define and connect components
-        self.define_component("fmdemod", self.fmdemod)
-        self.define_component("clock_recovery", self.clock_recovery)
-        self.define_component("slicer", self.slicer)
-        self.connect("self", 0, "fmdemod", 0)
-        self.connect("fmdemod", 0, "clock_recovery", 0)
-        self.connect("clock_recovery", 0, "slicer", 0)
-        self.connect("slicer", 0, "self", 0)
+        self.connect(self, fmdemod, clock_recovery, slicer, self)
 
         if log:
             self._setup_logging()
@@ -251,7 +233,6 @@
         return 1
     bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.
 
-
     def _print_verbage(self):
         print "bits per symbol = %d" % self.bits_per_symbol()
         print "M&M clock recovery omega = %f" % self._omega
@@ -263,12 +244,9 @@
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self.define_component("fmdemod_log", gr.file_sink(gr.sizeof_float, 
"fmdemod.dat"))
-        self.define_component("clock_recovery_log", 
gr.file_sink(gr.sizeof_float, "clock_recovery.dat"))
-        self.define_component("slicer_log", gr.file_sink(gr.sizeof_char, 
"slicer.dat"))
-        self.connect("fmdemod", 0, "fmdemod_log", 0)
-        self.connect("clock_recovery", 0, "clock_recovery_log", 0)
-        self.connect("slicer", 0, "slicer_log", 0)
+        self.connect(fmdemod, gr.file_sink(gr.sizeof_float, "fmdemod.dat"))
+        self.connect(clock_recovery, gr.file_sink(gr.sizeof_float, 
"clock_recovery.dat"))
+        self.connect(slicer, gr.file_sink(gr.sizeof_char, "slicer.dat"))
 
     def add_options(parser):
         """

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/usrp_source.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/usrp_source.py
        2007-04-25 20:14:21 UTC (rev 5110)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-examples/python/hier/dect/usrp_source.py
        2007-04-25 20:15:46 UTC (rev 5111)
@@ -47,10 +47,8 @@
         self.set_gain(gain)
         self.set_calibration(calibration)
         self.tune(freq)
+        self.connect(self._u, self)
 
-        self.define_component("usrp", self._u)
-        self.connect("usrp", 0, "self", 0)
-
     def set_subdev(self, subdev_spec):
         if subdev_spec is None:
             subdev_spec = self.pick_subdevice()