[Commit-gnuradio] r6346 - gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl

[jcorgan]

Author: jcorgan
Date: 2007-09-06 13:53:33 -0600 (Thu, 06 Sep 2007)
New Revision: 6346

Modified:
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
Log:
Converted dbpsk.py to new top block code.

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
      2007-09-06 19:46:41 UTC (rev 6345)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
      2007-09-06 19:53:33 UTC (rev 6346)
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -48,9 +48,9 @@
 #                             DBPSK modulator
 # /////////////////////////////////////////////////////////////////////////////
 
-class dbpsk_mod(gr.hier_block):
+class dbpsk_mod(gr.hier_block2):
 
-    def __init__(self, fg,
+    def __init__(self,
                  samples_per_symbol=_def_samples_per_symbol,
                  excess_bw=_def_excess_bw,
                  gray_code=_def_gray_code,
@@ -62,8 +62,6 @@
        The input is a byte stream (unsigned char) and the
        output is the complex modulated signal at baseband.
         
-       @param fg: flow graph
-       @type fg: flow graph
        @param samples_per_symbol: samples per baud >= 2
        @type samples_per_symbol: integer
        @param excess_bw: Root-raised cosine filter excess bandwidth
@@ -76,7 +74,10 @@
         @type log: bool
        """
 
-        self._fg = fg
+       gr.hier_block2.__init__(self, "dbpsk_mod",
+                               gr.io_signature(1, 1, gr.sizeof_char),       # 
Input signature
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex)) # 
Output signature
+
         self._samples_per_symbol = samples_per_symbol
         self._excess_bw = excess_bw
         self._gray_code = gray_code
@@ -113,8 +114,8 @@
                                                    self.rrc_taps)
 
        # Connect
-        fg.connect(self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                   self.chunks2symbols, self.rrc_filter)
+        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
+                     self.chunks2symbols, self.rrc_filter, self)
 
         if verbose:
             self._print_verbage()
@@ -122,8 +123,6 @@
         if log:
             self._setup_logging()
             
-       # Initialize base class
-       gr.hier_block.__init__(self, self._fg, self.bytes2chunks, 
self.rrc_filter)
 
     def samples_per_symbol(self):
         return self._samples_per_symbol
@@ -160,16 +159,16 @@
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self._fg.connect(self.bytes2chunks,
-                         gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self._fg.connect(self.symbol_mapper,
-                         gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self._fg.connect(self.diffenc,
-                         gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self._fg.connect(self.chunks2symbols,
-                         gr.file_sink(gr.sizeof_gr_complex, 
"tx_chunks2symbols.dat"))
-        self._fg.connect(self.rrc_filter,
-                         gr.file_sink(gr.sizeof_gr_complex, 
"tx_rrc_filter.dat"))
+        self.connect(self.bytes2chunks,
+                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
+        self.connect(self.symbol_mapper,
+                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
+        self.connect(self.diffenc,
+                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
+        self.connect(self.chunks2symbols,
+                     gr.file_sink(gr.sizeof_gr_complex, 
"tx_chunks2symbols.dat"))
+        self.connect(self.rrc_filter,
+                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
               
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -178,9 +177,9 @@
 #      Differentially coherent detection of differentially encoded BPSK
 # /////////////////////////////////////////////////////////////////////////////
 
-class dbpsk_demod(gr.hier_block):
+class dbpsk_demod(gr.hier_block2):
 
-    def __init__(self, fg,
+    def __init__(self,
                  samples_per_symbol=_def_samples_per_symbol,
                  excess_bw=_def_excess_bw,
                  costas_alpha=_def_costas_alpha,
@@ -196,8 +195,6 @@
        The input is the complex modulated signal at baseband.
        The output is a stream of bits packed 1 bit per byte (LSB)
 
-       @param fg: flow graph
-       @type fg: flow graph
        @param samples_per_symbol: samples per symbol >= 2
        @type samples_per_symbol: float
        @param excess_bw: Root-raised cosine filter excess bandwidth
@@ -218,7 +215,10 @@
         @type debug: bool
        """
         
-        self._fg = fg
+       gr.hier_block2.__init__(self, "dbpsk_demod",
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
+                               gr.io_signature(1, 1, gr.sizeof_char))       # 
Output signature
+                               
         self._samples_per_symbol = samples_per_symbol
         self._excess_bw = excess_bw
         self._costas_alpha = costas_alpha
@@ -288,9 +288,8 @@
             self._setup_logging()
 
         # Connect and Initialize base class
-        self._fg.connect(self.pre_scaler, self.agc, self.rrc_filter, 
self.receiver,
-                         self.diffdec, self.slicer, self.symbol_mapper, 
self.unpack)
-        gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack)
+        self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, 
self.receiver,
+                     self.diffdec, self.slicer, self.symbol_mapper, 
self.unpack, self)
 
     def samples_per_symbol(self):
         return self._samples_per_symbol
@@ -314,22 +313,22 @@
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self._fg.connect(self.pre_scaler,
+        self.connect(self.pre_scaler,
                          gr.file_sink(gr.sizeof_gr_complex, 
"rx_prescaler.dat"))
-        self._fg.connect(self.agc,
-                         gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self._fg.connect(self.rrc_filter,
-                         gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
-        self._fg.connect(self.receiver,
-                         gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self._fg.connect(self.diffdec,
-                         gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat")) 
       
-        self._fg.connect(self.slicer,
-                        gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self._fg.connect(self.symbol_mapper,
-                         gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self._fg.connect(self.unpack,
-                         gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
+        self.connect(self.agc,
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
+        self.connect(self.rrc_filter,
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
+        self.connect(self.receiver,
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
+        self.connect(self.diffdec,
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))     
   
+        self.connect(self.slicer,
+                    gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
+        self.connect(self.symbol_mapper,
+                     gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
+        self.connect(self.unpack,
+                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
         
     def add_options(parser):
         """