Removed format from usrp dual/simple sink. USRP sink does not have a

format option. Gave usrp dual/simple source a unified format option with
the only 2 choices possible:  (16, 0) and (8, 8). When and if future
options are available, these blocks will be modified as such. Until
then, these blocks reflect the capabilities in the current trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10787 221aa14e-8319-0410-a670-987f0aec2ac5

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 b76a561b7dfb21b498dbb1cd3a2dde726d60a064..d87d147038b86503a0fe4b21ae945296a28a5b5e 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
@@ -9,9 +9,6 @@
        <key>usrp_dual_sink_x</key>
        <import>from grc_gnuradio import usrp as grc_usrp</import>
        <make>grc_usrp.dual_sink_$(type.fcn)(which=$which)
-#if $width.eval
-self.$(id).set_format(width=$width, shift=$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)
@@ -55,32 +52,6 @@ self.$(id).set_auto_tr_b(True)
                        <opt>fcn:s</opt>
                </option>
        </param>
-       <param>
-               <name>Width</name>
-               <key>width</key>
-               <value></value>
-               <type>enum</type>
-               <hide>#if $width.eval then 'none' else 'part'#</hide>
-               <option>
-                       <name>Default</name>
-                       <key></key>
-               </option>
-               <option>
-                       <name>16 Bits</name>
-                       <key>16</key>
-               </option>
-               <option>
-                       <name>8 Bits</name>
-                       <key>8</key>
-               </option>
-       </param>
-       <param>
-               <name>Shift</name>
-               <key>shift</key>
-               <value>8</value>
-               <type>int</type>
-               <hide>#if $width.eval then 'none' else 'all'#</hide>
-       </param>
        <param>
                <name>Unit Number</name>
                <key>which</key>

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 980d1aa8ec16fc42667e95b324c5125ff3038fdc..823850b52c3a02b1569461b89a8f37199599738c 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
@@ -9,8 +9,8 @@
        <key>usrp_dual_source_x</key>
        <import>from grc_gnuradio import usrp as grc_usrp</import>
        <make>grc_usrp.dual_source_$(type.fcn)(which=$which, rx_ant_a='$rx_ant_a', rx_ant_b='$rx_ant_b')
-#if $width.eval
-self.$(id).set_format(width=$width, shift=$shift)
+#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)
@@ -38,30 +38,23 @@ self.$(id).set_gain_b($gain_b)</make>
                </option>
        </param>
        <param>
-               <name>Width</name>
-               <key>width</key>
+               <name>Format</name>
+               <key>format</key>
                <value></value>
                <type>enum</type>
-               <hide>#if $width.eval then 'none' else 'part'#</hide>
+               <hide>#if $format.eval then '' else 'part'#</hide>
                <option>
-                       <name>Default</name>
+                       <name>16 Bits (Default)</name>
                        <key></key>
+                       <opt>width:16</opt>
+                       <opt>shift:0</opt>
                </option>
                <option>
-                       <name>16 Bits</name>
-                       <key>16</key>
+                       <name>8 Bits, Shift 8</name>
+                       <key>w8_s8</key>
+                       <opt>width:8</opt>
+                       <opt>shift:8</opt>
                </option>
-               <option>
-                       <name>8 Bits</name>
-                       <key>8</key>
-               </option>
-       </param>
-       <param>
-               <name>Shift</name>
-               <key>shift</key>
-               <value>8</value>
-               <type>int</type>
-               <hide>#if $width.eval then 'none' else 'all'#</hide>
        </param>
        <param>
                <name>Unit Number</name>

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 c183ddb9f748f552ab8ce5297a95facfc3e935ce..ca887997a16ba9f98f9ecd9a5febdca1f33cbb80 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
@@ -9,9 +9,6 @@
        <key>usrp_simple_sink_x</key>
        <import>from grc_gnuradio import usrp as grc_usrp</import>
        <make>grc_usrp.simple_sink_$(type.fcn)(which=$which, side='$side')
-#if $width.eval
-self.$(id).set_format(width=$width, shift=$shift)
-#end if
 self.$(id).set_interp_rate($interpolation)
 self.$(id).set_frequency($frequency, verbose=True)
 self.$(id).set_gain($gain)
@@ -39,32 +36,6 @@ self.$(id).set_auto_tr(True)
                        <opt>fcn:s</opt>
                </option>
        </param>
-       <param>
-               <name>Width</name>
-               <key>width</key>
-               <value></value>
-               <type>enum</type>
-               <hide>#if $width.eval then 'none' else 'part'#</hide>
-               <option>
-                       <name>Default</name>
-                       <key></key>
-               </option>
-               <option>
-                       <name>16 Bits</name>
-                       <key>16</key>
-               </option>
-               <option>
-                       <name>8 Bits</name>
-                       <key>8</key>
-               </option>
-       </param>
-       <param>
-               <name>Shift</name>
-               <key>shift</key>
-               <value>8</value>
-               <type>int</type>
-               <hide>#if $width.eval then 'none' else 'all'#</hide>
-       </param>
        <param>
                <name>Unit Number</name>
                <key>which</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 521ba91d33c476c4a0ae7c43b34e17112c39ad6a..d7f5475a6921ca7e6340e3e17dd4062350886a66 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
@@ -9,8 +9,8 @@
        <key>usrp_simple_source_x</key>
        <import>from grc_gnuradio import usrp as grc_usrp</import>
        <make>grc_usrp.simple_source_$(type.fcn)(which=$which, side='$side', rx_ant='$rx_ant'#if $hb_filters.eval then ', no_hb=True' else ''#)
-#if $width.eval
-self.$(id).set_format(width=$width, shift=$shift)
+#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)
@@ -34,30 +34,23 @@ self.$(id).set_gain($gain)</make>
                </option>
        </param>
        <param>
-               <name>Width</name>
-               <key>width</key>
+               <name>Format</name>
+               <key>format</key>
                <value></value>
                <type>enum</type>
-               <hide>#if $width.eval then 'none' else 'part'#</hide>
+               <hide>#if $format.eval then '' else 'part'#</hide>
                <option>
-                       <name>Default</name>
+                       <name>16 Bits (Default)</name>
                        <key></key>
+                       <opt>width:16</opt>
+                       <opt>shift:0</opt>
                </option>
                <option>
-                       <name>16 Bits</name>
-                       <key>16</key>
+                       <name>8 Bits, Shift 8</name>
+                       <key>w8_s8</key>
+                       <opt>width:8</opt>
+                       <opt>shift:8</opt>
                </option>
-               <option>
-                       <name>8 Bits</name>
-                       <key>8</key>
-               </option>
-       </param>
-       <param>
-               <name>Shift</name>
-               <key>shift</key>
-               <value>8</value>
-               <type>int</type>
-               <hide>#if $width.eval then 'none' else 'all'#</hide>
        </param>
        <param>
                <name>Unit Number</name>