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.
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 /gr-blocks/grc
parent: f0198da0bbf6af214b0d629cb77b8539ac42e02a (diff)
3 files changed, 158 insertions, 7 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index 150b3f1c93..4ba15e7dbc 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -53,6 +53,7 @@
                 <name>Control Port</name>
                 <block>blocks_ctrlport_monitor</block>
                 <block>blocks_ctrlport_monitor_performance</block>
+                <block>blocks_ctrlport_probe2_x</block>
                 <block>blocks_ctrlport_probe2_c</block>
                 <block>blocks_ctrlport_probe_c</block>
 	</cat>
diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml
index 3add69aa7b..b5f0b089a7 100644
--- a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml
+++ b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2012 Free Software Foundation, Inc.
+ Copyright 2012-2013 Free Software Foundation, Inc.
  
  This file is part of GNU Radio
  
@@ -22,23 +22,23 @@
 -->
 
 <block>
-  <name>Ctrlport Complex Probe (fixed len)</name>
+  <name>Ctrlport Probe</name>
   <key>blocks_ctrlport_probe2_c</key>
   <import>from gnuradio import blocks</import>
-  <make>blocks.ctrlport_probe2_c($name, $desc, $len)</make>
+  <make>blocks.ctrlport_probe2_c($name, $desc, $len, $disp_mask)</make>
   <callback>set_length($len)</callback>
 
   <param>
     <name>Name</name>
     <key>name</key>
-    <value>constellation</value>
+    <value>samples</value>
     <type>string</type>
   </param>
 
   <param>
     <name>Description</name>
     <key>desc</key>
-    <value>Constellation Points</value>
+    <value>Sample Points</value>
     <type>string</type>
   </param>
   
@@ -49,6 +49,32 @@
     <type>int</type>
   </param>
 
+  <param>
+    <name>Display Mask</name>
+    <key>disp_mask</key>
+    <value>gr.DISPTIME</value>
+    <type>int</type>
+    <option>
+      <name>Constellation</name>
+      <key>gr.DISPXY | gr.DISPOPTSCATTER</key>
+    </option>
+    <option>
+      <name>Time</name>
+      <key>gr.DISPTIME</key>
+    </option>
+    <option>
+      <name>PSD</name>
+      <key>gr.DISPPSD</key>
+    </option>
+    <option>
+      <name>Spectrogram</name>
+      <key>gr.DISPSPEC</key>
+    </option>
+    <option>
+      <name>Raster</name>
+      <key>gr.DISPRAST</key>
+    </option>
+  </param>
 
   <sink>
     <name>in</name>
@@ -56,9 +82,10 @@
   </sink>
 
   <doc>
-    Place this in a graph to export complex values to a GRCP port probe.
+    Place this in a graph to export vectors of samples to a GRCP port probe.
 
-    * Version 2 allows you to specify a length in samples that you wish to get every probe
+    * Specify the number of samples to transmit at once and the type
+    of default display to use.
   </doc>
 
 </block>
diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_x.xml b/gr-blocks/grc/blocks_ctrlport_probe2_x.xml
new file mode 100644
index 0000000000..b9b1660bc9
--- /dev/null
+++ b/gr-blocks/grc/blocks_ctrlport_probe2_x.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2013 Free Software Foundation, Inc.
+ 
+ This file is part of GNU Radio
+ 
+ GNU Radio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ 
+ GNU Radio is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with GNU Radio; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street,
+ Boston, MA 02110-1301, USA.
+-->
+
+<block>
+  <name>Ctrlport Probe</name>
+  <key>blocks_ctrlport_probe2_x</key>
+  <import>from gnuradio import blocks</import>
+  <make>blocks.ctrlport_probe2_$(type.fcn)($name, $desc, $len, $disp_mask)</make>
+  <callback>set_length($len)</callback>
+
+  <param>
+    <name>Input Type</name>
+    <key>type</key>
+    <type>enum</type>
+    <option>
+      <name>Complex</name>
+      <key>complex</key>
+      <opt>fcn:c</opt>
+    </option>
+    <option>
+      <name>Float</name>
+      <key>float</key>
+      <opt>fcn:f</opt>
+    </option>
+    <option>
+      <name>Int</name>
+      <key>int</key>
+      <opt>fcn:i</opt>
+    </option>
+    <option>
+      <name>Short</name>
+      <key>short</key>
+      <opt>fcn:s</opt>
+    </option>
+    <option>
+      <name>Byte</name>
+      <key>byte</key>
+      <opt>fcn:b</opt>
+    </option>
+  </param>
+
+  <param>
+    <name>Name</name>
+    <key>name</key>
+    <value>samples</value>
+    <type>string</type>
+  </param>
+
+  <param>
+    <name>Description</name>
+    <key>desc</key>
+    <value>Sample Points</value>
+    <type>string</type>
+  </param>
+  
+  <param>
+    <name>Length</name>
+    <key>len</key>
+    <value>1024</value>
+    <type>int</type>
+  </param>
+
+  <param>
+    <name>Display Mask</name>
+    <key>disp_mask</key>
+    <value>gr.DISPTIME</value>
+    <type>int</type>
+    <option>
+      <name>Constellation</name>
+      <key>gr.DISPXY | gr.DISPOPTSCATTER</key>
+    </option>
+    <option>
+      <name>Time</name>
+      <key>gr.DISPTIME</key>
+    </option>
+    <option>
+      <name>PSD</name>
+      <key>gr.DISPPSD</key>
+    </option>
+    <option>
+      <name>Spectrogram</name>
+      <key>gr.DISPSPEC</key>
+    </option>
+    <option>
+      <name>Raster</name>
+      <key>gr.DISPRAST</key>
+    </option>
+  </param>
+
+  <sink>
+    <name>in</name>
+    <type>$type</type>
+  </sink>
+
+  <doc>
+    Place this in a graph to export vectors of samples to a GRCP port probe.
+
+    * Specify the number of samples to transmit at once and the type
+    of default display to use.
+  </doc>
+
+</block>
+
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 /gr-blocks/grc
parent	f0198da0bbf6af214b0d629cb77b8539ac42e02a (diff)