summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gnuradio-runtime/lib')
-rw-r--r--gnuradio-runtime/lib/controlport/gnuradio.ice7
-rw-r--r--gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc15
2 files changed, 21 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/controlport/gnuradio.ice b/gnuradio-runtime/lib/controlport/gnuradio.ice
index 29ddc2bfbe..8318875926 100644
--- a/gnuradio-runtime/lib/controlport/gnuradio.ice
+++ b/gnuradio-runtime/lib/controlport/gnuradio.ice
@@ -25,6 +25,12 @@
#define GNURADIO_DEBUG
module GNURadio {
+
+struct complex {
+ float re;
+ float im;
+};
+
class Knob {};
class KnobB extends Knob { bool value; };
class KnobC extends Knob { byte value; };
@@ -33,6 +39,7 @@ class KnobF extends Knob { float value; };
class KnobD extends Knob { double value; };
class KnobL extends Knob { long value; };
class KnobS extends Knob { string value; };
+class KnobZ extends Knob { complex value; };
sequence<bool> VectorB; sequence<byte> VectorC;
sequence<int> VectorI; sequence<float> VectorF;
diff --git a/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc b/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
index 18b73faeba..9a36d6d31a 100644
--- a/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
+++ b/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
@@ -42,7 +42,13 @@ rpcpmtconverter::from_pmt(const pmt::pmt_t& knob, const Ice::Current& c)
}
else if(pmt::is_uint64(knob)) {
return new GNURadio::KnobL(pmt::to_uint64(knob));
- //const std::complex<float> *c32vector_elements(pmt_t v, size_t &len); //< len is in elements
+ }
+ else if(pmt::is_complex(knob)) {
+ std::complex<double> tmp = pmt::to_complex(knob);
+ GNURadio::complex cpx;
+ cpx.re = tmp.real();
+ cpx.im = tmp.imag();
+ return new GNURadio::KnobZ(cpx);
}
else if(pmt::is_c32vector(knob)) { // c32 sent as interleaved floats
size_t size(pmt::length(knob));
@@ -102,6 +108,13 @@ rpcpmtconverter::to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c)
GNURadio::KnobLPtr k(GNURadio::KnobLPtr::dynamicCast(knob));
return pmt::mp((long)k->value);
}
+ else if(id == "KnobZ") {
+ GNURadio::KnobZPtr k(GNURadio::KnobZPtr::dynamicCast(knob));
+ std::complex<double> cpx;
+ cpx.real(k->value.re);
+ cpx.imag(k->value.im);
+ return pmt::from_complex(cpx);
+ }
else if(id == "KnobVecC") {
GNURadio::KnobVecCPtr k(GNURadio::KnobVecCPtr::dynamicCast(knob));
return pmt::init_u8vector(k->value.size(), &k->value[0]);