From a663f5b481679d8a352c668825cee92f548f3fcc Mon Sep 17 00:00:00 2001
From: trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sun, 10 Jun 2007 18:16:11 +0000
Subject: Merging OFDM features branch r5661:5759 into trunk. OFDM works over
the air with BPSK and QPSK modulations on subcarriers. Passes make distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5761 221aa14e-8319-0410-a670-987f0aec2ac5
---
gnuradio-examples/python/ofdm/receive_path.py | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'gnuradio-examples/python/ofdm/receive_path.py')
diff --git a/gnuradio-examples/python/ofdm/receive_path.py b/gnuradio-examples/python/ofdm/receive_path.py
index 0e44ffde02..67a71204ab 100644
--- a/gnuradio-examples/python/ofdm/receive_path.py
+++ b/gnuradio-examples/python/ofdm/receive_path.py
@@ -43,9 +43,8 @@ class receive_path(gr.hier_block):
self._rx_callback = rx_callback # this callback is fired when there's a packet available
# receiver
- self.ofdm_receiver = \
- blks.demod_ofdm_pkts(fg, options,
- callback=self._rx_callback)
+ self.ofdm_rx = \
+ blks.ofdm_demod(fg, options, callback=self._rx_callback)
# Carrier Sensing Blocks
#alpha = 0.001
@@ -57,7 +56,7 @@ class receive_path(gr.hier_block):
if self._verbose:
self._print_verbage()
- gr.hier_block.__init__(self, fg, self.ofdm_receiver, None)
+ gr.hier_block.__init__(self, fg, self.ofdm_rx, None)
def carrier_sensed(self):
"""
@@ -98,9 +97,4 @@ class receive_path(gr.hier_block):
"""
Prints information about the receive path
"""
- print "Using RX d'board %s" % (self.subdev.side_and_name(),)
- print "Rx gain: %g" % (self.gain,)
- print "modulation: %s" % (self._demod_class.__name__)
- print "bitrate: %sb/s" % (eng_notation.num_to_str(self._bitrate))
- print "samples/symbol: %3d" % (self._samples_per_symbol)
- print "decim: %3d" % (self._decim)
+ pass
--
cgit v1.2.3