[Commit-gnuradio] r10787 - gnuradio/trunk/grc/data/platforms/python/blocks

[jblum]

Author: jblum
Date: 2009-04-07 13:10:49 -0600 (Tue, 07 Apr 2009)
New Revision: 10787

Modified:
   gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
Log:
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.



Modified: gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml        
2009-04-07 02:19:38 UTC (rev 10786)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml        
2009-04-07 19:10:49 UTC (rev 10787)
@@ -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)
@@ -56,32 +53,6 @@
                </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>
                <value>0</value>

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml      
2009-04-07 02:19:38 UTC (rev 10786)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml      
2009-04-07 19:10:49 UTC (rev 10787)
@@ -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,32 +38,25 @@
                </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>
                <key>which</key>
                <value>0</value>

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml      
2009-04-07 02:19:38 UTC (rev 10786)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml      
2009-04-07 19:10:49 UTC (rev 10787)
@@ -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)
@@ -40,32 +37,6 @@
                </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>
                <value>0</value>

Modified: 
gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_source_x.xml    
2009-04-07 02:19:38 UTC (rev 10786)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_source_x.xml    
2009-04-07 19:10:49 UTC (rev 10787)
@@ -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,32 +34,25 @@
                </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>
                <key>which</key>
                <value>0</value>