[Commit-gnuradio] r7158 - in gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio: blks2impl blksimpl

[trondeau]

Author: trondeau
Date: 2007-12-13 17:23:51 -0700 (Thu, 13 Dec 2007)
New Revision: 7158

Removed:
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_fixed.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_ml.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pn.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pnac.py
Modified:
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.am
Log:
Adding fixed sync method to hier_block2 dir (though it's not really useful; 
have no idea how it's been in there so long without a defined self.sampler, 
anyway) and removing OFDM code from blks.

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
 2007-12-13 22:49:21 UTC (rev 7157)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
 2007-12-14 00:23:51 UTC (rev 7158)
@@ -42,6 +42,7 @@
        nbfm_tx.py              \
        ofdm.py                 \
        ofdm_receiver.py        \
+       ofdm_sync_fixed.py      \
        ofdm_sync_pn.py         \
        ofdm_sync_pnac.py       \
        ofdm_sync_ml.py         \

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
  2007-12-13 22:49:21 UTC (rev 7157)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
  2007-12-14 00:23:51 UTC (rev 7158)
@@ -23,19 +23,24 @@
 import math
 from gnuradio import gr
 
-class ofdm_sync_fixed(gr.hier_block):
-    def __init__(self, fg, fft_length, cp_length, snr):
-        self.fg = fg
+class ofdm_sync_fixed(gr.hier_block2):
+    def __init__(self, fft_length, cp_length, snr):
 
+        gr.hier_block2.__init__(self, "ofdm_demod",
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
+                               gr.io_signature(1, 1, 
gr.sizeof_gr_complex*fft_length)) # Output signature
+
+
         # Use a fixed trigger point instead of sync block
         data = (fft_length+cp_len)*[0,]
         data[(fft_length+cp_len)-1] = 1
         peak_trigger = gr.vector_source_b(data, True)
+        self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
         
-        self.fg.connect(peak_trigger, (self.sampler,1))
+        self.connect(self, peak_trigger, (self.sampler,1))
+        self.connect(self.sampler, self)
 
         if 1:
-            self.fg.connect(self.sampler, 
gr.file_sink(gr.sizeof_gr_complex*fft_length,
-                                                       
"ofdm_sync_fixed-sampler_c.dat"))
-        
-        gr.hier_block.__init__(self, fg, (self.sampler,0), self.sampler)
+            self.connect(self.sampler, 
gr.file_sink(gr.sizeof_gr_complex*fft_length,
+                                                    
"ofdm_sync_fixed-sampler_c.dat"))
+

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.am
  2007-12-13 22:49:21 UTC (rev 7157)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.am
  2007-12-14 00:23:51 UTC (rev 7158)
@@ -40,12 +40,6 @@
        cpm.py                  \
        nbfm_rx.py              \
        nbfm_tx.py              \
-       ofdm.py                 \
-       ofdm_receiver.py        \
-       ofdm_sync_fixed.py      \
-       ofdm_sync_ml.py         \
-       ofdm_sync_pnac.py       \
-       ofdm_sync_pn.py         \
        pkt.py                  \
        psk.py                  \
        qam.py                  \

Deleted: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm.py

Deleted: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py

Deleted: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_fixed.py

Deleted: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_ml.py

Deleted: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pn.py

Deleted: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pnac.py