summaryrefslogtreecommitdiff
path: root/gr-blocks/lib/ctrlport_probe2_c_impl.cc
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-07-16 14:55:28 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-07-16 15:03:10 -0700
commitaf206bb5fc1a255b48dbab344a2bba7581535cb0 (patch)
tree199adbce01307e132d2ab30184404ad2eb118a05 /gr-blocks/lib/ctrlport_probe2_c_impl.cc
parentf0198da0bbf6af214b0d629cb77b8539ac42e02a (diff)
controlport: Added probes for byte, short, and int data types
(ctrlport_probe2_x). Had to add some more plumbing to ControlPort to handle different data types to support the new probes. TODO: in 3.8, we will remove ctrlport_probe_c and make a single GRC file for all data types and remove blocks_ctrlport_probe2_c.xml.
Diffstat (limited to 'gr-blocks/lib/ctrlport_probe2_c_impl.cc')
-rw-r--r--gr-blocks/lib/ctrlport_probe2_c_impl.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
index bc6febdb2d..3e324b0d00 100644
--- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
@@ -32,18 +32,20 @@ namespace gr {
ctrlport_probe2_c::sptr
ctrlport_probe2_c::make(const std::string &id,
- const std::string &desc, int len)
+ const std::string &desc,
+ int len, unsigned int disp_mask)
{
return gnuradio::get_initial_sptr
- (new ctrlport_probe2_c_impl(id, desc, len));
+ (new ctrlport_probe2_c_impl(id, desc, len, disp_mask));
}
ctrlport_probe2_c_impl::ctrlport_probe2_c_impl(const std::string &id,
- const std::string &desc, int len)
+ const std::string &desc,
+ int len, unsigned int disp_mask)
: sync_block("probe2_c",
io_signature::make(1, 1, sizeof(gr_complex)),
io_signature::make(0, 0, 0)),
- d_id(id), d_desc(desc), d_len(len)
+ d_id(id), d_desc(desc), d_len(len), d_disp_mask(disp_mask)
{
set_length(len);
}
@@ -139,11 +141,9 @@ namespace gr {
d_rpc_vars.push_back(
rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_c, std::vector<std::complex<float> > >(
alias(), d_id.c_str(), &ctrlport_probe2_c::get,
- pmt::make_c32vector(0,-2),
- pmt::make_c32vector(0,2),
- pmt::make_c32vector(0,0),
+ pmt::mp(-2), pmt::mp(2), pmt::mp(0),
"volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
- DISPXY | DISPOPTSCATTER)));
+ d_disp_mask | DISPOPTCPLX)));
d_rpc_vars.push_back(
rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_c, int>(