[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10778 - gnuradio/trunk/grc/data/platforms/python/bloc
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r10778 - gnuradio/trunk/grc/data/platforms/python/blocks |
|
Date: |
Sun, 5 Apr 2009 18:39:01 -0600 (MDT) |
Author: jblum
Date: 2009-04-05 18:39:01 -0600 (Sun, 05 Apr 2009)
New Revision: 10778
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:
Format param replaced with width and shift in usrp blocks.
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-05 20:29:40 UTC (rev 10777)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
2009-04-06 00:39:01 UTC (rev 10778)
@@ -9,8 +9,8 @@
<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 $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#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)
@@ -56,25 +56,32 @@
</option>
</param>
<param>
- <name>Format</name>
- <key>format</key>
+ <name>Width</name>
+ <key>width</key>
<value></value>
<type>enum</type>
- <hide>#if $format.eval then '' else 'part'#</hide>
+ <hide>#if $width.eval then 'none' else 'part'#</hide>
<option>
- <name>16 Bits (Default)</name>
+ <name>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>
+ <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-05 20:29:40 UTC (rev 10777)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
2009-04-06 00:39:01 UTC (rev 10778)
@@ -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 $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#if $width.eval
+self.$(id).set_format(width=$width, shift=$shift)
#end if
self.$(id).set_decim_rate($decimation)
self.$(id).set_frequency_a($frequency_a, verbose=True)
@@ -38,25 +38,32 @@
</option>
</param>
<param>
- <name>Format</name>
- <key>format</key>
+ <name>Width</name>
+ <key>width</key>
<value></value>
<type>enum</type>
- <hide>#if $format.eval then '' else 'part'#</hide>
+ <hide>#if $width.eval then 'none' else 'part'#</hide>
<option>
- <name>16 Bits (Default)</name>
+ <name>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>
+ <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_sink_x.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
2009-04-05 20:29:40 UTC (rev 10777)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
2009-04-06 00:39:01 UTC (rev 10778)
@@ -9,8 +9,8 @@
<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 $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#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)
@@ -40,25 +40,32 @@
</option>
</param>
<param>
- <name>Format</name>
- <key>format</key>
+ <name>Width</name>
+ <key>width</key>
<value></value>
<type>enum</type>
- <hide>#if $format.eval then '' else 'part'#</hide>
+ <hide>#if $width.eval then 'none' else 'part'#</hide>
<option>
- <name>16 Bits (Default)</name>
+ <name>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>
+ <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-05 20:29:40 UTC (rev 10777)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
2009-04-06 00:39:01 UTC (rev 10778)
@@ -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 $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#if $width.eval
+self.$(id).set_format(width=$width, shift=$shift)
#end if
self.$(id).set_decim_rate($decimation)
self.$(id).set_frequency($frequency, verbose=True)
@@ -34,25 +34,32 @@
</option>
</param>
<param>
- <name>Format</name>
- <key>format</key>
+ <name>Width</name>
+ <key>width</key>
<value></value>
<type>enum</type>
- <hide>#if $format.eval then '' else 'part'#</hide>
+ <hide>#if $width.eval then 'none' else 'part'#</hide>
<option>
- <name>16 Bits (Default)</name>
+ <name>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>
+ <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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10778 - gnuradio/trunk/grc/data/platforms/python/blocks,
jblum <=