[Commit-gnuradio] r5058 - gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python

[jcorgan]

Author: jcorgan
Date: 2007-04-20 15:42:24 -0600 (Fri, 20 Apr 2007)
New Revision: 5058

Removed:
   gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/sounder_rx.py
   gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/sounder_tx.py
Modified:
   
gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/usrp_sounder.py
Log:
Un-refactored for ease of installation.

Deleted: 
gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/sounder_rx.py

Deleted: 
gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/sounder_tx.py

Modified: 
gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/usrp_sounder.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/usrp_sounder.py  
    2007-04-20 21:41:57 UTC (rev 5057)
+++ 
gnuradio/branches/developers/jcorgan/snd/gr-sounder/src/python/usrp_sounder.py  
    2007-04-20 21:42:24 UTC (rev 5058)
@@ -1,13 +1,70 @@
 #!/usr/bin/env python
+#
+# Copyright 2007 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
+from gnuradio import gr, usrp
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-
-from sounder_tx import sounder_tx
-from sounder_rx import sounder_rx
 import time
 
+# Set to 0 for 32 MHz tx clock, 1 for 64 MHz tx clock
+# Must match config.vh in FPGA code
+TX_RATE_MAX = 0
+_tx_freq_divisor = 32e6*(TX_RATE_MAX+1)
+
+class sounder_tx:
+    def __init__(self, frequency, mask):
+       self.trans = usrp.sink_s(fpga_filename='usrp_sounder.rbf')
+        self.subdev_spec = usrp.pick_tx_subdevice(self.trans)
+        self.subdev = usrp.selected_subdev(self.trans, self.subdev_spec)
+        self.trans.tune(0, self.subdev, frequency)
+        self.set_mask(mask);
+        
+    def turn_on(self):
+       self.trans.start()
+       
+    def turn_off(self):
+       self.trans.stop()
+
+    def set_mask(self, value):
+        return self.trans._write_fpga_reg(usrp.FR_USER_0, value);
+
+class sounder_rx:
+    def __init__(self, frequency, mask):
+        self.fg = gr.flow_graph()
+       self.rcvr = usrp.source_s(fpga_filename='usrp_sounder.rbf', 
decim_rate=8)
+        self.subdev_spec = usrp.pick_rx_subdevice(self.rcvr)
+        self.subdev = usrp.selected_subdev(self.rcvr, self.subdev_spec)
+        self.rcvr.tune(0, self.subdev, frequency)
+        self.set_mask(mask);
+       self.sink = gr.file_sink(gr.sizeof_short, "output.dat")
+        self.fg.connect(self.rcvr, self.sink)
+
+    def receive(self):
+       self.fg.run()
+       
+    def set_mask(self, value):
+        return self.rcvr._write_fpga_reg(usrp.FR_USER_0, value);
+
 def main():
     parser = OptionParser(option_class=eng_option)
     parser.add_option("-f", "--frequency", type="eng_float", default=0.0,