[Commit-gnuradio] r5746 - gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-06-08 13:47:41 -0600 (Fri, 08 Jun 2007)
New Revision: 5746

Modified:
   
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/receive_path.py
   
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/transmit_path.py
Log:
cleaning up

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/receive_path.py
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/receive_path.py
  2007-06-08 19:46:24 UTC (rev 5745)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/receive_path.py
  2007-06-08 19:47:41 UTC (rev 5746)
@@ -43,9 +43,8 @@
         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 @@
         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 @@
         """
         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

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/transmit_path.py
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/transmit_path.py
 2007-06-08 19:46:24 UTC (rev 5745)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-examples/python/ofdm/transmit_path.py
 2007-06-08 19:47:41 UTC (rev 5746)
@@ -41,11 +41,8 @@
         self._verbose      = options.verbose
         self._tx_amplitude = options.tx_amplitude    # digital amplitude sent 
to USRP
 
-        self.ofdm_transmitter = \
-            blks.mod_ofdm_pkts(fg,
-                               options,
-                               msgq_limit=4,
-                               pad_for_usrp=False)
+        self.ofdm_tx = \
+                     blks.ofdm_mod(fg, options, msgq_limit=4, 
pad_for_usrp=False)
 
         self.amp = gr.multiply_const_cc(1)
         self.set_tx_amplitude(self._tx_amplitude)
@@ -55,7 +52,7 @@
             self._print_verbage()
 
         # Create and setup transmit path flow graph
-        fg.connect(self.ofdm_transmitter, self.amp)
+        fg.connect(self.ofdm_tx, self.amp)
         gr.hier_block.__init__(self, fg, None, self.amp)
 
     def set_tx_amplitude(self, ampl):
@@ -70,14 +67,8 @@
         """
         Calls the transmitter method to send a packet
         """
-        return self.ofdm_transmitter.send_pkt(payload, eof)
+        return self.ofdm_tx.send_pkt(payload, eof)
         
-    def bitrate(self):
-        return self._bitrate
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
     def add_options(normal, expert):
         """
         Adds transmitter-specific options to the Options Parser