diff options
Diffstat (limited to 'gr-uhd')
| -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 | ||||
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 15 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_mimo_sink.cc | 161 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_mimo_sink.h | 145 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_mimo_source.cc | 166 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_mimo_source.h | 145 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_simple_sink.cc | 152 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_simple_sink.h | 147 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_simple_source.cc | 183 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_simple_source.h | 147 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 17 |
16 files changed, 0 insertions, 2592 deletions
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index d424ca709..1106bdd23 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 e8c4f069d..f5d42b567 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 13865c913..000000000 --- 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 6167838b0..000000000 --- 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 ee6051432..000000000 --- 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 825981d66..000000000 --- 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> diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index eb2ba4a17..099d0edbc 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -34,13 +34,6 @@ libgnuradio_uhd_la_SOURCES = \ uhd_single_usrp_source.cc \ uhd_single_usrp_sink.cc -# add the deprecated sources -libgnuradio_uhd_la_SOURCES += \ - uhd_mimo_source.cc \ - uhd_mimo_sink.cc \ - uhd_simple_source.cc \ - uhd_simple_sink.cc - libgnuradio_uhd_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(UHD_LIBS) @@ -53,12 +46,4 @@ grinclude_HEADERS = \ uhd_single_usrp_source.h \ uhd_single_usrp_sink.h -# add the deprecated headers -grinclude_HEADERS += \ - uhd_mimo_source.h \ - uhd_mimo_sink.h \ - uhd_simple_source.h \ - uhd_simple_sink.h - - noinst_HEADERS = diff --git a/gr-uhd/lib/uhd_mimo_sink.cc b/gr-uhd/lib/uhd_mimo_sink.cc deleted file mode 100644 index 03d310b1e..000000000 --- a/gr-uhd/lib/uhd_mimo_sink.cc +++ /dev/null @@ -1,161 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include <uhd_mimo_sink.h> -#include <gr_io_signature.h> -#include <stdexcept> -//#include "utils.h" - -/*********************************************************************** - * UHD Sink - **********************************************************************/ -uhd_mimo_sink::uhd_mimo_sink(gr_io_signature_sptr sig) -:gr_sync_block("uhd mimo sink", sig, gr_make_io_signature(0, 0, 0)){ - /* NOP */ -} - -/*********************************************************************** - * UHD Sink Impl - **********************************************************************/ -class uhd_mimo_sink_impl : public uhd_mimo_sink{ -public: - uhd_mimo_sink_impl( - size_t num_channels, - const std::string &args, - const uhd::io_type_t &type - ) : uhd_mimo_sink(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type) - { - _first_run = false; - _dev = uhd::usrp::mimo_usrp::make(args); - _dev->set_time_unknown_pps(uhd::time_spec_t()); //TODO may want option to disable this - } - - ~uhd_mimo_sink_impl(void){ - //NOP - } - - void set_subdev_spec(size_t chan, const std::string &spec){ - return _dev->set_tx_subdev_spec(chan, spec); - } - - void set_samp_rate_all(double rate){ - _dev->set_tx_rate_all(rate); - //do_samp_rate_error_message(rate, get_samp_rate_all(), "TX"); - } - - double get_samp_rate_all(void){ - return _dev->get_tx_rate_all(); - } - - uhd::tune_result_t set_center_freq(size_t chan, double freq){ - uhd::tune_result_t tr = _dev->set_tx_freq(chan, freq); - //do_tune_freq_error_message(freq, _dev->get_tx_freq(chan), "TX"); - return tr; - } - - uhd::freq_range_t get_freq_range(size_t chan){ - return _dev->get_tx_freq_range(chan); - } - - void set_gain(size_t chan, float gain){ - return _dev->set_tx_gain(chan, gain); - } - - float get_gain(size_t chan){ - return _dev->get_tx_gain(chan); - } - - uhd::gain_range_t get_gain_range(size_t chan){ - return _dev->get_tx_gain_range(chan); - } - - void set_antenna(size_t chan, const std::string &ant){ - return _dev->set_tx_antenna(chan, ant); - } - - std::string get_antenna(size_t chan){ - return _dev->get_tx_antenna(chan); - } - - std::vector<std::string> get_antennas(size_t chan){ - return _dev->get_tx_antennas(chan); - } - - uhd::time_spec_t get_time_now(void){ - return _dev->get_time_now(); - } - - void set_time_next_pps(const uhd::time_spec_t &time_spec){ - return _dev->set_time_next_pps(time_spec); - } - - uhd::usrp::mimo_usrp::sptr get_device(void){ - return _dev; - } - -/*********************************************************************** - * Work - **********************************************************************/ - int work( - int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items - ){ - //init the metadata on the first call to work - //and set the timespec with the current time + some offset - if (not _first_run){ - _first_run = true; - _metadata.start_of_burst = true; - _metadata.has_time_spec = true; - _metadata.time_spec = get_time_now() + uhd::time_spec_t(0, 0.01); //10ms offset in future - } - - //call to send with metadata slightly in the future (send-at) - size_t num_sent = _dev->get_device()->send( - input_items, noutput_items, _metadata, - _type, uhd::device::SEND_MODE_FULL_BUFF - ); - - //increment the send-at time by the number of samples sent - _metadata.time_spec += uhd::time_spec_t(0, num_sent, get_samp_rate_all()); - return num_sent; - } - -protected: - uhd::usrp::mimo_usrp::sptr _dev; - const uhd::io_type_t _type; - uhd::tx_metadata_t _metadata; - bool _first_run; -}; - -/*********************************************************************** - * Make UHD Sink - **********************************************************************/ -boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink( - size_t num_channels, - const std::string &args, - const uhd::io_type_t::tid_t &type -){ - return boost::shared_ptr<uhd_mimo_sink>( - new uhd_mimo_sink_impl(num_channels, args, type) - ); -} diff --git a/gr-uhd/lib/uhd_mimo_sink.h b/gr-uhd/lib/uhd_mimo_sink.h deleted file mode 100644 index 29e9298a9..000000000 --- a/gr-uhd/lib/uhd_mimo_sink.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_UHD_MIMO_SINK_H -#define INCLUDED_UHD_MIMO_SINK_H - -#include <gr_sync_block.h> -#include <uhd/usrp/mimo_usrp.hpp> - -class uhd_mimo_sink; - -boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink( - size_t num_channels, - const std::string &args, - const uhd::io_type_t::tid_t &type -); - -/*********************************************************************** - * DEPRECATED - **********************************************************************/ -class /*UHD_DEPRECATED*/ uhd_mimo_sink : public gr_sync_block{ -public: - - /*! - * Set the IO signature for this block. - * \param sig the input signature - */ - uhd_mimo_sink(gr_io_signature_sptr sig); - - /*! - * Set the subdevice specification. - * \param chan the channel number from 0 to N-1 - * \param spec the subdev spec markup string - */ - virtual void set_subdev_spec(size_t chan, const std::string &spec) = 0; - - /*! - * Set the sample rate for the usrp device (across all mboards). - * \param rate a new rate in Sps - */ - virtual void set_samp_rate_all(double rate) = 0; - - /*! - * Get the sample rate for the usrp device (across all mboards). - * This is the actual sample rate and may differ from the rate set. - * \return the actual rate in Sps - */ - virtual double get_samp_rate_all(void) = 0; - - /*! - * Tune the usrp device to the desired center frequency. - * \param chan the channel number from 0 to N-1 - * \param freq the desired frequency in Hz - * \return a tune result with the actual frequencies - */ - virtual uhd::tune_result_t set_center_freq(size_t chan, double freq) = 0; - - /*! - * Get the tunable frequency range. - * \param chan the channel number from 0 to N-1 - * \return the frequency range in Hz - */ - virtual uhd::freq_range_t get_freq_range(size_t chan) = 0; - - /*! - * Set the gain for the dboard. - * \param chan the channel number from 0 to N-1 - * \param gain the gain in dB - */ - virtual void set_gain(size_t chan, float gain) = 0; - - /*! - * Get the actual dboard gain setting. - * \param chan the channel number from 0 to N-1 - * \return the actual gain in dB - */ - virtual float get_gain(size_t chan) = 0; - - /*! - * Get the settable gain range. - * \param chan the channel number from 0 to N-1 - * \return the gain range in dB - */ - virtual uhd::gain_range_t get_gain_range(size_t chan) = 0; - - /*! - * Set the antenna to use. - * \param chan the channel number from 0 to N-1 - * \param ant the antenna string - */ - virtual void set_antenna(size_t chan, const std::string &ant) = 0; - - /*! - * Get the antenna in use. - * \param chan the channel number from 0 to N-1 - * \return the antenna string - */ - virtual std::string get_antenna(size_t chan) = 0; - - /*! - * Get a list of possible antennas. - * \param chan the channel number from 0 to N-1 - * \return a vector of antenna strings - */ - virtual std::vector<std::string> get_antennas(size_t chan) = 0; - - /*! - * Get the current time registers. - * \return the current usrp time - */ - virtual uhd::time_spec_t get_time_now(void) = 0; - - /*! - * Set the time registers at the next pps (across all mboards). - * \param time_spec the new time - */ - virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0; - - /*! - * Get access to the underlying uhd device object. - * \return the mimo usrp device object - */ - virtual uhd::usrp::mimo_usrp::sptr get_device(void) = 0; -}; - -#endif /* INCLUDED_UHD_MIMO_SINK_H */ diff --git a/gr-uhd/lib/uhd_mimo_source.cc b/gr-uhd/lib/uhd_mimo_source.cc deleted file mode 100644 index abd70ba36..000000000 --- a/gr-uhd/lib/uhd_mimo_source.cc +++ /dev/null @@ -1,166 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include <uhd_mimo_source.h> -#include <gr_io_signature.h> -#include <stdexcept> -//#include "utils.h" - -/*********************************************************************** - * UHD Source - **********************************************************************/ -uhd_mimo_source::uhd_mimo_source(gr_io_signature_sptr sig) -:gr_sync_block("uhd mimo source", gr_make_io_signature(0, 0, 0), sig){ - /* NOP */ -} - -/*********************************************************************** - * UHD Source Impl - **********************************************************************/ -class uhd_mimo_source_impl : public uhd_mimo_source{ -public: - uhd_mimo_source_impl( - size_t num_channels, - const std::string &args, - const uhd::io_type_t &type - ) : uhd_mimo_source(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type) - { - _dev = uhd::usrp::mimo_usrp::make(args); - set_streaming(false); - _dev->set_time_unknown_pps(uhd::time_spec_t()); //TODO may want option to disable this - } - - ~uhd_mimo_source_impl(void){ - set_streaming(false); - } - - void set_subdev_spec(size_t chan, const std::string &spec){ - return _dev->set_rx_subdev_spec(chan, spec); - } - - void set_samp_rate_all(double rate){ - _dev->set_rx_rate_all(rate); - //do_samp_rate_error_message(rate, get_samp_rate_all(), "RX"); - } - - double get_samp_rate_all(void){ - return _dev->get_rx_rate_all(); - } - - uhd::tune_result_t set_center_freq(size_t chan, double freq){ - uhd::tune_result_t tr = _dev->set_rx_freq(chan, freq); - //do_tune_freq_error_message(freq, _dev->get_rx_freq(chan), "RX"); - return tr; - } - - uhd::freq_range_t get_freq_range(size_t chan){ - return _dev->get_rx_freq_range(chan); - } - - void set_gain(size_t chan, float gain){ - return _dev->set_rx_gain(chan, gain); - } - - float get_gain(size_t chan){ - return _dev->get_rx_gain(chan); - } - - uhd::gain_range_t get_gain_range(size_t chan){ - return _dev->get_rx_gain_range(chan); - } - - void set_antenna(size_t chan, const std::string &ant){ - return _dev->set_rx_antenna(chan, ant); - } - - std::string get_antenna(size_t chan){ - return _dev->get_rx_antenna(chan); - } - - std::vector<std::string> get_antennas(size_t chan){ - return _dev->get_rx_antennas(chan); - } - - uhd::time_spec_t get_time_now(void){ - return _dev->get_time_now(); - } - - void set_time_next_pps(const uhd::time_spec_t &time_spec){ - return _dev->set_time_next_pps(time_spec); - } - - uhd::usrp::mimo_usrp::sptr get_device(void){ - return _dev; - } - -/*********************************************************************** - * Work - **********************************************************************/ - int work( - int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items - ){ - //conditionally start streaming in the work call - //this prevents streaming before the runtime is ready - if (not _is_streaming) set_streaming(true); - - uhd::rx_metadata_t metadata; //not passed out of this block - - return _dev->get_device()->recv( - output_items, noutput_items, metadata, - _type, uhd::device::RECV_MODE_FULL_BUFF - ); - } - -protected: - uhd::usrp::mimo_usrp::sptr _dev; - const uhd::io_type_t _type; - bool _is_streaming; - - void set_streaming(bool enb){ - if (enb){ - //setup a stream command that starts streaming slightly in the future - static const double reasonable_delay = 0.01; //10 ms (order of magnitude >> RTT) - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS); - stream_cmd.stream_now = false; - stream_cmd.time_spec = get_time_now() + uhd::time_spec_t(_dev->get_num_channels() * reasonable_delay); - _dev->issue_stream_cmd(stream_cmd); - } - else - _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); - _is_streaming = enb; - } -}; - -/*********************************************************************** - * Make UHD Source - **********************************************************************/ -boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source( - size_t num_channels, - const std::string &args, - const uhd::io_type_t::tid_t &type -){ - return boost::shared_ptr<uhd_mimo_source>( - new uhd_mimo_source_impl(num_channels, args, type) - ); -} diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h deleted file mode 100644 index 36735ae7e..000000000 --- a/gr-uhd/lib/uhd_mimo_source.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_UHD_MIMO_SOURCE_H -#define INCLUDED_UHD_MIMO_SOURCE_H - -#include <gr_sync_block.h> -#include <uhd/usrp/mimo_usrp.hpp> - -class uhd_mimo_source; - -boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source( - size_t num_channels, - const std::string &args, - const uhd::io_type_t::tid_t &type -); - -/*********************************************************************** - * DEPRECATED - **********************************************************************/ -class /*UHD_DEPRECATED*/ uhd_mimo_source : public gr_sync_block{ -public: - - /*! - * Set the IO signature for this block. - * \param sig the output signature - */ - uhd_mimo_source(gr_io_signature_sptr sig); - - /*! - * Set the subdevice specification. - * \param chan the channel number from 0 to N-1 - * \param spec the subdev spec markup string - */ - virtual void set_subdev_spec(size_t chan, const std::string &spec) = 0; - - /*! - * Set the sample rate for the usrp device (across all mboards). - * \param rate a new rate in Sps - */ - virtual void set_samp_rate_all(double rate) = 0; - - /*! - * Get the sample rate for the usrp device (across all mboards). - * This is the actual sample rate and may differ from the rate set. - * \return the actual rate in Sps - */ - virtual double get_samp_rate_all(void) = 0; - - /*! - * Tune the usrp device to the desired center frequency. - * \param chan the channel number from 0 to N-1 - * \param freq the desired frequency in Hz - * \return a tune result with the actual frequencies - */ - virtual uhd::tune_result_t set_center_freq(size_t chan, double freq) = 0; - - /*! - * Get the tunable frequency range. - * \param chan the channel number from 0 to N-1 - * \return the frequency range in Hz - */ - virtual uhd::freq_range_t get_freq_range(size_t chan) = 0; - - /*! - * Set the gain for the dboard. - * \param chan the channel number from 0 to N-1 - * \param gain the gain in dB - */ - virtual void set_gain(size_t chan, float gain) = 0; - - /*! - * Get the actual dboard gain setting. - * \param chan the channel number from 0 to N-1 - * \return the actual gain in dB - */ - virtual float get_gain(size_t chan) = 0; - - /*! - * Get the settable gain range. - * \param chan the channel number from 0 to N-1 - * \return the gain range in dB - */ - virtual uhd::gain_range_t get_gain_range(size_t chan) = 0; - - /*! - * Set the antenna to use. - * \param chan the channel number from 0 to N-1 - * \param ant the antenna string - */ - virtual void set_antenna(size_t chan, const std::string &ant) = 0; - - /*! - * Get the antenna in use. - * \param chan the channel number from 0 to N-1 - * \return the antenna string - */ - virtual std::string get_antenna(size_t chan) = 0; - - /*! - * Get a list of possible antennas. - * \param chan the channel number from 0 to N-1 - * \return a vector of antenna strings - */ - virtual std::vector<std::string> get_antennas(size_t chan) = 0; - - /*! - * Get the current time registers. - * \return the current usrp time - */ - virtual uhd::time_spec_t get_time_now(void) = 0; - - /*! - * Set the time registers at the next pps (across all mboards). - * \param time_spec the new time - */ - virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0; - - /*! - * Get access to the underlying uhd device object. - * \return the mimo usrp device object - */ - virtual uhd::usrp::mimo_usrp::sptr get_device(void) = 0; -}; - -#endif /* INCLUDED_UHD_MIMO_SOURCE_H */ diff --git a/gr-uhd/lib/uhd_simple_sink.cc b/gr-uhd/lib/uhd_simple_sink.cc deleted file mode 100644 index d7b04465d..000000000 --- a/gr-uhd/lib/uhd_simple_sink.cc +++ /dev/null @@ -1,152 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include <uhd_simple_sink.h> -#include <gr_io_signature.h> -#include <stdexcept> -//#include "utils.h" - -/*********************************************************************** - * UHD Sink - **********************************************************************/ -uhd_simple_sink::uhd_simple_sink(gr_io_signature_sptr sig) -:gr_sync_block("uhd simple sink", sig, gr_make_io_signature(0, 0, 0)){ - /* NOP */ -} - -/*********************************************************************** - * UHD Sink Impl - **********************************************************************/ -class uhd_simple_sink_impl : public uhd_simple_sink{ -public: - uhd_simple_sink_impl( - const std::string &args, - const uhd::io_type_t &type - ) : uhd_simple_sink(gr_make_io_signature(1, 1, type.size)), _type(type) - { - _dev = uhd::usrp::simple_usrp::make(args); - } - - ~uhd_simple_sink_impl(void){ - //NOP - } - - void set_subdev_spec(const std::string &spec){ - return _dev->set_tx_subdev_spec(spec); - } - - void set_samp_rate(double rate){ - _dev->set_tx_rate(rate); - //do_samp_rate_error_message(rate, get_samp_rate(), "TX"); - } - - double get_samp_rate(void){ - return _dev->get_tx_rate(); - } - - uhd::tune_result_t set_center_freq(double freq){ - uhd::tune_result_t tr = _dev->set_tx_freq(freq); - //do_tune_freq_error_message(freq, _dev->get_tx_freq(), "TX"); - return tr; - } - - uhd::freq_range_t get_freq_range(void){ - return _dev->get_tx_freq_range(); - } - - void set_gain(float gain){ - return _dev->set_tx_gain(gain); - } - - float get_gain(void){ - return _dev->get_tx_gain(); - } - - uhd::gain_range_t get_gain_range(void){ - return _dev->get_tx_gain_range(); - } - - void set_antenna(const std::string &ant){ - return _dev->set_tx_antenna(ant); - } - - std::string get_antenna(void){ - return _dev->get_tx_antenna(); - } - - std::vector<std::string> get_antennas(void){ - return _dev->get_tx_antennas(); - } - - void set_clock_config(const uhd::clock_config_t &clock_config){ - return _dev->set_clock_config(clock_config); - } - - uhd::time_spec_t get_time_now(void){ - return _dev->get_time_now(); - } - - void set_time_now(const uhd::time_spec_t &time_spec){ - return _dev->set_time_now(time_spec); - } - - void set_time_next_pps(const uhd::time_spec_t &time_spec){ - return _dev->set_time_next_pps(time_spec); - } - - uhd::usrp::simple_usrp::sptr get_device(void){ - return _dev; - } - -/*********************************************************************** - * Work - **********************************************************************/ - int work( - int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items - ){ - uhd::tx_metadata_t metadata; - metadata.start_of_burst = true; - - return _dev->get_device()->send( - input_items, noutput_items, metadata, - _type, uhd::device::SEND_MODE_FULL_BUFF - ); - } - -protected: - uhd::usrp::simple_usrp::sptr _dev; - const uhd::io_type_t _type; -}; - -/*********************************************************************** - * Make UHD Sink - **********************************************************************/ -boost::shared_ptr<uhd_simple_sink> uhd_make_simple_sink( - const std::string &args, - const uhd::io_type_t::tid_t &type -){ - return boost::shared_ptr<uhd_simple_sink>( - new uhd_simple_sink_impl(args, type) - ); -} diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h deleted file mode 100644 index 930487049..000000000 --- a/gr-uhd/lib/uhd_simple_sink.h +++ /dev/null @@ -1,147 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_UHD_SIMPLE_SINK_H -#define INCLUDED_UHD_SIMPLE_SINK_H - -#include <gr_sync_block.h> -#include <uhd/usrp/simple_usrp.hpp> - -class uhd_simple_sink; - -boost::shared_ptr<uhd_simple_sink> uhd_make_simple_sink( - const std::string &args, - const uhd::io_type_t::tid_t &type -); - -/*********************************************************************** - * DEPRECATED - **********************************************************************/ -class /*UHD_DEPRECATED*/ uhd_simple_sink : public gr_sync_block{ -public: - - /*! - * Set the IO signature for this block. - * \param sig the input signature - */ - uhd_simple_sink(gr_io_signature_sptr sig); - - /*! - * Set the subdevice specification. - * \param spec the subdev spec markup string - */ - virtual void set_subdev_spec(const std::string &spec) = 0; - - /*! - * Set the sample rate for the usrp device. - * \param rate a new rate in Sps - */ - virtual void set_samp_rate(double rate) = 0; - - /*! - * Get the sample rate for the usrp device. - * This is the actual sample rate and may differ from the rate set. - * \return the actual rate in Sps - */ - virtual double get_samp_rate(void) = 0; - - /*! - * Tune the usrp device to the desired center frequency. - * \param freq the desired frequency in Hz - * \return a tune result with the actual frequencies - */ - virtual uhd::tune_result_t set_center_freq(double freq) = 0; - - /*! - * Get the tunable frequency range. - * \return the frequency range in Hz - */ - virtual uhd::freq_range_t get_freq_range(void) = 0; - - /*! - * Set the gain for the dboard. - * \param gain the gain in dB - */ - virtual void set_gain(float gain) = 0; - - /*! - * Get the actual dboard gain setting. - * \return the actual gain in dB - */ - virtual float get_gain(void) = 0; - - /*! - * Get the settable gain range. - * \return the gain range in dB - */ - virtual uhd::gain_range_t get_gain_range(void) = 0; - - /*! - * Set the antenna to use. - * \param ant the antenna string - */ - virtual void set_antenna(const std::string &ant) = 0; - - /*! - * Get the antenna in use. - * \return the antenna string - */ - virtual std::string get_antenna(void) = 0; - - /*! - * Get a list of possible antennas. - * \return a vector of antenna strings - */ - virtual std::vector<std::string> get_antennas(void) = 0; - - /*! - * Set the clock configuration. - * \param clock_config the new configuration - */ - virtual void set_clock_config(const uhd::clock_config_t &clock_config) = 0; - - /*! - * Get the current time registers. - * \return the current usrp time - */ - virtual uhd::time_spec_t get_time_now(void) = 0; - - /*! - * Set the time registers asap. - * \param time_spec the new time - */ - virtual void set_time_now(const uhd::time_spec_t &time_spec) = 0; - - /*! - * Set the time registers at the next pps. - * \param time_spec the new time - */ - virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0; - - /*! - * Get access to the underlying uhd device object. - * \return the simple usrp device object - */ - virtual uhd::usrp::simple_usrp::sptr get_device(void) = 0; -}; - -#endif /* INCLUDED_UHD_SIMPLE_SINK_H */ diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc deleted file mode 100644 index d74c8414d..000000000 --- a/gr-uhd/lib/uhd_simple_source.cc +++ /dev/null @@ -1,183 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include <uhd_simple_source.h> -#include <gr_io_signature.h> -#include <stdexcept> -#include <iostream> -#include <boost/format.hpp> -//#include "utils.h" - -/*********************************************************************** - * UHD Source - **********************************************************************/ -uhd_simple_source::uhd_simple_source(gr_io_signature_sptr sig) -:gr_sync_block("uhd simple source", gr_make_io_signature(0, 0, 0), sig){ - /* NOP */ -} - -/*********************************************************************** - * UHD Source Impl - **********************************************************************/ -class uhd_simple_source_impl : public uhd_simple_source{ -public: - uhd_simple_source_impl( - const std::string &args, - const uhd::io_type_t &type - ) : uhd_simple_source(gr_make_io_signature(1, 1, type.size)), _type(type) - { - _dev = uhd::usrp::simple_usrp::make(args); - set_streaming(false); - } - - ~uhd_simple_source_impl(void){ - set_streaming(false); - } - - void set_subdev_spec(const std::string &spec){ - return _dev->set_rx_subdev_spec(spec); - } - - void set_samp_rate(double rate){ - _dev->set_rx_rate(rate); - //do_samp_rate_error_message(rate, get_samp_rate(), "RX"); - } - - double get_samp_rate(void){ - return _dev->get_rx_rate(); - } - - uhd::tune_result_t set_center_freq(double freq){ - uhd::tune_result_t tr = _dev->set_rx_freq(freq); - //do_tune_freq_error_message(freq, _dev->get_rx_freq(), "RX"); - return tr; - } - - uhd::freq_range_t get_freq_range(void){ - return _dev->get_rx_freq_range(); - } - - void set_gain(float gain){ - return _dev->set_rx_gain(gain); - } - - float get_gain(void){ - return _dev->get_rx_gain(); - } - - uhd::gain_range_t get_gain_range(void){ - return _dev->get_rx_gain_range(); - } - - void set_antenna(const std::string &ant){ - return _dev->set_rx_antenna(ant); - } - - std::string get_antenna(void){ - return _dev->get_rx_antenna(); - } - - std::vector<std::string> get_antennas(void){ - return _dev->get_rx_antennas(); - } - - void set_clock_config(const uhd::clock_config_t &clock_config){ - return _dev->set_clock_config(clock_config); - } - - uhd::time_spec_t get_time_now(void){ - return _dev->get_time_now(); - } - - void set_time_now(const uhd::time_spec_t &time_spec){ - return _dev->set_time_now(time_spec); - } - - void set_time_next_pps(const uhd::time_spec_t &time_spec){ - return _dev->set_time_next_pps(time_spec); - } - - uhd::usrp::simple_usrp::sptr get_device(void){ - return _dev; - } - -/*********************************************************************** - * Work - **********************************************************************/ - int work( - int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items - ){ - //conditionally start streaming in the work call - //this prevents streaming before the runtime is ready - if (not _is_streaming) set_streaming(true); - - uhd::rx_metadata_t metadata; //not passed out of this block - - size_t num_samps = _dev->get_device()->recv( - output_items, noutput_items, metadata, - _type, uhd::device::RECV_MODE_FULL_BUFF - ); - - switch(metadata.error_code){ - case uhd::rx_metadata_t::ERROR_CODE_NONE: - return num_samps; - - case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW: - //ignore overflows and try work again - return work(noutput_items, input_items, output_items); - - default: - std::cout << boost::format( - "UHD source block got error code 0x%x" - ) % metadata.error_code << std::endl; - return num_samps; - } - } - -private: - uhd::usrp::simple_usrp::sptr _dev; - const uhd::io_type_t _type; - bool _is_streaming; - - void set_streaming(bool enb){ - if (enb) - _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS); - else - _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); - _is_streaming = enb; - } -}; - - -/*********************************************************************** - * Make UHD Source - **********************************************************************/ -boost::shared_ptr<uhd_simple_source> uhd_make_simple_source( - const std::string &args, - const uhd::io_type_t::tid_t &type -){ - return boost::shared_ptr<uhd_simple_source>( - new uhd_simple_source_impl(args, type) - ); -} diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h deleted file mode 100644 index d9f8d252a..000000000 --- a/gr-uhd/lib/uhd_simple_source.h +++ /dev/null @@ -1,147 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_UHD_SIMPLE_SOURCE_H -#define INCLUDED_UHD_SIMPLE_SOURCE_H - -#include <gr_sync_block.h> -#include <uhd/usrp/simple_usrp.hpp> - -class uhd_simple_source; - -boost::shared_ptr<uhd_simple_source> uhd_make_simple_source( - const std::string &args, - const uhd::io_type_t::tid_t &type -); - -/*********************************************************************** - * DEPRECATED - **********************************************************************/ -class /*UHD_DEPRECATED*/ uhd_simple_source : public gr_sync_block{ -public: - - /*! - * Set the IO signature for this block. - * \param sig the output signature - */ - uhd_simple_source(gr_io_signature_sptr sig); - - /*! - * Set the subdevice specification. - * \param spec the subdev spec markup string - */ - virtual void set_subdev_spec(const std::string &spec) = 0; - - /*! - * Set the sample rate for the usrp device. - * \param rate a new rate in Sps - */ - virtual void set_samp_rate(double rate) = 0; - - /*! - * Get the sample rate for the usrp device. - * This is the actual sample rate and may differ from the rate set. - * \return the actual rate in Sps - */ - virtual double get_samp_rate(void) = 0; - - /*! - * Tune the usrp device to the desired center frequency. - * \param freq the desired frequency in Hz - * \return a tune result with the actual frequencies - */ - virtual uhd::tune_result_t set_center_freq(double freq) = 0; - - /*! - * Get the tunable frequency range. - * \return the frequency range in Hz - */ - virtual uhd::freq_range_t get_freq_range(void) = 0; - - /*! - * Set the gain for the dboard. - * \param gain the gain in dB - */ - virtual void set_gain(float gain) = 0; - - /*! - * Get the actual dboard gain setting. - * \return the actual gain in dB - */ - virtual float get_gain(void) = 0; - - /*! - * Get the settable gain range. - * \return the gain range in dB - */ - virtual uhd::gain_range_t get_gain_range(void) = 0; - - /*! - * Set the antenna to use. - * \param ant the antenna string - */ - virtual void set_antenna(const std::string &ant) = 0; - - /*! - * Get the antenna in use. - * \return the antenna string - */ - virtual std::string get_antenna(void) = 0; - - /*! - * Get a list of possible antennas. - * \return a vector of antenna strings - */ - virtual std::vector<std::string> get_antennas(void) = 0; - - /*! - * Set the clock configuration. - * \param clock_config the new configuration - */ - virtual void set_clock_config(const uhd::clock_config_t &clock_config) = 0; - - /*! - * Get the current time registers. - * \return the current usrp time - */ - virtual uhd::time_spec_t get_time_now(void) = 0; - - /*! - * Set the time registers asap. - * \param time_spec the new time - */ - virtual void set_time_now(const uhd::time_spec_t &time_spec) = 0; - - /*! - * Set the time registers at the next pps. - * \param time_spec the new time - */ - virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0; - - /*! - * Get access to the underlying uhd device object. - * \return the simple usrp device object - */ - virtual uhd::usrp::simple_usrp::sptr get_device(void) = 0; -}; - -#endif /* INCLUDED_UHD_SIMPLE_SOURCE_H */ diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 3c6773374..695cf1cd2 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -53,11 +53,6 @@ namespace std { // block headers //////////////////////////////////////////////////////////////////////// %{ -#include <uhd_mimo_source.h> //deprecated -#include <uhd_mimo_sink.h> //deprecated -#include <uhd_simple_source.h> //deprecated -#include <uhd_simple_sink.h> //deprecated - #include <uhd_multi_usrp_source.h> #include <uhd_multi_usrp_sink.h> #include <uhd_single_usrp_source.h> @@ -90,18 +85,6 @@ namespace std { //////////////////////////////////////////////////////////////////////// // block magic //////////////////////////////////////////////////////////////////////// -GR_SWIG_BLOCK_MAGIC(uhd,mimo_source) //deprecated -%include <uhd_mimo_source.h> //deprecated - -GR_SWIG_BLOCK_MAGIC(uhd,mimo_sink) //deprecated -%include <uhd_mimo_sink.h> //deprecated - -GR_SWIG_BLOCK_MAGIC(uhd,simple_source) //deprecated -%include <uhd_simple_source.h> //deprecated - -GR_SWIG_BLOCK_MAGIC(uhd,simple_sink) //deprecated -%include <uhd_simple_sink.h> //deprecated - GR_SWIG_BLOCK_MAGIC(uhd,multi_usrp_source) %include <uhd_multi_usrp_source.h> |