3 files changed, 40 insertions, 55 deletions
diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index 7938e7684..badc6dc97 100644
--- a/grc/data/platforms/python/blocks/Makefile.am
+++ b/grc/data/platforms/python/blocks/Makefile.am
@@ -192,9 +192,9 @@ dist_ourdata_DATA = \
 	trellis_siso_f.xml \
 	trellis_viterbi_combined_xx.xml \
 	trellis_viterbi_x.xml \
-	usrp_diagnostics.xml \
 	usrp_dual_sink_x.xml \
 	usrp_dual_source_x.xml \
+	usrp_probe.xml \
 	usrp_simple_sink_x.xml \
 	usrp_simple_source_x.xml \
 	usrp2_sink_xxxx.xml \
diff --git a/grc/data/platforms/python/blocks/usrp_diagnostics.xml b/grc/data/platforms/python/blocks/usrp_diagnostics.xml
deleted file mode 100644
index 52dd885a4..000000000
--- a/grc/data/platforms/python/blocks/usrp_diagnostics.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP Diagnostics:
-##	This block should not appear in the tree.
-###################################################
- -->
-<block>
-	<name>USRP Diagnostics</name>
-	<key>usrp_diagnostics</key>
-	<make></make>
-	<param>
-		<name>USRP Number</name>
-		<key>usrp_number</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>USRP Type</name>
-		<key>usrp_type</key>
-		<value>rx</value>
-		<type>enum</type>
-		<option>
-			<name>Receive</name>
-			<key>rx</key>
-		</option>
-		<option>
-			<name>Transmit</name>
-			<key>tx</key>
-		</option>
-	</param>
-	<param>
-		<name>Side:Subdevice</name>
-		<key>side_subdev</key>
-		<value>(0, 0)</value>
-		<type>enum</type>
-		<option>
-			<name>Side A:0</name>
-			<key>(0, 0)</key>
-		</option>
-		<option>
-			<name>Side B:0</name>
-			<key>(1, 0)</key>
-		</option>
-		<option>
-			<name>Side A:1</name>
-			<key>(0, 1)</key>
-		</option>
-		<option>
-			<name>Side B:0</name>
-			<key>(1, 1)</key>
-		</option>
-	</param>
-</block>
diff --git a/grc/data/platforms/python/blocks/usrp_probe.xml b/grc/data/platforms/python/blocks/usrp_probe.xml
new file mode 100644
index 000000000..11a83584c
--- /dev/null
+++ b/grc/data/platforms/python/blocks/usrp_probe.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##USRP Probe:
+##	This block should not appear in the tree.
+###################################################
+ -->
+<block>
+	<name>USRP Probe</name>
+	<key>usrp_probe</key>
+	<make></make>
+	<param>
+		<name>USRP Number</name>
+		<key>number</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Daughter Board</name>
+		<key>dboard</key>
+		<type>enum</type>
+		<option>
+			<name>RX A</name>
+			<key>rx_a</key>
+		</option>
+		<option>
+			<name>RX B</name>
+			<key>rx_b</key>
+		</option>
+		<option>
+			<name>TX A</name>
+			<key>tx_a</key>
+		</option>
+		<option>
+			<name>TX B</name>
+			<key>tx_b</key>
+		</option>
+	</param>
+</block>