X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-examples%2Fpython%2Fdigital%2Fusrp_options.py;h=380ef60f4bda9ac4f304c4b785072acfa1a6bf46;hb=b8f69ad7ba49aa85239f6de611ddfd040344f66b;hp=5408d2f3d8a26aff45120016ae29fea6c7d65907;hpb=bc105a1ea4de1ba98fcbd7dfeac7b45b2a0ce5c3;p=debian%2Fgnuradio diff --git a/gnuradio-examples/python/digital/usrp_options.py b/gnuradio-examples/python/digital/usrp_options.py index 5408d2f3..380ef60f 100644 --- a/gnuradio-examples/python/digital/usrp_options.py +++ b/gnuradio-examples/python/digital/usrp_options.py @@ -19,45 +19,61 @@ # Boston, MA 02110-1301, USA. # +_parser_to_groups_dict = dict() +class _parser_groups(object): + def __init__(self, parser): + self.usrpx_grp = parser.add_option_group("General USRP Options") + self.usrp1_grp = parser.add_option_group("USRP1 Specific Options") + self.usrp1exp_grp = parser.add_option_group("USRP1 Expert Options") + self.usrp2_grp = parser.add_option_group("USRP2 Specific Options") + import generic_usrp -def _add_options(parser, expert): +def _add_options(parser): """ Add options to manually choose between usrp or usrp2. Add options for usb. Add options common to source and sink. @param parser: instance of OptionParser + @return the parser group """ + #cache groups so they dont get added twice on tranceiver apps + if not _parser_to_groups_dict.has_key(parser): _parser_to_groups_dict[parser] = _parser_groups(parser) + pg = _parser_to_groups_dict[parser] #pick usrp or usrp2 - parser.add_option("-u", "--usrpx", type="string", default=None, + pg.usrpx_grp.add_option("-u", "--usrpx", type="string", default=None, help="specify which usrp model: 1 for USRP, 2 for USRP2 [default=auto]") #fast usb options - expert.add_option("-B", "--fusb-block-size", type="int", default=0, + pg.usrp1exp_grp.add_option("-B", "--fusb-block-size", type="int", default=0, help="specify fast usb block size [default=%default]") - expert.add_option("-N", "--fusb-nblocks", type="int", default=0, + pg.usrp1exp_grp.add_option("-N", "--fusb-nblocks", type="int", default=0, help="specify number of fast usb blocks [default=%default]") + #lo offset + pg.usrpx_grp.add_option("--lo-offset", type="eng_float", default=None, + help="set LO Offset in Hz [default=automatic].") #usrp options - parser.add_option("-w", "--which", type="int", default=0, + pg.usrp1_grp.add_option("-w", "--which", type="int", default=0, help="select USRP board [default=%default]") #usrp2 options - parser.add_option("-e", "--interface", type="string", default="eth0", + pg.usrp2_grp.add_option("-e", "--interface", type="string", default="eth0", help="Use USRP2 at specified Ethernet interface [default=%default]") - parser.add_option("-m", "--mac-addr", type="string", default="", + pg.usrp2_grp.add_option("-a", "--mac-addr", type="string", default="", help="Use USRP2 at specified MAC address [default=None]") + return pg -def add_rx_options(parser, expert=None): +def add_rx_options(parser): """ Add receive specific usrp options. @param parser: instance of OptionParser """ - parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None, + pg = _add_options(parser) + pg.usrp1_grp.add_option("-R", "--rx-subdev-spec", type="subdev", default=None, help="select USRP Rx side A or B") - parser.add_option("--rx-gain", type="eng_float", default=None, metavar="GAIN", + pg.usrpx_grp.add_option("--rx-gain", type="eng_float", default=None, metavar="GAIN", help="set receiver gain in dB [default=midpoint]. See also --show-rx-gain-range") - parser.add_option("--show-rx-gain-range", action="store_true", default=False, + pg.usrpx_grp.add_option("--show-rx-gain-range", action="store_true", default=False, help="print min and max Rx gain available on selected daughterboard") - parser.add_option("-d", "--decim", type="intx", default=None, + pg.usrpx_grp.add_option("-d", "--decim", type="intx", default=None, help="set fpga decimation rate to DECIM [default=%default]") - _add_options(parser, expert) def create_usrp_source(options): u = generic_usrp.generic_usrp_source_c( @@ -68,25 +84,27 @@ def create_usrp_source(options): mac_addr=options.mac_addr, fusb_block_size=options.fusb_block_size, fusb_nblocks=options.fusb_nblocks, + lo_offset=options.lo_offset, + gain=options.rx_gain, ) if options.show_rx_gain_range: print "Rx Gain Range: minimum = %g, maximum = %g, step size = %g"%tuple(u.gain_range()) return u -def add_tx_options(parser, expert=None): +def add_tx_options(parser): """ Add transmit specific usrp options. @param parser: instance of OptionParser """ - parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None, + pg = _add_options(parser) + pg.usrp1_grp.add_option("-T", "--tx-subdev-spec", type="subdev", default=None, help="select USRP Rx side A or B") - parser.add_option("--tx-gain", type="eng_float", default=None, metavar="GAIN", + pg.usrpx_grp.add_option("--tx-gain", type="eng_float", default=None, metavar="GAIN", help="set transmitter gain in dB [default=midpoint]. See also --show-tx-gain-range") - parser.add_option("--show-tx-gain-range", action="store_true", default=False, + pg.usrpx_grp.add_option("--show-tx-gain-range", action="store_true", default=False, help="print min and max Tx gain available on selected daughterboard") - parser.add_option("-i", "--interp", type="intx", default=None, + pg.usrpx_grp.add_option("-i", "--interp", type="intx", default=None, help="set fpga interpolation rate to INTERP [default=%default]") - _add_options(parser, expert) def create_usrp_sink(options): u = generic_usrp.generic_usrp_sink_c( @@ -97,6 +115,8 @@ def create_usrp_sink(options): mac_addr=options.mac_addr, fusb_block_size=options.fusb_block_size, fusb_nblocks=options.fusb_nblocks, + lo_offset=options.lo_offset, + gain=options.tx_gain, ) if options.show_tx_gain_range: print "Tx Gain Range: minimum = %g, maximum = %g, step size = %g"%tuple(u.gain_range())