diff options
Diffstat (limited to 'grc/data/platforms/python')
5 files changed, 29 insertions, 10 deletions
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 c26d96887..5644759cb 100644 --- a/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml +++ b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml @@ -8,7 +8,7 @@ <name>USRP Dual Sink</name> <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) + <make>grc_usrp.dual_sink_$(type.fcn)(which=$which) #if $format.eval self.$(id).set_format(width=$format.width, shift=$format.shift) #end if @@ -76,7 +76,7 @@ self.$(id).set_auto_tr_b($auto_tr_b) </param> <param> <name>Unit Number</name> - <key>number</key> + <key>which</key> <value>0</value> <type>int</type> </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 ff355b510..e6617889c 100644 --- a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml +++ b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml @@ -8,7 +8,7 @@ <name>USRP Dual Source</name> <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') + <make>grc_usrp.dual_source_$(type.fcn)(which=$which, 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 @@ -70,7 +70,7 @@ self.$(id).set_auto_tr_b($auto_tr_b) </param> <param> <name>Unit Number</name> - <key>number</key> + <key>which</key> <value>0</value> <type>int</type> </param> diff --git a/grc/data/platforms/python/blocks/usrp_probe.xml b/grc/data/platforms/python/blocks/usrp_probe.xml index 5fd4e17f4..ee207c28d 100644 --- a/grc/data/platforms/python/blocks/usrp_probe.xml +++ b/grc/data/platforms/python/blocks/usrp_probe.xml @@ -10,8 +10,8 @@ <key>usrp_probe</key> <make></make> <param> - <name>USRP Number</name> - <key>number</key> + <name>Unit Number</name> + <key>which</key> <value>0</value> <type>int</type> </param> 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 dc76199e8..d0a9287b6 100644 --- a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml +++ b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml @@ -8,7 +8,7 @@ <name>USRP Sink</name> <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') + <make>grc_usrp.simple_sink_$(type.fcn)(which=$which, side='$side') #if $format.eval self.$(id).set_format(width=$format.width, shift=$format.shift) #end if @@ -60,7 +60,7 @@ self.$(id).set_auto_tr($auto_tr) </param> <param> <name>Unit Number</name> - <key>number</key> + <key>which</key> <value>0</value> <type>int</type> </param> 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 f7f24898a..cd2bf9d50 100644 --- a/grc/data/platforms/python/blocks/usrp_simple_source_x.xml +++ b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml @@ -8,7 +8,7 @@ <name>USRP Source</name> <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') + <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) #end if @@ -57,7 +57,7 @@ self.$(id).set_auto_tr($auto_tr) </param> <param> <name>Unit Number</name> - <key>number</key> + <key>which</key> <value>0</value> <type>int</type> </param> @@ -135,6 +135,21 @@ self.$(id).set_auto_tr($auto_tr) <key>False</key> </option> </param> + <param> + <name>Halfband Filters</name> + <key>hb_filters</key> + <value></value> + <type>enum</type> + <hide>#if $hb_filters.eval then 'none' else 'part'#</hide> + <option> + <name>Enable</name> + <key></key> + </option> + <option> + <name>Disable</name> + <key>1</key> + </option> + </param> <source> <name>out</name> <type>$type</type> @@ -149,5 +164,9 @@ All other boards use the "RXA" setting. Flex RF boards only: If enabled, "Auto Transmit/Receive Switching" handles the preference for transmit packets vs receive packets. \ By default, "Auto TR" is disabled. + +With the format set to 8 bits and the halfband filters disabled, the USRP can acheive a decimation rate of 4. \ +Disabling the halfband filters requires a special USRP firmware without halfband filters or TX paths. \ +For this reason, the USRP cannot transmit with the halfband filters disabled. </doc> </block> |