Fixing how new pick_bitrate is used.

[debian/gnuradio] / gr-radar-mono / src / python / usrp_radar_mono.py

diff --git a/gr-radar-mono/src/python/usrp_radar_mono.py b/gr-radar-mono/src/python/usrp_radar_mono.py
index c4d5ff4a24ddc2e30fb47138a00156fb48533bf4..3f2ad28e20347c959e87338f616bee60d7d3fbd0 100755 (executable)
--- a/gr-radar-mono/src/python/usrp_radar_mono.py
+++ b/gr-radar-mono/src/python/usrp_radar_mono.py
@@ -25,12 +25,25 @@ from gnuradio.radar_mono import radar
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-import sys
+import sys, time
 
 n2s = eng_notation.num_to_str
+logfile = None
 
+def process_echo(echo):
+    global logfile
+    if logfile is not None:
+        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)")
+    parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
+                     help="use receiver board side A or B (default is first found)")
+    parser.add_option("-g", "--gain", type="eng_float", default=None,
+                      help="set gain in dB (default is midpoint)")
     parser.add_option("-f", "--frequency", type="eng_float", default=0.0,
                       help="set transmitter center frequency to FREQ in Hz, default is %default", metavar="FREQ")
     parser.add_option("-w", "--chirp-width", type="eng_float", default=32e6,
@@ -39,71 +52,45 @@ def main():
                       help="set waveform amplitude in % full scale, default is %default,")
     parser.add_option("",   "--ton", type="eng_float", default=5e-6,
                      help="set pulse on period in seconds, default is %default,")
-    parser.add_option("",   "--tsw", type="eng_float", default=406.25e-9,
+    parser.add_option("",   "--tsw", type="eng_float", default=0.0,
                      help="set transmitter switching period in seconds, default is %default,")
     parser.add_option("",   "--tlook", type="eng_float", default=5e-6,
                      help="set receiver look time in seconds, default is %default,")
-    parser.add_option("",   "--prf", type="eng_float", default=10e3,
+    parser.add_option("",   "--prf", type="eng_float", default=100,
                      help="set pulse repetition frequency in Hz, default is %default,")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       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("-g", "--gain", type="eng_float", default=None,
-    #                  help="set gain in dB (default is midpoint)")
-    #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.filename is not None:
         if options.verbose:
             print "Logging echo records to file: ", options.filename
-    """
+       logfile = open(options.filename, 'wb')
         
-    msgq = gr.msg_queue()
-    s = radar(msgq=msgq,verbose=options.verbose,debug=options.debug)
-
-    s.set_ton(options.ton)
-    s.set_tsw(options.tsw)
-    s.set_tlook(options.tlook)
-    s.set_prf(options.prf)
-    s.set_amplitude(options.amplitude)
-    s.set_freq(options.frequency, options.chirp_width)
+    r = radar(options, process_echo)
 
-    s.start()
+    r.set_ton(options.ton)
+    r.set_tsw(options.tsw)
+    r.set_tlook(options.tlook)
+    r.set_prf(options.prf)
+    r.set_amplitude(options.amplitude)
+    r.set_freq(options.frequency, options.chirp_width)
+    
+    r.start()
+    raw_input("Press ENTER to stop.")
+    r.stop()
 
-    """
-    f = open(options.filename, "wb")
-    print "Enter CTRL-C to stop."
-    try:
-        while (1):
-            msg = msgq.delete_head()
-            if msg.type() == 1:
-                break
-            rec = msg.to_string()
-            if options.debug:
-                print "Received echo vector of length", len(rec)
-               f.write(rec)
-               
-    except KeyboardInterrupt:
-        pass
-    """
-
-    raw_input("Press enter to stop transmitting.")
-    s.stop()
-        
+    if logfile is not None:
+        logfile.close()
+            
 if __name__ == "__main__":
     main()