diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-07-16 14:55:28 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-16 15:03:10 -0700 |
| commit | af206bb5fc1a255b48dbab344a2bba7581535cb0 (patch) | |
| tree | 199adbce01307e132d2ab30184404ad2eb118a05 /gnuradio-runtime/lib/controlport/gnuradio.ice | |
| parent | f0198da0bbf6af214b0d629cb77b8539ac42e02a (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 'gnuradio-runtime/lib/controlport/gnuradio.ice')
| -rw-r--r-- | gnuradio-runtime/lib/controlport/gnuradio.ice | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/controlport/gnuradio.ice b/gnuradio-runtime/lib/controlport/gnuradio.ice index 8318875926..3d6101087a 100644 --- a/gnuradio-runtime/lib/controlport/gnuradio.ice +++ b/gnuradio-runtime/lib/controlport/gnuradio.ice @@ -35,6 +35,7 @@ class Knob {}; class KnobB extends Knob { bool value; }; class KnobC extends Knob { byte value; }; class KnobI extends Knob { int value; }; +class KnobT extends Knob { short value; }; class KnobF extends Knob { float value; }; class KnobD extends Knob { double value; }; class KnobL extends Knob { long value; }; @@ -44,11 +45,12 @@ class KnobZ extends Knob { complex value; }; sequence<bool> VectorB; sequence<byte> VectorC; sequence<int> VectorI; sequence<float> VectorF; sequence<double> VectorD; sequence<string> VectorS; -sequence<long> VectorL; +sequence<long> VectorL; sequence<short> VectorT; class KnobVecB extends Knob { VectorB value; }; class KnobVecC extends Knob { VectorC value; }; class KnobVecI extends Knob { VectorI value; }; +class KnobVecT extends Knob { VectorT value; }; class KnobVecF extends Knob { VectorF value; }; class KnobVecD extends Knob { VectorD value; }; class KnobVecL extends Knob { VectorL value; }; @@ -57,7 +59,7 @@ class KnobVecS extends Knob { VectorS value; }; enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT, KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL, KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE, - KNOBVECSTRING, KNOBVECLONG }; + KNOBVECSTRING, KNOBVECLONG, KNOBSHORT}; const int DISPNULL = 0x0000; const int DISPTIME = 0x0001; |