diff options
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/dboard_iface_python.hpp | 26 | ||||
| -rw-r--r-- | host/lib/usrp/fe_connection_python.hpp | 11 | ||||
| -rw-r--r-- | host/lib/usrp/multi_usrp_python.hpp | 589 | ||||
| -rw-r--r-- | host/lib/usrp/subdev_spec_python.hpp | 19 |
4 files changed, 156 insertions, 489 deletions
diff --git a/host/lib/usrp/dboard_iface_python.hpp b/host/lib/usrp/dboard_iface_python.hpp index f43490e7d..96fcc1702 100644 --- a/host/lib/usrp/dboard_iface_python.hpp +++ b/host/lib/usrp/dboard_iface_python.hpp @@ -1,5 +1,6 @@ // // Copyright 2017-2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -11,7 +12,7 @@ #include <uhd/usrp/gpio_defs.hpp> #include "../include/uhdlib/usrp/gpio_defs.hpp" -void export_dboard_iface() +void export_dboard_iface(py::module& m) { using dboard_iface = uhd::usrp::dboard_iface; using special_props_t = uhd::usrp::dboard_iface_special_props_t; @@ -23,48 +24,43 @@ void export_dboard_iface() using gpio_atr_reg_t = uhd::usrp::gpio_atr::gpio_atr_reg_t; using gpio_atr_mode_t = uhd::usrp::gpio_atr::gpio_atr_mode_t; - bp::enum_<gpio_atr_reg_t>("gpio_atr_reg") + py::enum_<gpio_atr_reg_t>(m, "gpio_atr_reg") .value("ATR_REG_IDLE" , gpio_atr_reg_t::ATR_REG_IDLE ) .value("ATR_REG_TX_ONLY" , gpio_atr_reg_t::ATR_REG_TX_ONLY ) .value("ATR_REG_RX_ONLY" , gpio_atr_reg_t::ATR_REG_RX_ONLY ) .value("ATR_REG_FULL_DUPLEX", gpio_atr_reg_t::ATR_REG_FULL_DUPLEX) ; - bp::enum_<gpio_atr_mode_t>("gpio_atr_mode") + py::enum_<gpio_atr_mode_t>(m, "gpio_atr_mode") .value("MODE_ATR" , gpio_atr_mode_t::MODE_ATR ) .value("MODE_GPIO", gpio_atr_mode_t::MODE_GPIO) ; - bp::enum_<unit_t>("unit") + py::enum_<unit_t>(m, "unit") .value("UNIT_RX" , unit_t::UNIT_RX ) .value("UNIT_TX" , unit_t::UNIT_TX ) .value("UNIT_BOTH", unit_t::UNIT_BOTH) ; - bp::enum_<aux_dac_t>("aux_dac") + py::enum_<aux_dac_t>(m, "aux_dac") .value("AUX_DAC_A", aux_dac_t::AUX_DAC_A) .value("AUX_DAC_B", aux_dac_t::AUX_DAC_B) .value("AUX_DAC_C", aux_dac_t::AUX_DAC_C) .value("AUX_DAC_D", aux_dac_t::AUX_DAC_D) ; - bp::enum_<aux_adc_t>("aux_adc") + py::enum_<aux_adc_t>(m, "aux_adc") .value("AUX_ADC_A", aux_adc_t::AUX_ADC_A) .value("AUX_ADC_B", aux_adc_t::AUX_ADC_B) ; - bp::class_<special_props_t>("special_props") - + py::class_<special_props_t>(m, "special_props") // Properties - .add_property("soft_clock_divider", &special_props_t::soft_clock_divider) - .add_property("mangle_i2c_addrs" , &special_props_t::mangle_i2c_addrs ) + .def_readwrite("soft_clock_divider", &special_props_t::soft_clock_divider) + .def_readwrite("mangle_i2c_addrs" , &special_props_t::mangle_i2c_addrs ) ; - bp::class_< - dboard_iface, - boost::shared_ptr<dboard_iface>, - uhd::noncopyable>("dboard_iface", bp::no_init) - + py::class_<dboard_iface, dboard_iface::sptr>(m, "dboard_iface") // Methods .def("get_special_props", &dboard_iface::get_special_props) .def("write_aux_dac" , &dboard_iface::write_aux_dac ) diff --git a/host/lib/usrp/fe_connection_python.hpp b/host/lib/usrp/fe_connection_python.hpp index 29bba1746..d1304909e 100644 --- a/host/lib/usrp/fe_connection_python.hpp +++ b/host/lib/usrp/fe_connection_python.hpp @@ -1,5 +1,6 @@ // // Copyright 2017-2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -9,22 +10,22 @@ #include <uhd/usrp/fe_connection.hpp> -void export_fe_connection() +void export_fe_connection(py::module& m) { using fe_connection_t = uhd::usrp::fe_connection_t; using sampling_t = fe_connection_t::sampling_t; - bp::enum_<sampling_t>("sampling") + py::enum_<sampling_t>(m, "sampling") .value("QUADRATURE", sampling_t::QUADRATURE) .value("HETERODYNE", sampling_t::HETERODYNE) .value("REAL" , sampling_t::REAL ) ; - bp::class_<fe_connection_t> - ("fe_connection", bp::init<sampling_t, bool, bool, bool, double>()) + py::class_<fe_connection_t>(m, "fe_connection") // Constructors - .def(bp::init<const std::string&, double>()) + .def(py::init<sampling_t, bool, bool, bool, double>()) + .def(py::init<const std::string&, double>()) // Methods .def("get_sampling_mode", &fe_connection_t::get_sampling_mode) diff --git a/host/lib/usrp/multi_usrp_python.hpp b/host/lib/usrp/multi_usrp_python.hpp index 6dc14f083..9bec4bb4f 100644 --- a/host/lib/usrp/multi_usrp_python.hpp +++ b/host/lib/usrp/multi_usrp_python.hpp @@ -1,5 +1,6 @@ // // Copyright 2017-2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -10,495 +11,167 @@ #include <uhd/types/device_addr.hpp> #include <uhd/usrp/multi_usrp.hpp> -// -// Boost.Python needs overloaded API calls to be defined -// -static void set_rx_gain_0( - uhd::usrp::multi_usrp *multi_usrp, double gain, const std::string &name, size_t chan = 0) -{ - multi_usrp->set_rx_gain(gain, name, chan); -} - -static void set_rx_gain_1( - uhd::usrp::multi_usrp *multi_usrp, double gain, size_t chan = 0) -{ - multi_usrp->set_rx_gain(gain, chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_rx_gain_0, set_rx_gain_0, 3, 4); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_rx_gain_1, set_rx_gain_1, 2, 3); - -static void set_tx_gain_0( - uhd::usrp::multi_usrp *multi_usrp, double gain, const std::string &name, size_t chan = 0) -{ - multi_usrp->set_tx_gain(gain, name, chan); -} - -static void set_tx_gain_1( - uhd::usrp::multi_usrp *multi_usrp, double gain, size_t chan = 0) -{ - multi_usrp->set_tx_gain(gain, chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_tx_gain_0, set_tx_gain_0, 3, 4); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_tx_gain_1, set_tx_gain_1, 2, 3); - -static double get_rx_gain_0( - uhd::usrp::multi_usrp *multi_usrp, const std::string &name, size_t chan = 0) -{ - return multi_usrp->get_rx_gain(name, chan); -} - -static double get_rx_gain_1( - uhd::usrp::multi_usrp *multi_usrp, size_t chan = 0) -{ - return multi_usrp->get_rx_gain(chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_rx_gain_0, get_rx_gain_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_rx_gain_1, get_rx_gain_1, 1, 2); - -static double get_tx_gain_0( - uhd::usrp::multi_usrp *multi_usrp, const std::string &name, size_t chan = 0) -{ - return multi_usrp->get_tx_gain(name, chan); -} - -static double get_tx_gain_1( - uhd::usrp::multi_usrp *multi_usrp, size_t chan = 0) -{ - return multi_usrp->get_tx_gain(chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_tx_gain_0, get_tx_gain_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_tx_gain_1, get_tx_gain_1, 1, 2); - -static uhd::gain_range_t get_rx_gain_range_0( - uhd::usrp::multi_usrp *multi_usrp, const std::string &name, size_t chan = 0) -{ - return multi_usrp->get_rx_gain_range(name, chan); -} - -static uhd::gain_range_t get_rx_gain_range_1( - uhd::usrp::multi_usrp *multi_usrp, size_t chan = 0) -{ - return multi_usrp->get_rx_gain_range(chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_rx_gain_range_0, get_rx_gain_range_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_rx_gain_range_1, get_rx_gain_range_1, 1, 2); - -static uhd::gain_range_t get_tx_gain_range_0( - uhd::usrp::multi_usrp *multi_usrp, const std::string &name, size_t chan = 0) -{ - return multi_usrp->get_tx_gain_range(name, chan); -} - -static uhd::gain_range_t get_tx_gain_range_1( - uhd::usrp::multi_usrp *multi_usrp, size_t chan = 0) -{ - return multi_usrp->get_tx_gain_range(chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_tx_gain_range_0, get_tx_gain_range_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_get_tx_gain_range_1, get_tx_gain_range_1, 1, 2); - -static void set_rx_dc_offset_0( - uhd::usrp::multi_usrp *multi_usrp, const bool enb, size_t chan = 0) -{ - multi_usrp->set_rx_dc_offset(enb, chan); -} - -static void set_rx_dc_offset_1( - uhd::usrp::multi_usrp *multi_usrp, const std::complex<double> &offset, size_t chan = 0) -{ - multi_usrp->set_rx_dc_offset(offset, chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_rx_dc_offset_0, set_rx_dc_offset_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_rx_dc_offset_1, set_rx_dc_offset_1, 2, 3); - -static void set_tx_dc_offset_0( - uhd::usrp::multi_usrp *multi_usrp, const bool enb, size_t chan = 0) -{ - multi_usrp->set_tx_dc_offset(enb, chan); -} - -static void set_tx_dc_offset_1( - uhd::usrp::multi_usrp *multi_usrp, const std::complex<double> &offset, size_t chan = 0) -{ - multi_usrp->set_tx_dc_offset(offset, chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_tx_dc_offset_0, set_tx_dc_offset_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_tx_dc_offset_1, set_tx_dc_offset_1, 2, 3); - -static void set_rx_iq_balance_0( - uhd::usrp::multi_usrp *multi_usrp, const bool enb, size_t chan = 0) -{ - multi_usrp->set_rx_iq_balance(enb, chan); -} - -static void set_rx_iq_balance_1( - uhd::usrp::multi_usrp *multi_usrp, const std::complex<double> &offset, size_t chan = 0) -{ - multi_usrp->set_rx_iq_balance(offset, chan); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_rx_iq_balance_0, set_rx_iq_balance_0, 2, 3); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_rx_iq_balance_1, set_rx_iq_balance_1, 2, 3); - -static void set_gpio_attr_0(uhd::usrp::multi_usrp *multi_usrp, - const std::string &bank, - const std::string &attr, - const uint32_t value, - const uint32_t mask = 0xffffffff, - const size_t mboard = 0) -{ - multi_usrp->set_gpio_attr(bank, attr, value, mask, mboard); -} - -static void set_gpio_attr_1(uhd::usrp::multi_usrp *multi_usrp, - const std::string &bank, - const std::string &attr, - const std::string &value, - const uint32_t mask = 0xffffffff, - const size_t mboard = 0) -{ - multi_usrp->set_gpio_attr(bank, attr, value, mask, mboard); -} - -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_gpio_attr_0, set_gpio_attr_0, 4, 6); -BOOST_PYTHON_FUNCTION_OVERLOADS(overload_set_gpio_attr_1, set_gpio_attr_1, 4, 6); - -static void set_sync_source_0(uhd::usrp::multi_usrp *multi_usrp, - const std::string &clock_source, - const std::string &time_source) -{ - multi_usrp->set_sync_source(clock_source, time_source); -} -static void set_sync_source_1(uhd::usrp::multi_usrp *multi_usrp, - const std::string &clock_source, - const std::string &time_source, - const size_t mboard) -{ - multi_usrp->set_sync_source(clock_source, time_source, mboard); -} -static void set_sync_source_2(uhd::usrp::multi_usrp *multi_usrp, - const uhd::device_addr_t& sync_source) -{ - multi_usrp->set_sync_source(sync_source); -} -static void set_sync_source_3(uhd::usrp::multi_usrp *multi_usrp, - const uhd::device_addr_t& sync_source, - const size_t mboard) -{ - multi_usrp->set_sync_source(sync_source, mboard); -} - -// -// Boost.Python needs to know about default argument overloads -// - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_freq, get_rx_freq, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_rate, get_rx_rate, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_freq, set_rx_freq, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_rate, set_rx_rate, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_freq, get_tx_freq, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_rate, get_tx_rate, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_freq, set_tx_freq, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_rate, set_tx_rate, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_usrp_rx_info, get_usrp_rx_info, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_usrp_tx_info, get_usrp_tx_info, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_master_clock_rate, set_master_clock_rate, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_master_clock_rate, get_master_clock_rate, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_master_clock_rate_range, get_master_clock_rate_range, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_mboard_name, get_mboard_name, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_time_now, get_time_now, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_time_last_pps, get_time_last_pps, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_time_now, set_time_now, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_time_next_pps, set_time_next_pps, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_command_time, set_command_time, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_clear_command_time, clear_command_time, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_issue_stream_cmd, issue_stream_cmd, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_clock_config, set_clock_config, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_time_source, set_time_source, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_clock_source, set_clock_source, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_clock_source_out, set_clock_source_out, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_time_source_out, set_time_source_out, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_mboard_sensor, get_mboard_sensor, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_mboard_sensor_names, get_mboard_sensor_names, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_user_register, set_user_register, 2, 3); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_subdev_spec, set_rx_subdev_spec, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_subdev_spec, get_rx_subdev_spec, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_subdev_name, get_rx_subdev_name, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_rates, get_rx_rates, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_freq_range, get_rx_freq_range, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_fe_rx_freq_range, get_fe_rx_freq_range, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_lo_names, get_rx_lo_names, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_lo_source, get_rx_lo_source, 0, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_lo_source, set_rx_lo_source, 1, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_lo_sources, get_rx_lo_sources, 0, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_lo_export_enabled, set_rx_lo_export_enabled, 1, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_lo_export_enabled, get_rx_lo_export_enabled, 0, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_lo_freq, set_rx_lo_freq, 2, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_lo_freq, get_rx_lo_freq, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_lo_freq_range, get_rx_lo_freq_range, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_normalized_rx_gain, set_normalized_rx_gain, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_normalized_rx_gain, get_normalized_rx_gain, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_agc, set_rx_agc, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_gain_names, get_rx_gain_names, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_antenna, set_rx_antenna, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_antenna, get_rx_antenna, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_antennas, get_rx_antennas, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_bandwidth, set_rx_bandwidth, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_bandwidth, get_rx_bandwidth, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_bandwidth_range, get_rx_bandwidth_range, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_dboard_iface, get_rx_dboard_iface, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_sensor, get_rx_sensor, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_sensor_names, get_rx_sensor_names, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_gain_profile, get_rx_gain_profile, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_rx_gain_profile, set_rx_gain_profile, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_rx_gain_profile_names, get_rx_gain_profile_names, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_subdev_spec, set_tx_subdev_spec, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_subdev_spec, get_tx_subdev_spec, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_subdev_name, get_tx_subdev_name, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_rates, get_tx_rates, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_freq_range, get_tx_freq_range, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_fe_tx_freq_range, get_fe_tx_freq_range, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_lo_names, get_tx_lo_names, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_lo_source, get_tx_lo_source, 0, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_lo_source, set_tx_lo_source, 1, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_lo_sources, get_tx_lo_sources, 0, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_lo_export_enabled, set_tx_lo_export_enabled, 1, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_lo_export_enabled, get_tx_lo_export_enabled, 0, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_lo_freq, set_tx_lo_freq, 2, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_lo_freq, get_tx_lo_freq, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_lo_freq_range, get_tx_lo_freq_range, 1, 2); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_normalized_tx_gain, set_normalized_tx_gain, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_normalized_tx_gain, get_normalized_tx_gain, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_gain_names, get_tx_gain_names, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_antenna, set_tx_antenna, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_antenna, get_tx_antenna, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_antennas, get_tx_antennas, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_bandwidth, set_tx_bandwidth, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_bandwidth, get_tx_bandwidth, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_bandwidth_range, get_tx_bandwidth_range, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_dboard_iface, get_tx_dboard_iface, 0, 1); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_sensor, get_tx_sensor, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_sensor_names, get_tx_sensor_names, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_iq_balance, set_tx_iq_balance, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_gain_profile, get_tx_gain_profile, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_set_tx_gain_profile, set_tx_gain_profile, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_tx_gain_profile_names, get_tx_gain_profile_names, 0, 1); - - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_gpio_attr, get_gpio_attr, 2, 3); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_enumerate_registers, enumerate_registers, 0, 1); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_register_info, get_register_info, 1, 2); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_write_register, write_register, 3, 4); -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_read_register, read_register, 2, 3); - -BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(overload_get_filter_names, get_filter_names, 0, 1); - -void export_multi_usrp() +void export_multi_usrp(py::module& m) { using multi_usrp = uhd::usrp::multi_usrp; using register_info_t = multi_usrp::register_info_t; - bp::class_<register_info_t>("register_info") - .add_property("bitwidth", ®ister_info_t::bitwidth) - .add_property("readable", ®ister_info_t::readable) - .add_property("writable", ®ister_info_t::writable) - ; + const auto ALL_MBOARDS = multi_usrp::ALL_MBOARDS; + const auto ALL_CHANS = multi_usrp::ALL_CHANS; + const auto ALL_LOS = multi_usrp::ALL_LOS; - bp::class_< - multi_usrp, - boost::shared_ptr<multi_usrp>, - uhd::noncopyable>("multi_usrp", bp::no_init) + py::class_<register_info_t>(m, "register_info") + .def_readwrite("bitwidth", ®ister_info_t::bitwidth) + .def_readwrite("readable", ®ister_info_t::readable) + .def_readwrite("writable", ®ister_info_t::writable) + ; - .def("__init__", bp::make_constructor(&multi_usrp::make)) + py::class_<multi_usrp, multi_usrp::sptr>(m, "multi_usrp") - // Methods - .def("make", &multi_usrp::make) - .staticmethod("make") + // Factory + .def(py::init(&multi_usrp::make)) // General USRP methods - .def("get_rx_freq" , &multi_usrp::get_rx_freq, overload_get_rx_freq()) + .def("get_rx_freq" , &multi_usrp::get_rx_freq, py::arg("chan") = 0) .def("get_rx_num_channels" , &multi_usrp::get_rx_num_channels) - .def("get_rx_rate" , &multi_usrp::get_rx_rate, overload_get_rx_rate()) - .def("get_rx_stream" , &multi_usrp::get_rx_stream) - .def("set_rx_freq" , &multi_usrp::set_rx_freq, overload_set_rx_freq()) - .def("set_rx_gain" , &set_rx_gain_0, overload_set_rx_gain_0()) - .def("set_rx_gain" , &set_rx_gain_1, overload_set_rx_gain_1()) - .def("set_rx_rate" , &multi_usrp::set_rx_rate, overload_set_rx_rate()) - .def("get_tx_freq" , &multi_usrp::get_tx_freq, overload_get_tx_freq()) + .def("get_rx_rate" , &multi_usrp::get_rx_rate, py::arg("chan") = 0) + .def("get_rx_stream" , &multi_usrp::get_rx_stream) + .def("set_rx_freq" , &multi_usrp::set_rx_freq, py::arg("tune_request"), py::arg("chan") = 0) + .def("set_rx_gain" , (void (multi_usrp::*)(double, const std::string&, size_t)) &multi_usrp::set_rx_gain, py::arg("gain"), py::arg("name"), py::arg("chan") = 0) + .def("set_rx_gain" , (void (multi_usrp::*)(double, size_t)) &multi_usrp::set_rx_gain, py::arg("gain"), py::arg("chan") = 0) + .def("set_rx_rate" , &multi_usrp::set_rx_rate, py::arg("rate"), py::arg("chan") = ALL_CHANS) + .def("get_tx_freq" , &multi_usrp::get_tx_freq, py::arg("chan") = 0) .def("get_tx_num_channels" , &multi_usrp::get_tx_num_channels) - .def("get_tx_rate" , &multi_usrp::get_tx_rate, overload_get_tx_rate()) + .def("get_tx_rate" , &multi_usrp::get_tx_rate, py::arg("chan") = 0) .def("get_tx_stream" , &multi_usrp::get_tx_stream) - .def("set_tx_freq" , &multi_usrp::set_tx_freq, overload_set_tx_freq()) - .def("set_tx_gain" , &set_tx_gain_0, overload_set_tx_gain_0()) - .def("set_tx_gain" , &set_tx_gain_1, overload_set_tx_gain_1()) - .def("set_tx_rate" , &multi_usrp::set_tx_rate, overload_set_tx_rate()) - .def("get_usrp_rx_info" , &multi_usrp::get_usrp_rx_info, overload_get_usrp_rx_info()) - .def("get_usrp_tx_info" , &multi_usrp::get_usrp_tx_info, overload_get_usrp_tx_info()) - .def("set_master_clock_rate" , &multi_usrp::set_master_clock_rate, overload_set_master_clock_rate()) - .def("get_master_clock_rate" , &multi_usrp::get_master_clock_rate, overload_get_master_clock_rate()) - .def("get_master_clock_rate_range", &multi_usrp::get_master_clock_rate_range, overload_get_master_clock_rate_range()) + .def("set_tx_freq" , &multi_usrp::set_tx_freq, py::arg("tune_request"), py::arg("chan") = 0) + .def("set_tx_gain" , (void (multi_usrp::*)(double, const std::string&, size_t)) &multi_usrp::set_tx_gain, py::arg("gain"), py::arg("name"), py::arg("chan") = 0) + .def("set_tx_gain" , (void (multi_usrp::*)(double, size_t)) &multi_usrp::set_tx_gain, py::arg("gain"), py::arg("chan") = 0) + .def("set_tx_rate" , &multi_usrp::set_tx_rate, py::arg("rate"), py::arg("chan") = ALL_CHANS) + .def("get_usrp_rx_info" , &multi_usrp::get_usrp_rx_info, py::arg("chan") = 0) + .def("get_usrp_tx_info" , &multi_usrp::get_usrp_tx_info, py::arg("chan") = 0) + .def("set_master_clock_rate" , &multi_usrp::set_master_clock_rate, py::arg("rate"), py::arg("mboard") = ALL_MBOARDS) + .def("get_master_clock_rate" , &multi_usrp::get_master_clock_rate, py::arg("mboard") = 0) + .def("get_master_clock_rate_range", &multi_usrp::get_master_clock_rate_range, py::arg("mboard") = ALL_MBOARDS) .def("get_pp_string" , &multi_usrp::get_pp_string) - .def("get_mboard_name" , &multi_usrp::get_mboard_name, overload_get_mboard_name()) - .def("get_time_now" , &multi_usrp::get_time_now, overload_get_time_now()) - .def("get_time_last_pps" , &multi_usrp::get_time_last_pps, overload_get_time_last_pps()) - .def("set_time_now" , &multi_usrp::set_time_now, overload_set_time_now()) - .def("set_time_next_pps" , &multi_usrp::set_time_next_pps, overload_set_time_next_pps()) + .def("get_mboard_name" , &multi_usrp::get_mboard_name, py::arg("mboard") = 0) + .def("get_time_now" , &multi_usrp::get_time_now, py::arg("mboard") = 0) + .def("get_time_last_pps" , &multi_usrp::get_time_last_pps, py::arg("mboard") = 0) + .def("set_time_now" , &multi_usrp::set_time_now, py::arg("time_spec"), py::arg("mboard") = ALL_MBOARDS) + .def("set_time_next_pps" , &multi_usrp::set_time_next_pps, py::arg("time_spec"), py::arg("mboard") = ALL_MBOARDS) .def("set_time_unknown_pps" , &multi_usrp::set_time_unknown_pps) .def("get_time_synchronized" , &multi_usrp::get_time_synchronized) - .def("set_command_time" , &multi_usrp::set_command_time, overload_set_command_time()) - .def("clear_command_time" , &multi_usrp::clear_command_time, overload_clear_command_time()) - .def("issue_stream_cmd" , &multi_usrp::issue_stream_cmd, overload_issue_stream_cmd()) - .def("set_clock_config" , &multi_usrp::set_clock_config, overload_set_clock_config()) - .def("set_time_source" , &multi_usrp::set_time_source, overload_set_time_source()) + .def("set_command_time" , &multi_usrp::set_command_time, py::arg("time_spec"), py::arg("mboard") = 0) + .def("clear_command_time" , &multi_usrp::clear_command_time, py::arg("mboard") = ALL_MBOARDS) + .def("issue_stream_cmd" , &multi_usrp::issue_stream_cmd, py::arg("rate"), py::arg("chan") = ALL_CHANS) + .def("set_time_source" , &multi_usrp::set_time_source, py::arg("source"), py::arg("mboard") = ALL_MBOARDS) .def("get_time_source" , &multi_usrp::get_time_source) .def("get_time_sources" , &multi_usrp::get_time_sources) - .def("set_clock_source" , &multi_usrp::set_clock_source, overload_set_clock_source()) + .def("set_clock_source" , &multi_usrp::set_clock_source, py::arg("source"), py::arg("mboard") = ALL_MBOARDS) .def("get_clock_source" , &multi_usrp::get_clock_source) .def("get_clock_sources" , &multi_usrp::get_clock_sources) - .def("set_sync_source" , &set_sync_source_0) - .def("set_sync_source" , &set_sync_source_1) - .def("set_sync_source" , &set_sync_source_2) - .def("set_sync_source" , &set_sync_source_3) + .def("set_sync_source" , (void (multi_usrp::*)(const std::string&, const std::string&, size_t)) &multi_usrp::set_sync_source, py::arg("clock_source"), py::arg("time_source"), py::arg("mboard") = ALL_MBOARDS) + .def("set_sync_source" , (void (multi_usrp::*)(const uhd::device_addr_t&, size_t)) &multi_usrp::set_sync_source, py::arg("sync_source"), py::arg("mboard") = ALL_MBOARDS) .def("get_sync_source" , &multi_usrp::get_sync_source) .def("get_sync_sources" , &multi_usrp::get_sync_sources) - .def("set_clock_source_out" , &multi_usrp::set_clock_source_out, overload_set_clock_source_out()) - .def("set_time_source_out" , &multi_usrp::set_time_source_out, overload_set_time_source_out()) + .def("set_clock_source_out" , &multi_usrp::set_clock_source_out, py::arg("enb"), py::arg("mboard") = ALL_MBOARDS) + .def("set_time_source_out" , &multi_usrp::set_time_source_out, py::arg("enb"), py::arg("mboard") = ALL_MBOARDS) .def("get_num_mboards" , &multi_usrp::get_num_mboards) - .def("get_mboard_sensor" , &multi_usrp::get_mboard_sensor, overload_get_mboard_sensor()) - .def("get_mboard_sensor_names" , &multi_usrp::get_mboard_sensor_names, overload_get_mboard_sensor_names()) - .def("set_user_register" , &multi_usrp::set_user_register, overload_set_user_register()) + .def("get_mboard_sensor" , &multi_usrp::get_mboard_sensor, py::arg("name"), py::arg("mboard") = 0) + .def("get_mboard_sensor_names" , &multi_usrp::get_mboard_sensor_names, py::arg("mboard") = 0) + .def("set_user_register" , &multi_usrp::set_user_register, py::arg("addr"), py::arg("data"), py::arg("mboard") = ALL_MBOARDS) // RX methods - .def("set_rx_subdev_spec" , &multi_usrp::set_rx_subdev_spec, overload_set_rx_subdev_spec()) - .def("get_rx_subdev_spec" , &multi_usrp::get_rx_subdev_spec, overload_get_rx_subdev_spec()) - .def("get_rx_subdev_name" , &multi_usrp::get_rx_subdev_name, overload_get_rx_subdev_name()) - .def("get_rx_rates" , &multi_usrp::get_rx_rates, overload_get_rx_rates()) - .def("get_rx_freq_range" , &multi_usrp::get_rx_freq_range, overload_get_rx_freq_range()) - .def("get_fe_rx_freq_range" , &multi_usrp::get_fe_rx_freq_range, overload_get_fe_rx_freq_range()) - .def("get_rx_lo_names" , &multi_usrp::get_rx_lo_names, overload_get_rx_lo_names()) - .def("set_rx_lo_source" , &multi_usrp::set_rx_lo_source, overload_set_rx_lo_source()) - .def("get_rx_lo_source" , &multi_usrp::get_rx_lo_source, overload_get_rx_lo_source()) - .def("get_rx_lo_sources" , &multi_usrp::get_rx_lo_sources, overload_get_rx_lo_sources()) - .def("set_rx_lo_export_enabled", &multi_usrp::set_rx_lo_export_enabled, overload_set_rx_lo_export_enabled()) - .def("get_rx_lo_export_enabled", &multi_usrp::get_rx_lo_export_enabled, overload_get_rx_lo_export_enabled()) - .def("set_rx_lo_freq" , &multi_usrp::set_rx_lo_freq, overload_set_rx_lo_freq()) - .def("get_rx_lo_freq" , &multi_usrp::get_rx_lo_freq, overload_get_rx_lo_freq()) - .def("get_rx_lo_freq_range" , &multi_usrp::get_rx_lo_freq_range, overload_get_rx_lo_freq_range()) - .def("set_normalized_rx_gain" , &multi_usrp::set_normalized_rx_gain, overload_set_normalized_rx_gain()) - .def("get_normalized_rx_gain" , &multi_usrp::get_normalized_rx_gain, overload_get_normalized_rx_gain()) - .def("set_rx_agc" , &multi_usrp::set_rx_agc, overload_set_rx_agc()) - .def("get_rx_gain" , &get_rx_gain_0, overload_get_rx_gain_0()) - .def("get_rx_gain" , &get_rx_gain_1, overload_get_rx_gain_1()) - .def("get_rx_gain_range" , &get_rx_gain_range_0, overload_get_rx_gain_range_0()) - .def("get_rx_gain_range" , &get_rx_gain_range_1, overload_get_rx_gain_range_1()) - .def("get_rx_gain_names" , &multi_usrp::get_rx_gain_names, overload_get_rx_gain_names()) - .def("set_rx_antenna" , &multi_usrp::set_rx_antenna, overload_set_rx_antenna()) - .def("get_rx_antenna" , &multi_usrp::get_rx_antenna, overload_get_rx_antenna()) - .def("get_rx_antennas" , &multi_usrp::get_rx_antennas, overload_get_rx_antennas()) - .def("set_rx_bandwidth" , &multi_usrp::set_rx_bandwidth, overload_set_rx_bandwidth()) - .def("get_rx_bandwidth" , &multi_usrp::get_rx_bandwidth, overload_get_rx_bandwidth()) - .def("get_rx_bandwidth_range" , &multi_usrp::get_rx_bandwidth_range, overload_get_rx_bandwidth_range()) - .def("get_rx_dboard_iface" , &multi_usrp::get_rx_dboard_iface, overload_get_rx_dboard_iface()) - .def("get_rx_sensor" , &multi_usrp::get_rx_sensor, overload_get_rx_sensor()) - .def("get_rx_sensor_names" , &multi_usrp::get_rx_sensor_names, overload_get_rx_sensor_names()) - .def("set_rx_dc_offset" , &set_rx_dc_offset_0, overload_set_rx_dc_offset_0()) - .def("set_rx_dc_offset" , &set_rx_dc_offset_1, overload_set_rx_dc_offset_1()) - .def("set_rx_iq_balance" , &set_rx_iq_balance_0, overload_set_rx_iq_balance_0()) - .def("set_rx_iq_balance" , &set_rx_iq_balance_1, overload_set_rx_iq_balance_1()) - .def("get_rx_gain_profile" , &multi_usrp::get_rx_gain_profile, overload_get_rx_gain_profile()) - .def("set_rx_gain_profile" , &multi_usrp::set_rx_gain_profile, overload_set_rx_gain_profile()) - .def("get_rx_gain_profile_names", &multi_usrp::get_rx_gain_profile_names, overload_get_rx_gain_profile_names()) + .def("set_rx_subdev_spec" , &multi_usrp::set_rx_subdev_spec, py::arg("spec"), py::arg("mboard") = ALL_MBOARDS) + .def("get_rx_subdev_spec" , &multi_usrp::get_rx_subdev_spec, py::arg("mboard") = 0) + .def("get_rx_subdev_name" , &multi_usrp::get_rx_subdev_name, py::arg("chan") = 0) + .def("get_rx_rates" , &multi_usrp::get_rx_rates, py::arg("chan") = 0) + .def("get_rx_freq_range" , &multi_usrp::get_rx_freq_range, py::arg("chan") = 0) + .def("get_fe_rx_freq_range" , &multi_usrp::get_fe_rx_freq_range, py::arg("chan") = 0) + .def("get_rx_lo_names" , &multi_usrp::get_rx_lo_names, py::arg("chan") = 0) + .def("set_rx_lo_source" , &multi_usrp::set_rx_lo_source, py::arg("src"), py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("get_rx_lo_source" , &multi_usrp::get_rx_lo_source, py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("get_rx_lo_sources" , &multi_usrp::get_rx_lo_sources, py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("set_rx_lo_export_enabled", &multi_usrp::set_rx_lo_export_enabled, py::arg("enb"), py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("get_rx_lo_export_enabled", &multi_usrp::get_rx_lo_export_enabled, py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("set_rx_lo_freq" , &multi_usrp::set_rx_lo_freq, py::arg("freq"), py::arg("name"), py::arg("chan") = 0) + .def("get_rx_lo_freq" , &multi_usrp::get_rx_lo_freq, py::arg("name"), py::arg("chan") = 0) + .def("get_rx_lo_freq_range" , &multi_usrp::get_rx_lo_freq_range, py::arg("name"), py::arg("chan") = 0) + .def("set_normalized_rx_gain" , &multi_usrp::set_normalized_rx_gain, py::arg("gain"), py::arg("chan") = 0) + .def("get_normalized_rx_gain" , &multi_usrp::get_normalized_rx_gain, py::arg("chan") = 0) + .def("set_rx_agc" , &multi_usrp::set_rx_agc, py::arg("enable"), py::arg("chan") = 0) + .def("get_rx_gain" , (double (multi_usrp::*)(const std::string&, size_t)) &multi_usrp::get_rx_gain, py::arg("name"), py::arg("chan") = 0) + .def("get_rx_gain" , (double (multi_usrp::*)(size_t)) &multi_usrp::get_rx_gain, py::arg("chan") = 0) + .def("get_rx_gain_range" , (uhd::gain_range_t (multi_usrp::*)(const std::string&, size_t)) &multi_usrp::get_rx_gain_range, py::arg("name"), py::arg("chan") = 0) + .def("get_rx_gain_range" , (uhd::gain_range_t (multi_usrp::*)(size_t)) &multi_usrp::get_rx_gain_range, py::arg("chan") = 0) + .def("get_rx_gain_names" , &multi_usrp::get_rx_gain_names, py::arg("chan") = 0) + .def("set_rx_antenna" , &multi_usrp::set_rx_antenna, py::arg("ant"), py::arg("chan") = 0) + .def("get_rx_antenna" , &multi_usrp::get_rx_antenna, py::arg("chan") = 0) + .def("get_rx_antennas" , &multi_usrp::get_rx_antennas, py::arg("chan") = 0) + .def("set_rx_bandwidth" , &multi_usrp::set_rx_bandwidth, py::arg("bandwidth"), py::arg("chan") = 0) + .def("get_rx_bandwidth" , &multi_usrp::get_rx_bandwidth, py::arg("chan") = 0) + .def("get_rx_bandwidth_range" , &multi_usrp::get_rx_bandwidth_range, py::arg("chan") = 0) + .def("get_rx_dboard_iface" , &multi_usrp::get_rx_dboard_iface, py::arg("chan") = 0) + .def("get_rx_sensor" , &multi_usrp::get_rx_sensor, py::arg("name"), py::arg("chan") = 0) + .def("get_rx_sensor_names" , &multi_usrp::get_rx_sensor_names, py::arg("chan") = 0) + .def("set_rx_dc_offset" , (void (multi_usrp::*)(const std::complex<double>&, size_t)) &multi_usrp::set_rx_dc_offset, py::arg("offset"), py::arg("chan") = 0) + .def("set_rx_dc_offset" , (void (multi_usrp::*)(bool, size_t)) &multi_usrp::set_rx_dc_offset, py::arg("enb"), py::arg("chan") = 0) + .def("set_rx_iq_balance" , (void (multi_usrp::*)(const std::complex<double>&, size_t)) &multi_usrp::set_rx_iq_balance, py::arg("correction"), py::arg("chan") = 0) + .def("set_rx_iq_balance" , (void (multi_usrp::*)(bool, size_t)) &multi_usrp::set_rx_dc_offset, py::arg("enb"), py::arg("chan") = 0) + .def("get_rx_gain_profile" , &multi_usrp::get_rx_gain_profile, py::arg("chan") = 0) + .def("set_rx_gain_profile" , &multi_usrp::set_rx_gain_profile, py::arg("profile"), py::arg("chan") = 0) + .def("get_rx_gain_profile_names", &multi_usrp::get_rx_gain_profile_names, py::arg("chan") = 0) // TX methods - .def("set_tx_subdev_spec" , &multi_usrp::set_tx_subdev_spec, overload_set_tx_subdev_spec()) - .def("get_tx_subdev_spec" , &multi_usrp::get_tx_subdev_spec, overload_get_tx_subdev_spec()) - .def("get_tx_subdev_name" , &multi_usrp::get_tx_subdev_name, overload_get_tx_subdev_name()) - .def("get_tx_rates" , &multi_usrp::get_tx_rates, overload_get_rx_rates()) - .def("get_tx_freq_range" , &multi_usrp::get_tx_freq_range, overload_get_tx_freq_range()) - .def("get_fe_tx_freq_range" , &multi_usrp::get_fe_tx_freq_range, overload_get_fe_tx_freq_range()) - .def("get_tx_lo_names" , &multi_usrp::get_tx_lo_names, overload_get_tx_lo_names()) - .def("set_tx_lo_source" , &multi_usrp::set_tx_lo_source, overload_set_tx_lo_source()) - .def("get_tx_lo_source" , &multi_usrp::get_tx_lo_source, overload_get_tx_lo_source()) - .def("get_tx_lo_sources" , &multi_usrp::get_tx_lo_sources, overload_get_tx_lo_sources()) - .def("set_tx_lo_export_enabled", &multi_usrp::set_tx_lo_export_enabled, overload_set_tx_lo_export_enabled()) - .def("get_tx_lo_export_enabled", &multi_usrp::get_tx_lo_export_enabled, overload_get_tx_lo_export_enabled()) - .def("set_tx_lo_freq" , &multi_usrp::set_tx_lo_freq, overload_set_tx_lo_freq()) - .def("get_tx_lo_freq" , &multi_usrp::get_tx_lo_freq, overload_get_tx_lo_freq()) - .def("get_tx_lo_freq_range" , &multi_usrp::get_tx_lo_freq_range, overload_get_tx_lo_freq_range()) - .def("set_normalized_tx_gain" , &multi_usrp::set_normalized_tx_gain, overload_set_normalized_tx_gain()) - .def("get_normalized_tx_gain" , &multi_usrp::get_normalized_tx_gain, overload_get_normalized_tx_gain()) - .def("get_tx_gain" , &get_tx_gain_0, overload_get_tx_gain_0()) - .def("get_tx_gain" , &get_tx_gain_1, overload_get_tx_gain_1()) - .def("get_tx_gain_range" , &get_tx_gain_range_0, overload_get_tx_gain_range_0()) - .def("get_tx_gain_range" , &get_tx_gain_range_1, overload_get_tx_gain_range_1()) - .def("get_tx_gain_names" , &multi_usrp::get_tx_gain_names, overload_get_tx_gain_names()) - .def("set_tx_antenna" , &multi_usrp::set_tx_antenna, overload_set_tx_antenna()) - .def("get_tx_antenna" , &multi_usrp::get_tx_antenna, overload_get_tx_antenna()) - .def("get_tx_antennas" , &multi_usrp::get_tx_antennas, overload_get_tx_antennas()) - .def("set_tx_bandwidth" , &multi_usrp::set_tx_bandwidth, overload_set_tx_bandwidth()) - .def("get_tx_bandwidth" , &multi_usrp::get_tx_bandwidth, overload_get_tx_bandwidth()) - .def("get_tx_bandwidth_range" , &multi_usrp::get_tx_bandwidth_range, overload_get_tx_bandwidth_range()) - .def("get_tx_dboard_iface" , &multi_usrp::get_tx_dboard_iface, overload_get_tx_dboard_iface()) - .def("get_tx_sensor" , &multi_usrp::get_tx_sensor, overload_get_tx_sensor()) - .def("get_tx_sensor_names" , &multi_usrp::get_tx_sensor_names, overload_get_tx_sensor_names()) - .def("set_tx_dc_offset" , &set_tx_dc_offset_0, overload_set_tx_dc_offset_0()) - .def("set_tx_dc_offset" , &set_tx_dc_offset_1, overload_set_tx_dc_offset_1()) - .def("set_tx_iq_balance" , &multi_usrp::set_tx_iq_balance, overload_set_tx_iq_balance()) - .def("get_tx_gain_profile" , &multi_usrp::get_tx_gain_profile, overload_get_tx_gain_profile()) - .def("set_tx_gain_profile" , &multi_usrp::set_tx_gain_profile, overload_set_tx_gain_profile()) - .def("get_tx_gain_profile_names", &multi_usrp::get_tx_gain_profile_names, overload_get_tx_gain_profile_names()) + .def("set_tx_subdev_spec" , &multi_usrp::set_tx_subdev_spec, py::arg("spec"), py::arg("mboard") = ALL_MBOARDS) + .def("get_tx_subdev_spec" , &multi_usrp::get_tx_subdev_spec, py::arg("mboard") = 0) + .def("get_tx_subdev_name" , &multi_usrp::get_tx_subdev_name, py::arg("chan") = 0) + .def("get_tx_rates" , &multi_usrp::get_tx_rates, py::arg("chan") = 0) + .def("get_tx_freq_range" , &multi_usrp::get_tx_freq_range, py::arg("chan") = 0) + .def("get_fe_tx_freq_range" , &multi_usrp::get_fe_tx_freq_range, py::arg("chan") = 0) + .def("get_tx_lo_names" , &multi_usrp::get_tx_lo_names, py::arg("chan") = 0) + .def("set_tx_lo_source" , &multi_usrp::set_tx_lo_source, py::arg("src"), py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("get_tx_lo_source" , &multi_usrp::get_tx_lo_source, py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("get_tx_lo_sources" , &multi_usrp::get_tx_lo_sources, py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("set_tx_lo_export_enabled", &multi_usrp::set_tx_lo_export_enabled, py::arg("enb"), py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("get_tx_lo_export_enabled", &multi_usrp::get_tx_lo_export_enabled, py::arg("name") = ALL_LOS, py::arg("chan") = 0) + .def("set_tx_lo_freq" , &multi_usrp::set_tx_lo_freq, py::arg("freq"), py::arg("name"), py::arg("chan") = 0) + .def("get_tx_lo_freq" , &multi_usrp::get_tx_lo_freq, py::arg("name"), py::arg("chan") = 0) + .def("get_tx_lo_freq_range" , &multi_usrp::get_tx_lo_freq_range, py::arg("name"), py::arg("chan") = 0) + .def("set_normalized_tx_gain" , &multi_usrp::set_normalized_tx_gain, py::arg("gain"), py::arg("chan") = 0) + .def("get_normalized_tx_gain" , &multi_usrp::get_normalized_tx_gain, py::arg("chan") = 0) + .def("get_tx_gain" , (double (multi_usrp::*)(const std::string&, size_t)) &multi_usrp::get_tx_gain, py::arg("name"), py::arg("chan") = 0) + .def("get_tx_gain" , (double (multi_usrp::*)(size_t)) &multi_usrp::get_tx_gain, py::arg("chan") = 0) + .def("get_tx_gain_range" , (uhd::gain_range_t (multi_usrp::*)(const std::string&, size_t)) &multi_usrp::get_tx_gain_range, py::arg("name"), py::arg("chan") = 0) + .def("get_tx_gain_range" , (uhd::gain_range_t (multi_usrp::*)(size_t)) &multi_usrp::get_tx_gain_range, py::arg("chan") = 0) + .def("get_tx_gain_names" , &multi_usrp::get_tx_gain_names, py::arg("chan") = 0) + .def("set_tx_antenna" , &multi_usrp::set_tx_antenna, py::arg("ant"), py::arg("chan") = 0) + .def("get_tx_antenna" , &multi_usrp::get_tx_antenna, py::arg("chan") = 0) + .def("get_tx_antennas" , &multi_usrp::get_tx_antennas, py::arg("chan") = 0) + .def("set_tx_bandwidth" , &multi_usrp::set_tx_bandwidth, py::arg("bandwidth"), py::arg("chan") = 0) + .def("get_tx_bandwidth" , &multi_usrp::get_tx_bandwidth, py::arg("chan") = 0) + .def("get_tx_bandwidth_range" , &multi_usrp::get_tx_bandwidth_range, py::arg("chan") = 0) + .def("get_tx_dboard_iface" , &multi_usrp::get_tx_dboard_iface, py::arg("chan") = 0) + .def("get_tx_sensor" , &multi_usrp::get_tx_sensor, py::arg("name"), py::arg("chan") = 0) + .def("get_tx_sensor_names" , &multi_usrp::get_tx_sensor_names, py::arg("chan") = 0) + .def("set_tx_dc_offset" , (void (multi_usrp::*)(const std::complex<double>&, size_t)) &multi_usrp::set_tx_dc_offset, py::arg("offset"), py::arg("chan") = 0) + .def("set_tx_iq_balance" , (void (multi_usrp::*)(const std::complex<double>&, size_t)) &multi_usrp::set_tx_iq_balance, py::arg("correction"), py::arg("chan") = 0) + .def("get_tx_gain_profile" , &multi_usrp::get_tx_gain_profile, py::arg("chan") = 0) + .def("set_tx_gain_profile" , &multi_usrp::set_tx_gain_profile, py::arg("profile"), py::arg("chan") = 0) + .def("get_tx_gain_profile_names", &multi_usrp::get_tx_gain_profile_names, py::arg("chan") = 0) // GPIO methods .def("get_gpio_banks" , &multi_usrp::get_gpio_banks) - .def("set_gpio_attr" , &set_gpio_attr_0, overload_set_gpio_attr_0()) - .def("set_gpio_attr" , &set_gpio_attr_1, overload_set_gpio_attr_1()) - .def("get_gpio_attr" , &multi_usrp::get_gpio_attr, overload_get_gpio_attr()) - .def("enumerate_registers" , &multi_usrp::enumerate_registers, overload_enumerate_registers()) - .def("get_register_info" , &multi_usrp::get_register_info, overload_get_register_info()) - .def("write_register" , &multi_usrp::write_register, overload_write_register()) - .def("read_register" , &multi_usrp::read_register, overload_read_register()) + .def("set_gpio_attr" , (void (multi_usrp::*)(const std::string&, const std::string&, const std::string&, const uint32_t, const size_t)) &multi_usrp::set_gpio_attr, py::arg("bank"), py::arg("attr"), py::arg("value"), py::arg("mask") = 0xffffffff, py::arg("mboard") = 0) + .def("set_gpio_attr" , (void (multi_usrp::*)(const std::string&, const std::string&, const uint32_t, const uint32_t, const size_t)) &multi_usrp::set_gpio_attr, py::arg("bank"), py::arg("attr"), py::arg("value"), py::arg("mask") = 0xffffffff, py::arg("mboard") = 0) + .def("get_gpio_attr" , &multi_usrp::get_gpio_attr, py::arg("bank"), py::arg("attr"), py::arg("mboard") = 0) + .def("enumerate_registers" , &multi_usrp::enumerate_registers, py::arg("mboard") = 0) + .def("get_register_info" , &multi_usrp::get_register_info, py::arg("path"), py::arg("mboard") = 0) + .def("write_register" , &multi_usrp::write_register, py::arg("path"), py::arg("field"), py::arg("value"), py::arg("mboard") = 0) + .def("read_register" , &multi_usrp::read_register, py::arg("path"), py::arg("field"), py::arg("mboard") = 0) // Filter API methods - .def("get_filter_names" , &multi_usrp::get_filter_names, overload_get_filter_names()) + .def("get_filter_names" , &multi_usrp::get_filter_names, py::arg("search_mask") = "") .def("get_filter" , &multi_usrp::get_filter) .def("set_filter" , &multi_usrp::set_filter) ; diff --git a/host/lib/usrp/subdev_spec_python.hpp b/host/lib/usrp/subdev_spec_python.hpp index ed91099f9..61a517a6f 100644 --- a/host/lib/usrp/subdev_spec_python.hpp +++ b/host/lib/usrp/subdev_spec_python.hpp @@ -1,5 +1,6 @@ // // Copyright 2017-2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -9,24 +10,20 @@ #include <uhd/usrp/subdev_spec.hpp> -void export_subdev_spec() +void export_subdev_spec(py::module& m) { using subdev_spec_pair_t = uhd::usrp::subdev_spec_pair_t; using subdev_spec_t = uhd::usrp::subdev_spec_t; - bp::class_<subdev_spec_pair_t> - ("subdev_spec_pair", bp::init<const std::string&, const std::string &>()) - + py::class_<subdev_spec_pair_t> (m, "subdev_spec_pair") + .def(py::init<const std::string&, const std::string &>()) // Properties - .add_property("db_name", &subdev_spec_pair_t::db_name) - .add_property("sd_name", &subdev_spec_pair_t::sd_name) + .def_readwrite("db_name", &subdev_spec_pair_t::db_name) + .def_readwrite("sd_name", &subdev_spec_pair_t::sd_name) ; - bp::class_<std::vector<subdev_spec_pair_t> >("subdev_spec_vector") - .def(bp::vector_indexing_suite<std::vector<subdev_spec_pair_t> >()); - - bp::class_<subdev_spec_t, bp::bases<std::vector<subdev_spec_pair_t> > > - ("subdev_spec", bp::init<const std::string &>()) + py::class_<subdev_spec_t>(m, "subdev_spec") + .def(py::init<const std::string &>()) // Methods .def("__str__", &subdev_spec_t::to_pp_string) |