From 7d8538ba36c16d4179b965f2f884d15032469f25 Mon Sep 17 00:00:00 2001
From: jblum
Date: Fri, 30 Jan 2009 19:30:03 +0000
Subject: grc usrp supports 8 bits

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10344 221aa14e-8319-0410-a670-987f0aec2ac5
---
 .../platforms/python/blocks/usrp_dual_sink_x.xml   | 24 ++++++++++++++++++++++
 .../platforms/python/blocks/usrp_dual_source_x.xml | 22 ++++++++++++++++++++
 .../platforms/python/blocks/usrp_simple_sink_x.xml | 22 ++++++++++++++++++++
 .../python/blocks/usrp_simple_source_x.xml         | 22 ++++++++++++++++++++
 4 files changed, 90 insertions(+)

(limited to 'grc/data')

diff --git a/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
index 3e665c0f8..91c42adfe 100644
--- a/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
@@ -9,6 +9,9 @@
 	<key>usrp_dual_sink_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.dual_sink_$(type.fcn)(number=$number)
+#if $format.eval
+self.$(id).set_format(width=$format.width, shift=$format.shift)
+#end if
 self.$(id).set_interp_rate($interpolation)
 self.$(id).set_frequency_a($frequency_a, verbose=True)
 self.$(id).set_frequency_b($frequency_b, verbose=True)
@@ -45,11 +48,32 @@ self.$(id).set_auto_tr_b($auto_tr_b)
 			<name>Complex</name>
 			<key>complex</key>
 			<opt>fcn:c</opt>
+			<opt>bits8:</opt>
 		</option>
 		<option>
 			<name>Short</name>
 			<key>short</key>
 			<opt>fcn:s</opt>
+			<opt>bits8:</opt>
+		</option>
+	</param>
+	<param>
+		<name>Format</name>
+		<key>format</key>
+		<value></value>
+		<type>enum</type>
+		<hide>#if $format.eval then '' else 'part'#</hide>
+		<option>
+			<name>16 Bits (Default)</name>
+			<key></key>
+			<opt>width:16</opt>
+			<opt>shift:0</opt>
+		</option>
+		<option>
+			<name>8 Bits, Shift 8</name>
+			<key>w8_s8</key>
+			<opt>width:8</opt>
+			<opt>shift:8</opt>
 		</option>
 	</param>
 	<param>
diff --git a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
index 29ff7c8a0..ff355b510 100644
--- a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
@@ -9,6 +9,9 @@
 	<key>usrp_dual_source_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.dual_source_$(type.fcn)(number=$number, side_a='$rx_ant_a.side', rx_ant_a='$rx_ant_a.rx_ant', side_b='$rx_ant_b.side', rx_ant_b='$rx_ant_b.rx_ant')
+#if $format.eval
+self.$(id).set_format(width=$format.width, shift=$format.shift)
+#end if
 self.$(id).set_decim_rate($decimation)
 self.$(id).set_frequency_a($frequency_a, verbose=True)
 self.$(id).set_frequency_b($frequency_b, verbose=True)
@@ -46,6 +49,25 @@ self.$(id).set_auto_tr_b($auto_tr_b)
 			<opt>fcn:s</opt>
 		</option>
 	</param>
+	<param>
+		<name>Format</name>
+		<key>format</key>
+		<value></value>
+		<type>enum</type>
+		<hide>#if $format.eval then '' else 'part'#</hide>
+		<option>
+			<name>16 Bits (Default)</name>
+			<key></key>
+			<opt>width:16</opt>
+			<opt>shift:0</opt>
+		</option>
+		<option>
+			<name>8 Bits, Shift 8</name>
+			<key>w8_s8</key>
+			<opt>width:8</opt>
+			<opt>shift:8</opt>
+		</option>
+	</param>
 	<param>
 		<name>Unit Number</name>
 		<key>number</key>
diff --git a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
index 885aec852..dc76199e8 100644
--- a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
@@ -9,6 +9,9 @@
 	<key>usrp_simple_sink_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.simple_sink_$(type.fcn)(number=$number, side='$side')
+#if $format.eval
+self.$(id).set_format(width=$format.width, shift=$format.shift)
+#end if
 self.$(id).set_interp_rate($interpolation)
 self.$(id).set_frequency($frequency, verbose=True)
 self.$(id).set_gain($gain)
@@ -36,6 +39,25 @@ self.$(id).set_auto_tr($auto_tr)
 			<opt>fcn:s</opt>
 		</option>
 	</param>
+	<param>
+		<name>Format</name>
+		<key>format</key>
+		<value></value>
+		<type>enum</type>
+		<hide>#if $format.eval then '' else 'part'#</hide>
+		<option>
+			<name>16 Bits (Default)</name>
+			<key></key>
+			<opt>width:16</opt>
+			<opt>shift:0</opt>
+		</option>
+		<option>
+			<name>8 Bits, Shift 8</name>
+			<key>w8_s8</key>
+			<opt>width:8</opt>
+			<opt>shift:8</opt>
+		</option>
+	</param>
 	<param>
 		<name>Unit Number</name>
 		<key>number</key>
diff --git a/grc/data/platforms/python/blocks/usrp_simple_source_x.xml b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
index e1c43238a..f7f24898a 100644
--- a/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
@@ -9,6 +9,9 @@
 	<key>usrp_simple_source_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.simple_source_$(type.fcn)(number=$number, side='$side', rx_ant='$rx_ant')
+#if $format.eval
+self.$(id).set_format(width=$format.width, shift=$format.shift)
+#end if
 self.$(id).set_decim_rate($decimation)
 self.$(id).set_frequency($frequency, verbose=True)
 self.$(id).set_gain($gain)
@@ -33,6 +36,25 @@ self.$(id).set_auto_tr($auto_tr)
 			<opt>fcn:s</opt>
 		</option>
 	</param>
+	<param>
+		<name>Format</name>
+		<key>format</key>
+		<value></value>
+		<type>enum</type>
+		<hide>#if $format.eval then '' else 'part'#</hide>
+		<option>
+			<name>16 Bits (Default)</name>
+			<key></key>
+			<opt>width:16</opt>
+			<opt>shift:0</opt>
+		</option>
+		<option>
+			<name>8 Bits, Shift 8</name>
+			<key>w8_s8</key>
+			<opt>width:8</opt>
+			<opt>shift:8</opt>
+		</option>
+	</param>
 	<param>
 		<name>Unit Number</name>
 		<key>number</key>
-- 
cgit