~usrp2_base();
std::string mac_addr() const;
- std::string ifc_name() const;
+ std::string interface_name() const;
%rename(_real_fpga_master_clock_freq) fpga_master_clock_freq;
bool fpga_master_clock_freq(long *freq);
bool sync_to_pps();
}
std::string
-usrp2_base::ifc_name() const
+usrp2_base::interface_name() const
{
- return d_u2->ifc_name();
+ return d_u2->interface_name();
}
bool
/*!
* \brief Get interface name used to communicat with USRP2
*/
- std::string ifc_name() const;
+ std::string interface_name() const;
/*!
* \brief Get USRP2 master clock rate
self.set_amplitude(options.amplitude)
self.set_waveform_freq(options.waveform_freq)
- #self.set_waveform2_freq(options.waveform2_freq)
- self._waveform2_freq = options.waveform2_freq
+ self.set_waveform2_freq(options.waveform2_freq)
self.set_waveform(options.type)
def set_usrp2(self, interface, mac_addr):
# Property getters
- #def interface(self):
- # return self._u.ifc_name()
-
def mac_addr(self):
return self._u.mac_addr()
- def ifc_name(self):
- return self._u.ifc_name()
+ def interface_name(self):
+ return self._u.interface_name()
def daughterboard_id(self):
return self._u.daughterboard_id()
return self._freq
def freq_range(self):
- fr = self._u.freq_range()
- if self._u.daughterboard_id() == 0x0000:
- fr = (-50e6, 50e6) # DEBUG
- return fr
+ return self._u.freq_range()
def ddc_freq(self):
return self._ddc_freq
import wx
from gnuradio.wxgui import form, slider, gui
import usrp2_siggen
-import math
+import sys, math
class app_gui(object):
def __init__(self, frame, panel, vbox, top_block, options, args):
self.build_gui()
# TODO: turn these into listeners
- self.myform['ifc'].set_value(self.tb.ifc_name())
+ self.myform['ifc'].set_value(self.tb.interface_name())
self.myform['mac'].set_value(self.tb.mac_addr())
dbid = self.tb.daughterboard_id()
self.myform['dbid'].set_value("%04x" % (dbid,))
/*!
* Returns the GbE interface name associated with this USRP
*/
- std::string ifc_name();
+ std::string interface_name();
/*
* ----------------------------------------------------------------
}
std::string
- usrp2::ifc_name()
+ usrp2::interface_name()
{
- return d_impl->ifc_name();
+ return d_impl->interface_name();
}
// Receive
usrp2::impl::impl(const std::string &ifc, props *p)
- : d_eth_buf(new eth_buffer()), d_ifc_name(ifc), d_pf(0), d_bg_thread(0),
+ : d_eth_buf(new eth_buffer()), d_interface_name(ifc), d_pf(0), d_bg_thread(0),
d_bg_running(false), d_rx_seqno(-1), d_tx_seqno(0), d_next_rid(0),
d_num_rx_frames(0), d_num_rx_missing(0), d_num_rx_overruns(0), d_num_rx_bytes(0),
d_num_enqueued(0), d_enqueued_mutex(), d_bg_pending_cond(&d_enqueued_mutex),
static const size_t NCHANS = 32;
eth_buffer *d_eth_buf;
- std::string d_ifc_name;
+ std::string d_interface_name;
pktfilter *d_pf;
std::string d_addr; // FIXME: use u2_mac_addr_t instead
usrp2_thread *d_bg_thread;
void bg_loop();
std::string mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t
- std::string ifc_name() const { return d_ifc_name; }
+ std::string interface_name() const { return d_interface_name; }
// Rx