Changeset 463 for vtcross

Timestamp:

09/03/09 21:37:42 (15 years ago)

Author:

trnewman

Message:

Updating to work with latest gnuradio utilities.

Files:

• vtcross/trunk/src/cross-examples/python/gnuradio-examples/benchmark_dsa.py (modified) (4 diffs)

vtcross/trunk/src/cross-examples/python/gnuradio-examples/benchmark_dsa.py

@@ -30 +30 @@
 
 # from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
-
+#from transmit_path import transmit_path
+#from receive_path import receive_path
+
+import usrp_transmit_path
+import usrp_receive_path
 
 
@@ -54 +56 @@
 
                 gr.top_block.__init__(self)
-                self.rxpath = receive_path(demod_class, rx_callback, options_rx)
-                self.txpath = transmit_path(mod_class, options_tx)
+                self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, rx_callback, options_rx)
+                self.txpath = usrp_transmit_path.usrp_transmit_path(mod_class, options_tx)
                 self.connect(self.txpath);
                 self.connect(self.rxpath);
@@ -225 +227 @@
   
 
-        transmit_path.add_options(parser_tx, expert_grp_tx)
+        usrp_transmit_path.add_options(parser_tx, expert_grp_tx)
         parser_tx.remove_option('-f');
         parser_tx.remove_option('--tx-freq');
@@ -255 +257 @@
         parser_rx = OptionParser (option_class=eng_option, conflict_handler="resolve")
         expert_grp_rx = parser_rx.add_option_group("Expert_rx")
-        receive_path.add_options(parser_rx, expert_grp_rx)
+        usrp_receive_path.add_options(parser_rx, expert_grp_rx)
         
         parser_rx.remove_option('-f');