From 7070c10d7ac59adcd597c18ec2c83b1b59ed87e9 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 6 Mar 2011 11:18:27 -0800
Subject: grc: rework the probe blocks and how they fit into grc

Removed the source on all probe blocks.
Advertise the probe-able function in the docs.
Added missing signal probe block.
Removed probe function and variable sink blocks.
Removed all supporting grc_gnuradio python files.

Added variable_function_probe block that can probe arbitrary functions on a block.
All the code needed by the function probe is available is the make tag.

To display the value of a probe block, use the variable probe block, and a gui widget.
To disply the value of a stream, do the same but use the signal probe block.
Simple see :-)

If more types other than floats need to be read from the stream,
the signal probe should be extended.
---
 grc/blocks/gr_probe_avg_mag_sqrd_x.xml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'grc/blocks/gr_probe_avg_mag_sqrd_x.xml')

diff --git a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml
index eb855956a..ac409ad67 100644
--- a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml
+++ b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml
@@ -7,15 +7,10 @@
 <block>
 	<name>Probe Avg Mag^2</name>
 	<key>gr_probe_avg_mag_sqrd_x</key>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.probe_avg_mag_sqrd_$(type)(
-	threshold=$threshold,
-	alpha=$alpha,
-	probe_rate=$probe_rate,
-)</make>
+	<import>from gnuradio import gr</import>
+	<make>gr.probe_avg_mag_sqrd_$(type)($threshold, $alpha)</make>
 	<callback>set_alpha($alpha)</callback>
 	<callback>set_threshold($threshold)</callback>
-	<callback>set_probe_rate($probe_rate)</callback>
 	<param>
 		<name>Type</name>
 		<key>type</key>
@@ -43,18 +38,11 @@
 		<value>1</value>
 		<type>real</type>
 	</param>
-	<param>
-		<name>Probe Rate</name>
-		<key>probe_rate</key>
-		<value>10</value>
-		<type>real</type>
-	</param>
 	<sink>
 		<name>in</name>
 		<type>$type.input</type>
 	</sink>
-	<source>
-		<name>out</name>
-		<type>float</type>
-	</source>
+	<doc>
+Available functions to probe: level
+	</doc>
 </block>
-- 
cgit