[Commit-gnuradio] r6389 - gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python

[jcorgan]

Author: jcorgan
Date: 2007-09-10 15:16:12 -0600 (Mon, 10 Sep 2007)
New Revision: 6389

Modified:
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-09-10 21:01:50 UTC (rev 6388)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/radar_mono.py
   2007-09-10 21:16:12 UTC (rev 6389)
@@ -213,10 +213,6 @@
             print "Setting receiver gain to", self._gain
         self.set_gain(self._gain)
 
-       if True: #self._debug:
-           self._usrp_sink = gr.file_sink(gr.sizeof_gr_complex, "usrp.dat")
-           self.connect(self._u, self._usrp_sink)
-
     def _setup_connections(self):
        if not self._length_set:
            raise RuntimeError("Echo length not set.")

Modified: 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
      2007-09-10 21:01:50 UTC (rev 6388)
+++ 
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/python/usrp_radar_mono.py
      2007-09-10 21:16:12 UTC (rev 6389)
@@ -28,11 +28,15 @@
 import sys, time
 
 n2s = eng_notation.num_to_str
+logfile = None
 
 def process_echo(echo):
+    global logfile
     print "Received echo of length ", len(echo)
-
+    logfile.write(echo)
+        
 def main():
+    global logfile
     parser = OptionParser(option_class=eng_option)
     parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
                      help="use transmitter board side A or B (default is first 
found)")
@@ -58,27 +62,23 @@
                       help="enable verbose output, default is disabled")
     parser.add_option("-D", "--debug", action="store_true", default=False,
                       help="enable debugging output, default is disabled")
+    parser.add_option("-F", "--filename", default=None,
+                      help="log received echos to file")
 
-    # NOT IMPLEMENTED
-    #parser.add_option("-l", "--loopback", action="store_true", default=False,
-    #                  help="enable digital loopback, default is disabled")
-    #parser.add_option("-F", "--filename", default=None,
-    #                  help="log received echos to file")
-                     
     (options, args) = parser.parse_args()
 
     if len(args) != 0:
         parser.print_help()
         sys.exit(1)
 
-    """
     if options.filename == None:
         print "Must supply filename for logging received data."
         sys.exit(1)
     else:
         if options.verbose:
             print "Logging echo records to file: ", options.filename
-    """
+
+    logfile = open(options.filename, 'wb')
         
     r = radar(options, process_echo)
 
@@ -92,6 +92,7 @@
     r.start()
     raw_input("Press ENTER to stop.")
     r.stop()
-        
+    logfile.close()
+            
 if __name__ == "__main__":
     main()