diff options
| author | Jiří Pinkava <j-pi@seznam.cz> | 2016-05-29 12:57:37 +0200 |
|---|---|---|
| committer | Jiří Pinkava <j-pi@seznam.cz> | 2016-09-17 16:48:34 +0200 |
| commit | ce2b0900fb619c27c51b1495197e5a95bde5e3c6 (patch) | |
| tree | c05b1e6097a459aec0475e394927b7b5bb35341c /gnuradio-runtime/examples/mp-sched | |
| parent | 54ede29960f9022a8040e10c0d58fa8fed989a3f (diff) | |
examples: replace OptionParser by ArgumentParser
Diffstat (limited to 'gnuradio-runtime/examples/mp-sched')
| -rwxr-xr-x | gnuradio-runtime/examples/mp-sched/synthetic.py | 39 | ||||
| -rwxr-xr-x | gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py | 36 |
2 files changed, 34 insertions, 41 deletions
diff --git a/gnuradio-runtime/examples/mp-sched/synthetic.py b/gnuradio-runtime/examples/mp-sched/synthetic.py index d815879cff..16e39734ae 100755 --- a/gnuradio-runtime/examples/mp-sched/synthetic.py +++ b/gnuradio-runtime/examples/mp-sched/synthetic.py @@ -21,8 +21,8 @@ from gnuradio import gr, eng_notation from gnuradio import blocks, filter -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import os @@ -50,38 +50,35 @@ class top(gr.top_block): gr.top_block.__init__(self) default_nsamples = 10e6 - parser=OptionParser(option_class=eng_option) - parser.add_option("-p", "--npipelines", type="intx", default=1, - metavar="NPIPES", help="the number of pipelines to create (default=%default)") - parser.add_option("-s", "--nstages", type="intx", default=1, - metavar="NSTAGES", help="the number of stages in each pipeline (default=%default)") - parser.add_option("-N", "--nsamples", type="eng_float", default=default_nsamples, + parser = ArgumentParser() + parser.add_argument("-p", "--npipelines", type=intx, default=1, + metavar="NPIPES", help="the number of pipelines to create (default=%(default)s)") + parser.add_argument("-s", "--nstages", type=intx, default=1, metavar="NSTAGES", + help="the number of stages in each pipeline (default=%(default)s)") + parser.add_argument("-N", "--nsamples", type=eng_float, default=default_nsamples, help=("the number of samples to run through the graph (default=%s)" % (eng_notation.num_to_str(default_nsamples)))) - parser.add_option("-m", "--machine-readable", action="store_true", default=False, + parser.add_argument("-m", "--machine-readable", action="store_true", default=False, help="enable machine readable output") - (options, args) = parser.parse_args() - if len(args) != 0: - parser.print_help() - raise SystemExit, 1 + args = parser.parse_args() - self.npipes = options.npipelines - self.nstages = options.nstages - self.nsamples = options.nsamples - self.machine_readable = options.machine_readable + self.npipes = args.npipelines + self.nstages = args.nstages + self.nsamples = args.nsamples + self.machine_readable = args.machine_readable ntaps = 256 # Something vaguely like floating point ops - self.flop = 2 * ntaps * options.npipelines * options.nstages * options.nsamples + self.flop = 2 * ntaps * args.npipelines * args.nstages * args.nsamples src = blocks.null_source(gr.sizeof_float) - head = blocks.head(gr.sizeof_float, int(options.nsamples)) + head = blocks.head(gr.sizeof_float, int(args.nsamples)) self.connect(src, head) - for n in range(options.npipelines): - self.connect(head, pipeline(options.nstages, ntaps)) + for n in range(args.npipelines): + self.connect(head, pipeline(args.nstages, ntaps)) def time_it(tb): diff --git a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py index 1a43dc3a11..bb3296d428 100755 --- a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py +++ b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py @@ -24,8 +24,8 @@ from gnuradio import gr, gru, eng_notation, filter from gnuradio import audio from gnuradio import analog from gnuradio import blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import sys import math @@ -33,24 +33,20 @@ class wfm_rx_block (gr.top_block): def __init__(self): gr.top_block.__init__(self) - usage = "usage: %prog [options] input-samples-320kS.dat output.wav" - parser=OptionParser(option_class=eng_option, usage=usage) - parser.add_option("-V", "--volume", type="eng_float", default=None, - help="set volume (default is midpoint)") + parser = ArgumentParser(description="Decode WFM signal into WAV file.") + parser.add_argument("-V", "--volume", type=eng_float, + help="Volume (dB) <%r, %r> (default is midpoint)" % \ + self.volume_range()[:2]) + parser.add_argument("input_file", help="Input file (complex samples)") + parser.add_argument("output_file", help="Output WAV file") - (options, args) = parser.parse_args() - if len(args) != 2: - parser.print_help() - sys.exit(1) - - input_filename = args[0] - output_filename = args[1] + args = parser.parse_args() self.vol = 0 # build graph - self.src = blocks.file_source(gr.sizeof_gr_complex, input_filename, False) + self.src = blocks.file_source(gr.sizeof_gr_complex, args.input_file, False) adc_rate = 64e6 # 64 MS/s usrp_decim = 200 @@ -80,10 +76,10 @@ class wfm_rx_block (gr.top_block): # wave file as final sink if 1: - sink = blocks.wavfile_sink(output_filename, 2, int(audio_rate), 16) + sink = blocks.wavfile_sink(args.output_file, 2, int(audio_rate), 16) else: sink = audio.sink (int (audio_rate), - options.audio_output, + args.audio_output, False) # ok_to_block # now wire it all together @@ -96,15 +92,15 @@ class wfm_rx_block (gr.top_block): pass #print "FYI: This implementation of the stereo_carrier_pll_recovery has no squelch implementation yet" - if options.volume is None: + if args.volume is None: g = self.volume_range() - options.volume = float(g[0]+g[1])/2 + args.volume = float(g[0]+g[1])/2 # set initial values - self.set_vol(options.volume) + self.set_vol(args.volume) try: - self.guts.stereo_carrier_pll_recovery.set_lock_threshold(options.squelch) + self.guts.stereo_carrier_pll_recovery.set_lock_threshold(args.squelch) except: pass #print "FYI: This implementation of the stereo_carrier_pll_recovery has no squelch implementation yet" |