diff options
| author | Eric Blossom <eb@comsec.com> | 2010-12-06 23:16:25 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-12-06 23:16:25 -0800 |
| commit | 55685f7a8ac97186de05a9e806824fa48e327d47 (patch) | |
| tree | adfb51f196eeff692182ff6e8fad2b2b5ac8713d /gr-uhd/grc | |
| parent | 59a1eeb1b18483ec716afde24df3f0593ed5085c (diff) | |
| parent | e13783aeb84a2c3656c3344a8d52fa2c9ee38a00 (diff) | |
Merge branch 'next' into guile-next
* next: (116 commits)
Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted.
Modifying blsk2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps.
uhd: reverting tag changes on uhd single usrp source, there seems to be issues with the work() logic
uhd: removed default value chan=0 in the cc files
WITH_INCLUDES _must_ be last
uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME
uhd: default channel params to zero for single source and sink blocks
Revert "Removed usrp2-firmware from being automatically built."
Remove generated file from repo
Removed usrp2-firmware from being automatically built.
uhd: added libdir to UHD CFLAGS (shared by lib and swig)
Swapping out preset keys until I work out some of their issues.
Modifying QA tests for the sample tags. By default, it only checks the sizes of the tags since order is not specified or guarenteed.
Block is a gr_block, so this sets its relative rate. Was required for using in the QA of the sample tags code.
Removing global pmt constants. Were causing segfaults during make check. Must fix this later.
Fixing up the UHD sample tag example to take command line options.
Swapping order of testing rrate.
Changing propagation policy enum type name and making a few other minor edits.
Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304.
Adding typedef for uint64_t and int64_t so we can use them through SWIG.
...
Passes make distcheck.
Diffstat (limited to 'gr-uhd/grc')
| -rw-r--r-- | gr-uhd/grc/Makefile.am | 7 | ||||
| -rw-r--r-- | gr-uhd/grc/uhd_block_tree.xml | 7 | ||||
| -rw-r--r-- | gr-uhd/grc/uhd_mimo_sink.xml | 549 | ||||
| -rw-r--r-- | gr-uhd/grc/uhd_mimo_source.xml | 549 | ||||
| -rw-r--r-- | gr-uhd/grc/uhd_simple_sink.xml | 101 | ||||
| -rw-r--r-- | gr-uhd/grc/uhd_simple_source.xml | 101 |
6 files changed, 0 insertions, 1314 deletions
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index 6a336c893b..30061a7ec9 100644 --- a/gr-uhd/grc/Makefile.am +++ b/gr-uhd/grc/Makefile.am @@ -39,13 +39,6 @@ dist_grcblocks_DATA = \ uhd_block_tree.xml \ $(BUILT_SOURCES) -# add the deprecated files -dist_grcblocks_DATA += \ - uhd_mimo_source.xml \ - uhd_mimo_sink.xml \ - uhd_simple_source.xml \ - uhd_simple_sink.xml - ######################################################################## # Rules for generating the source and sink xml wrappers ######################################################################## diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml index e8c4f069d9..f5d42b567d 100644 --- a/gr-uhd/grc/uhd_block_tree.xml +++ b/gr-uhd/grc/uhd_block_tree.xml @@ -13,11 +13,4 @@ <block>uhd_multi_usrp_source</block> <block>uhd_multi_usrp_sink</block> </cat> - <cat> - <name>UHD (DEPRECATED)</name> - <block>uhd_simple_source</block> - <block>uhd_simple_sink</block> - <block>uhd_mimo_source</block> - <block>uhd_mimo_sink</block> - </cat> </cat> diff --git a/gr-uhd/grc/uhd_mimo_sink.xml b/gr-uhd/grc/uhd_mimo_sink.xml deleted file mode 100644 index 13865c913a..0000000000 --- a/gr-uhd/grc/uhd_mimo_sink.xml +++ /dev/null @@ -1,549 +0,0 @@ -<?xml version="1.0"?> -<block> - <name>UHD MIMO Sink (DEPRECATED)</name> - <key>uhd_mimo_sink</key> - <import>from gnuradio import uhd</import> - <make>uhd.mimo_sink($nchan, $args, uhd.io_type_t.$type.type) -self.$(id).set_samp_rate_all($samp_rate) -#if $nchan() > 0 -self.$(id).set_subdev_spec(0, $sd_spec0) -self.$(id).set_center_freq(0, $center_freq0) -self.$(id).set_gain(0, $gain0) - #if $ant0() -self.$(id).set_antenna(0, $ant0) - #end if -#end if -#if $nchan() > 1 -self.$(id).set_subdev_spec(1, $sd_spec1) -self.$(id).set_center_freq(1, $center_freq1) -self.$(id).set_gain(1, $gain1) - #if $ant1() -self.$(id).set_antenna(1, $ant1) - #end if -#end if -#if $nchan() > 2 -self.$(id).set_subdev_spec(2, $sd_spec2) -self.$(id).set_center_freq(2, $center_freq2) -self.$(id).set_gain(2, $gain2) - #if $ant2() -self.$(id).set_antenna(2, $ant2) - #end if -#end if -#if $nchan() > 3 -self.$(id).set_subdev_spec(3, $sd_spec3) -self.$(id).set_center_freq(3, $center_freq3) -self.$(id).set_gain(3, $gain3) - #if $ant3() -self.$(id).set_antenna(3, $ant3) - #end if -#end if -#if $nchan() > 4 -self.$(id).set_subdev_spec(4, $sd_spec4) -self.$(id).set_center_freq(4, $center_freq4) -self.$(id).set_gain(4, $gain4) - #if $ant4() -self.$(id).set_antenna(4, $ant4) - #end if -#end if -#if $nchan() > 5 -self.$(id).set_subdev_spec(5, $sd_spec5) -self.$(id).set_center_freq(5, $center_freq5) -self.$(id).set_gain(5, $gain5) - #if $ant5() -self.$(id).set_antenna(5, $ant5) - #end if -#end if -#if $nchan() > 6 -self.$(id).set_subdev_spec(6, $sd_spec6) -self.$(id).set_center_freq(6, $center_freq6) -self.$(id).set_gain(6, $gain6) - #if $ant6() -self.$(id).set_antenna(6, $ant6) - #end if -#end if -#if $nchan() > 7 -self.$(id).set_subdev_spec(7, $sd_spec7) -self.$(id).set_center_freq(7, $center_freq7) -self.$(id).set_gain(7, $gain7) - #if $ant7() -self.$(id).set_antenna(7, $ant7) - #end if -#end if -</make> - <callback>set_samp_rate($samp_rate)</callback> - <callback>set_center_freq(0, $center_freq0)</callback> - <callback>set_gain(0, $gain0)</callback> - <callback>set_antenna(0, $ant0)</callback> - <callback>set_center_freq(1, $center_freq1)</callback> - <callback>set_gain(1, $gain1)</callback> - <callback>set_antenna(1, $ant1)</callback> - <callback>set_center_freq(2, $center_freq2)</callback> - <callback>set_gain(2, $gain2)</callback> - <callback>set_antenna(2, $ant2)</callback> - <callback>set_center_freq(3, $center_freq3)</callback> - <callback>set_gain(3, $gain3)</callback> - <callback>set_antenna(3, $ant3)</callback> - <callback>set_center_freq(4, $center_freq4)</callback> - <callback>set_gain(4, $gain4)</callback> - <callback>set_antenna(4, $ant4)</callback> - <callback>set_center_freq(5, $center_freq5)</callback> - <callback>set_gain(5, $gain5)</callback> - <callback>set_antenna(5, $ant5)</callback> - <callback>set_center_freq(6, $center_freq6)</callback> - <callback>set_gain(6, $gain6)</callback> - <callback>set_antenna(6, $ant6)</callback> - <callback>set_center_freq(7, $center_freq7)</callback> - <callback>set_gain(7, $gain7)</callback> - <callback>set_antenna(7, $ant7)</callback> - <param> - <name>Input Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>type:COMPLEX_FLOAT32</opt> - <opt>vlen:1</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>type:COMPLEX_INT16</opt> - <opt>vlen:2</opt> - </option> - </param> - <param> - <name>Num Channels</name> - <key>nchan</key> - <value>2</value> - <type>int</type> - <option> - <name>2 Channels</name> - <key>2</key> - </option> - <option> - <name>3 Channels</name> - <key>3</key> - </option> - <option> - <name>4 Channels</name> - <key>4</key> - </option> - <option> - <name>5 Channels</name> - <key>5</key> - </option> - <option> - <name>6 Channels</name> - <key>6</key> - </option> - <option> - <name>7 Channels</name> - <key>7</key> - </option> - <option> - <name>8 Channels</name> - <key>8</key> - </option> - </param> - <param> - <name>Args</name> - <key>args</key> - <value>addr=192.168.10.2 192.168.20.2</value> - <type>string</type> - </param> - <param> - <name>Samp Rate (Sps)</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - - <param> - <name>Ch0: Subdev Spec</name> - <key>sd_spec0</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 0 - all - #elif $sd_spec0() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch0: Center Freq (Hz)</name> - <key>center_freq0</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 0 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch0: Gain (dB)</name> - <key>gain0</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 0 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch0: Antenna</name> - <key>ant0</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 0 - all - #elif $ant0() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch1: Subdev Spec</name> - <key>sd_spec1</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 1 - all - #elif $sd_spec1() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch1: Center Freq (Hz)</name> - <key>center_freq1</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 1 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch1: Gain (dB)</name> - <key>gain1</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 1 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch1: Antenna</name> - <key>ant1</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 1 - all - #elif $ant1() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch2: Subdev Spec</name> - <key>sd_spec2</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 2 - all - #elif $sd_spec2() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch2: Center Freq (Hz)</name> - <key>center_freq2</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 2 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch2: Gain (dB)</name> - <key>gain2</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 2 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch2: Antenna</name> - <key>ant2</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 2 - all - #elif $ant2() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch3: Subdev Spec</name> - <key>sd_spec3</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 3 - all - #elif $sd_spec3() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch3: Center Freq (Hz)</name> - <key>center_freq3</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 3 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch3: Gain (dB)</name> - <key>gain3</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 3 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch3: Antenna</name> - <key>ant3</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 3 - all - #elif $ant3() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch4: Subdev Spec</name> - <key>sd_spec4</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 4 - all - #elif $sd_spec4() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch4: Center Freq (Hz)</name> - <key>center_freq4</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 4 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch4: Gain (dB)</name> - <key>gain4</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 4 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch4: Antenna</name> - <key>ant4</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 4 - all - #elif $ant4() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch5: Subdev Spec</name> - <key>sd_spec5</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 5 - all - #elif $sd_spec5() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch5: Center Freq (Hz)</name> - <key>center_freq5</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 5 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch5: Gain (dB)</name> - <key>gain5</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 5 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch5: Antenna</name> - <key>ant5</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 5 - all - #elif $ant5() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch6: Subdev Spec</name> - <key>sd_spec6</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 6 - all - #elif $sd_spec6() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch6: Center Freq (Hz)</name> - <key>center_freq6</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 6 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch6: Gain (dB)</name> - <key>gain6</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 6 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch6: Antenna</name> - <key>ant6</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 6 - all - #elif $ant6() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch7: Subdev Spec</name> - <key>sd_spec7</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 7 - all - #elif $sd_spec7() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch7: Center Freq (Hz)</name> - <key>center_freq7</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 7 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch7: Gain (dB)</name> - <key>gain7</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 7 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch7: Antenna</name> - <key>ant7</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 7 - all - #elif $ant7() - none - #else - part - #end if - </hide> - </param> - - <check>8 >= $nchan</check> - <check>$nchan >= 0</check> - <sink> - <name>in</name> - <type>$type</type> - <vlen>$type.vlen</vlen> - <nports>$nchan</nports> - </sink> - <doc> -The UHD Sink Block: - -Args: -Args is a delimited string used to locate UHD devices on your system. \ -If left blank, the first UHD device found will be used. \ -Used args to specify a specfic device. \ -USRP2 Example: addr=192.168.10.2 - -Sample rate: -The sample rate is the number of samples per second input by this block. \ -The UHD device driver will try its best to match the requested sample rate. \ -If the requested rate is not possible, the UHD block will print an error at runtime. - -Antenna: -For subdevices/daughterboards with only one antenna, this may be left blank. \ -Otherwise, the user should specify one of the possible antenna choices. \ -See the daughterboard application notes for the possible antenna choices. - </doc> -</block> diff --git a/gr-uhd/grc/uhd_mimo_source.xml b/gr-uhd/grc/uhd_mimo_source.xml deleted file mode 100644 index 6167838b0b..0000000000 --- a/gr-uhd/grc/uhd_mimo_source.xml +++ /dev/null @@ -1,549 +0,0 @@ -<?xml version="1.0"?> -<block> - <name>UHD MIMO Source (DEPRECATED)</name> - <key>uhd_mimo_source</key> - <import>from gnuradio import uhd</import> - <make>uhd.mimo_source($nchan, $args, uhd.io_type_t.$type.type) -self.$(id).set_samp_rate_all($samp_rate) -#if $nchan() > 0 -self.$(id).set_subdev_spec(0, $sd_spec0) -self.$(id).set_center_freq(0, $center_freq0) -self.$(id).set_gain(0, $gain0) - #if $ant0() -self.$(id).set_antenna(0, $ant0) - #end if -#end if -#if $nchan() > 1 -self.$(id).set_subdev_spec(1, $sd_spec1) -self.$(id).set_center_freq(1, $center_freq1) -self.$(id).set_gain(1, $gain1) - #if $ant1() -self.$(id).set_antenna(1, $ant1) - #end if -#end if -#if $nchan() > 2 -self.$(id).set_subdev_spec(2, $sd_spec2) -self.$(id).set_center_freq(2, $center_freq2) -self.$(id).set_gain(2, $gain2) - #if $ant2() -self.$(id).set_antenna(2, $ant2) - #end if -#end if -#if $nchan() > 3 -self.$(id).set_subdev_spec(3, $sd_spec3) -self.$(id).set_center_freq(3, $center_freq3) -self.$(id).set_gain(3, $gain3) - #if $ant3() -self.$(id).set_antenna(3, $ant3) - #end if -#end if -#if $nchan() > 4 -self.$(id).set_subdev_spec(4, $sd_spec4) -self.$(id).set_center_freq(4, $center_freq4) -self.$(id).set_gain(4, $gain4) - #if $ant4() -self.$(id).set_antenna(4, $ant4) - #end if -#end if -#if $nchan() > 5 -self.$(id).set_subdev_spec(5, $sd_spec5) -self.$(id).set_center_freq(5, $center_freq5) -self.$(id).set_gain(5, $gain5) - #if $ant5() -self.$(id).set_antenna(5, $ant5) - #end if -#end if -#if $nchan() > 6 -self.$(id).set_subdev_spec(6, $sd_spec6) -self.$(id).set_center_freq(6, $center_freq6) -self.$(id).set_gain(6, $gain6) - #if $ant6() -self.$(id).set_antenna(6, $ant6) - #end if -#end if -#if $nchan() > 7 -self.$(id).set_subdev_spec(7, $sd_spec7) -self.$(id).set_center_freq(7, $center_freq7) -self.$(id).set_gain(7, $gain7) - #if $ant7() -self.$(id).set_antenna(7, $ant7) - #end if -#end if -</make> - <callback>set_samp_rate($samp_rate)</callback> - <callback>set_center_freq(0, $center_freq0)</callback> - <callback>set_gain(0, $gain0)</callback> - <callback>set_antenna(0, $ant0)</callback> - <callback>set_center_freq(1, $center_freq1)</callback> - <callback>set_gain(1, $gain1)</callback> - <callback>set_antenna(1, $ant1)</callback> - <callback>set_center_freq(2, $center_freq2)</callback> - <callback>set_gain(2, $gain2)</callback> - <callback>set_antenna(2, $ant2)</callback> - <callback>set_center_freq(3, $center_freq3)</callback> - <callback>set_gain(3, $gain3)</callback> - <callback>set_antenna(3, $ant3)</callback> - <callback>set_center_freq(4, $center_freq4)</callback> - <callback>set_gain(4, $gain4)</callback> - <callback>set_antenna(4, $ant4)</callback> - <callback>set_center_freq(5, $center_freq5)</callback> - <callback>set_gain(5, $gain5)</callback> - <callback>set_antenna(5, $ant5)</callback> - <callback>set_center_freq(6, $center_freq6)</callback> - <callback>set_gain(6, $gain6)</callback> - <callback>set_antenna(6, $ant6)</callback> - <callback>set_center_freq(7, $center_freq7)</callback> - <callback>set_gain(7, $gain7)</callback> - <callback>set_antenna(7, $ant7)</callback> - <param> - <name>Input Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>type:COMPLEX_FLOAT32</opt> - <opt>vlen:1</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>type:COMPLEX_INT16</opt> - <opt>vlen:2</opt> - </option> - </param> - <param> - <name>Num Channels</name> - <key>nchan</key> - <value>2</value> - <type>int</type> - <option> - <name>2 Channels</name> - <key>2</key> - </option> - <option> - <name>3 Channels</name> - <key>3</key> - </option> - <option> - <name>4 Channels</name> - <key>4</key> - </option> - <option> - <name>5 Channels</name> - <key>5</key> - </option> - <option> - <name>6 Channels</name> - <key>6</key> - </option> - <option> - <name>7 Channels</name> - <key>7</key> - </option> - <option> - <name>8 Channels</name> - <key>8</key> - </option> - </param> - <param> - <name>Args</name> - <key>args</key> - <value>addr=192.168.10.2 192.168.20.2</value> - <type>string</type> - </param> - <param> - <name>Samp Rate (Sps)</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - - <param> - <name>Ch0: Subdev Spec</name> - <key>sd_spec0</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 0 - all - #elif $sd_spec0() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch0: Center Freq (Hz)</name> - <key>center_freq0</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 0 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch0: Gain (dB)</name> - <key>gain0</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 0 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch0: Antenna</name> - <key>ant0</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 0 - all - #elif $ant0() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch1: Subdev Spec</name> - <key>sd_spec1</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 1 - all - #elif $sd_spec1() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch1: Center Freq (Hz)</name> - <key>center_freq1</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 1 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch1: Gain (dB)</name> - <key>gain1</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 1 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch1: Antenna</name> - <key>ant1</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 1 - all - #elif $ant1() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch2: Subdev Spec</name> - <key>sd_spec2</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 2 - all - #elif $sd_spec2() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch2: Center Freq (Hz)</name> - <key>center_freq2</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 2 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch2: Gain (dB)</name> - <key>gain2</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 2 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch2: Antenna</name> - <key>ant2</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 2 - all - #elif $ant2() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch3: Subdev Spec</name> - <key>sd_spec3</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 3 - all - #elif $sd_spec3() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch3: Center Freq (Hz)</name> - <key>center_freq3</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 3 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch3: Gain (dB)</name> - <key>gain3</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 3 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch3: Antenna</name> - <key>ant3</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 3 - all - #elif $ant3() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch4: Subdev Spec</name> - <key>sd_spec4</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 4 - all - #elif $sd_spec4() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch4: Center Freq (Hz)</name> - <key>center_freq4</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 4 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch4: Gain (dB)</name> - <key>gain4</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 4 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch4: Antenna</name> - <key>ant4</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 4 - all - #elif $ant4() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch5: Subdev Spec</name> - <key>sd_spec5</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 5 - all - #elif $sd_spec5() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch5: Center Freq (Hz)</name> - <key>center_freq5</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 5 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch5: Gain (dB)</name> - <key>gain5</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 5 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch5: Antenna</name> - <key>ant5</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 5 - all - #elif $ant5() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch6: Subdev Spec</name> - <key>sd_spec6</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 6 - all - #elif $sd_spec6() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch6: Center Freq (Hz)</name> - <key>center_freq6</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 6 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch6: Gain (dB)</name> - <key>gain6</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 6 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch6: Antenna</name> - <key>ant6</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 6 - all - #elif $ant6() - none - #else - part - #end if - </hide> - </param> - - <param> - <name>Ch7: Subdev Spec</name> - <key>sd_spec7</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 7 - all - #elif $sd_spec7() - none - #else - part - #end if - </hide> - </param> - <param> - <name>Ch7: Center Freq (Hz)</name> - <key>center_freq7</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 7 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch7: Gain (dB)</name> - <key>gain7</key> - <value>0</value> - <type>real</type> - <hide>#if $nchan() > 7 then 'none' else 'all'#</hide> - </param> - <param> - <name>Ch7: Antenna</name> - <key>ant7</key> - <value></value> - <type>string</type> - <hide> - #if not $nchan() > 7 - all - #elif $ant7() - none - #else - part - #end if - </hide> - </param> - - <check>8 >= $nchan</check> - <check>$nchan >= 0</check> - <source> - <name>out</name> - <type>$type</type> - <vlen>$type.vlen</vlen> - <nports>$nchan</nports> - </source> - <doc> -The UHD Source Block: - -Args: -Args is a delimited string used to locate UHD devices on your system. \ -If left blank, the first UHD device found will be used. \ -Used args to specify a specfic device. \ -USRP2 Example: addr=192.168.10.2 - -Sample rate: -The sample rate is the number of samples per second input by this block. \ -The UHD device driver will try its best to match the requested sample rate. \ -If the requested rate is not possible, the UHD block will print an error at runtime. - -Antenna: -For subdevices/daughterboards with only one antenna, this may be left blank. \ -Otherwise, the user should specify one of the possible antenna choices. \ -See the daughterboard application notes for the possible antenna choices. - </doc> -</block> diff --git a/gr-uhd/grc/uhd_simple_sink.xml b/gr-uhd/grc/uhd_simple_sink.xml deleted file mode 100644 index ee6051432a..0000000000 --- a/gr-uhd/grc/uhd_simple_sink.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -## UHD Simple Sink -################################################### - --> -<block> - <name>UHD Simple Sink (DEPRECATED)</name> - <key>uhd_simple_sink</key> - <import>from gnuradio import uhd</import> - <make>uhd.simple_sink($args, uhd.io_type_t.$type.type) -self.$(id).set_subdev_spec($sd_spec) -self.$(id).set_samp_rate($samp_rate) -self.$(id).set_center_freq($center_freq) -self.$(id).set_gain($gain) -#if $ant() -self.$(id).set_antenna($ant) -#end if</make> - <callback>set_samp_rate($samp_rate)</callback> - <callback>set_center_freq($center_freq)</callback> - <callback>set_gain($gain)</callback> - <callback>set_antenna($ant)</callback> - <param> - <name>Input Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>type:COMPLEX_FLOAT32</opt> - <opt>vlen:1</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>type:COMPLEX_INT16</opt> - <opt>vlen:2</opt> - </option> - </param> - <param> - <name>Args</name> - <key>args</key> - <value></value> - <type>string</type> - </param> - <param> - <name>Subdev Spec</name> - <key>sd_spec</key> - <value></value> - <type>string</type> - <hide>#if $sd_spec() then 'none' else 'part'#</hide> - </param> - <param> - <name>Samp Rate (Sps)</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - <param> - <name>Center Freq (Hz)</name> - <key>center_freq</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Gain (dB)</name> - <key>gain</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Antenna</name> - <key>ant</key> - <type>string</type> - <hide>#if $ant() == '' then 'part' else 'none'#</hide> - </param> - <sink> - <name>in</name> - <type>$type</type> - <vlen>$type.vlen</vlen> - </sink> - <doc> -The UHD Sink Block: - -Args: -Args is a delimited string used to locate UHD devices on your system. \ -If left blank, the first UHD device found will be used. \ -Used args to specify a specfic device. \ -USRP2 Example: addr=192.168.10.2 - -Sample rate: -The sample rate is the number of samples per second input by this block. \ -The UHD device driver will try its best to match the requested sample rate. \ -If the requested rate is not possible, the UHD block will print an error at runtime. - -Antenna: -For subdevices/daughterboards with only one antenna, this may be left blank. \ -Otherwise, the user should specify one of the possible antenna choices. \ -See the daughterboard application notes for the possible antenna choices. - </doc> -</block> diff --git a/gr-uhd/grc/uhd_simple_source.xml b/gr-uhd/grc/uhd_simple_source.xml deleted file mode 100644 index 825981d66f..0000000000 --- a/gr-uhd/grc/uhd_simple_source.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -## UHD Simple Source -################################################### - --> -<block> - <name>UHD Simple Source (DEPRECATED)</name> - <key>uhd_simple_source</key> - <import>from gnuradio import uhd</import> - <make>uhd.simple_source($args, uhd.io_type_t.$type.type) -self.$(id).set_subdev_spec($sd_spec) -self.$(id).set_samp_rate($samp_rate) -self.$(id).set_center_freq($center_freq) -self.$(id).set_gain($gain) -#if $ant() -self.$(id).set_antenna($ant) -#end if</make> - <callback>set_samp_rate($samp_rate)</callback> - <callback>set_center_freq($center_freq)</callback> - <callback>set_gain($gain)</callback> - <callback>set_antenna($ant)</callback> - <param> - <name>Output Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>type:COMPLEX_FLOAT32</opt> - <opt>vlen:1</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>type:COMPLEX_INT16</opt> - <opt>vlen:2</opt> - </option> - </param> - <param> - <name>Args</name> - <key>args</key> - <value></value> - <type>string</type> - </param> - <param> - <name>Subdev Spec</name> - <key>sd_spec</key> - <value></value> - <type>string</type> - <hide>#if $sd_spec() then 'none' else 'part'#</hide> - </param> - <param> - <name>Samp Rate (Sps)</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - <param> - <name>Center Freq (Hz)</name> - <key>center_freq</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Gain (dB)</name> - <key>gain</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Antenna</name> - <key>ant</key> - <type>string</type> - <hide>#if $ant() == '' then 'part' else 'none'#</hide> - </param> - <source> - <name>out</name> - <type>$type</type> - <vlen>$type.vlen</vlen> - </source> - <doc> -The UHD Source Block: - -Args: -Args is a delimited string used to locate UHD devices on your system. \ -If left blank, the first UHD device found will be used. \ -Used args to specify a specfic device. \ -USRP2 Example: addr=192.168.10.2 - -Sample rate: -The sample rate is the number of samples per second output by this block. \ -The UHD device driver will try its best to match the requested sample rate. \ -If the requested rate is not possible, the UHD block will print an error at runtime. - -Antenna: -For subdevices/daughterboards with only one antenna, this may be left blank. \ -Otherwise, the user should specify one of the possible antenna choices. \ -See the daughterboard application notes for the possible antenna choices. - </doc> -</block> |