diff options
| -rw-r--r-- | gr-shd/grc/.gitignore | 2 | ||||
| -rw-r--r-- | gr-shd/grc/Makefile.am | 12 | ||||
| -rw-r--r-- | gr-shd/grc/gen_shd_smini_blocks.py (renamed from gr-shd/grc/gen_shd_xmini_blocks.py) | 64 | ||||
| -rw-r--r-- | gr-shd/grc/shd_block_tree.xml | 4 | ||||
| -rw-r--r-- | gr-shd/include/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-shd/include/gr_shd_smini_sink.h (renamed from gr-shd/include/gr_shd_xmini_sink.h) | 26 | ||||
| -rw-r--r-- | gr-shd/include/gr_shd_smini_source.h (renamed from gr-shd/include/gr_shd_xmini_source.h) | 26 | ||||
| -rw-r--r-- | gr-shd/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-shd/lib/gr_shd_smini_sink.cc (renamed from gr-shd/lib/gr_shd_xmini_sink.cc) | 18 | ||||
| -rw-r--r-- | gr-shd/lib/gr_shd_smini_source.cc (renamed from gr-shd/lib/gr_shd_xmini_source.cc) | 18 | ||||
| -rw-r--r-- | gr-shd/swig/__init__.py | 10 | ||||
| -rw-r--r-- | gr-shd/swig/shd_swig.i | 12 |
12 files changed, 76 insertions, 124 deletions
diff --git a/gr-shd/grc/.gitignore b/gr-shd/grc/.gitignore index 693b45adb..2c261c55b 100644 --- a/gr-shd/grc/.gitignore +++ b/gr-shd/grc/.gitignore @@ -1,3 +1,3 @@ -/shd_xmini*.xml +/shd_smini*.xml /Makefile /Makefile.in diff --git a/gr-shd/grc/Makefile.am b/gr-shd/grc/Makefile.am index c47d49144..c44ad1b4e 100644 --- a/gr-shd/grc/Makefile.am +++ b/gr-shd/grc/Makefile.am @@ -23,11 +23,11 @@ include $(top_srcdir)/Makefile.common grcblocksdir = $(grc_blocksdir) -generated_shd_xmini_blocks = \ - shd_xmini_source.xml \ - shd_xmini_sink.xml +generated_shd_smini_blocks = \ + shd_smini_source.xml \ + shd_smini_sink.xml -BUILT_SOURCES += $(generated_shd_xmini_blocks) +BUILT_SOURCES += $(generated_shd_smini_blocks) dist_grcblocks_DATA = \ shd_block_tree.xml \ @@ -36,8 +36,8 @@ dist_grcblocks_DATA = \ ######################################################################## # Rules for generating the source and sink xml wrappers ######################################################################## -EXTRA_DIST += $(srcdir)/gen_shd_xmini_blocks.py +EXTRA_DIST += $(srcdir)/gen_shd_smini_blocks.py -$(generated_shd_xmini_blocks): $(srcdir)/gen_shd_xmini_blocks.py +$(generated_shd_smini_blocks): $(srcdir)/gen_shd_smini_blocks.py @echo "generating $@..." $(PYTHON) $< $@ diff --git a/gr-shd/grc/gen_shd_xmini_blocks.py b/gr-shd/grc/gen_shd_smini_blocks.py index 5cc246a73..652b6cf51 100644 --- a/gr-shd/grc/gen_shd_xmini_blocks.py +++ b/gr-shd/grc/gen_shd_smini_blocks.py @@ -21,10 +21,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA MAIN_TMPL = """\ <?xml version="1.0"?> <block> - <name>SHD: XMINI $sourk.title()</name> - <key>shd_xmini_$(sourk)</key> + <name>SHD: SMINI $sourk.title()</name> + <key>shd_smini_$(sourk)</key> <import>from gnuradio import shd</import> - <make>shd.xmini_$(sourk)( + <make>shd.smini_$(sourk)( device_addr=\$dev_addr, io_type=shd.io_type.\$type.type, num_channels=\$nchan, @@ -62,12 +62,6 @@ self.\$(id).set_samp_rate(\$samp_rate) \#if \$nchan() > $n self.\$(id).set_center_freq(\$center_freq$(n), $n) self.\$(id).set_gain(\$gain$(n), $n) - \#if \$ant$(n)() -self.\$(id).set_antenna(\$ant$(n), $n) - \#end if - \#if \$bw$(n)() -self.\$(id).set_bandwidth(\$bw$(n), $n) - \#end if \#end if #end for </make> @@ -75,8 +69,6 @@ self.\$(id).set_bandwidth(\$bw$(n), $n) #for $n in range($max_nchan) <callback>set_center_freq(\$center_freq$(n), $n)</callback> <callback>set_gain(\$gain$(n), $n)</callback> - <callback>set_antenna(\$ant$(n), $n)</callback> - <callback>set_bandwidth(\$bw$(n), $n)</callback> #end for <param> <name>$(direction.title())put Type</name> @@ -214,18 +206,17 @@ self.\$(id).set_bandwidth(\$bw$(n), $n) <nports>\$nchan</nports> </$sourk> <doc> -The SHD XMINI $sourk.title() Block: +The SHD SMINI $sourk.title() Block: Device Address: The device address is a delimited string used to locate SHD devices on your system. \\ If left blank, the first SHD device found will be used. \\ Use the device address to specify a specific device or list of devices. -XMINI1 Example: serial=12345678 -XMINI2 Example: addr=192.168.10.2 -XMINI2 Example: addr0=192.168.10.2, addr1=192.168.10.3 +SMINI1 Example: serial=12345678 +SMINI2 Example: type=xmini Num Motherboards: -Selects the number of XMINI motherboards in this device configuration. +Selects the number of SMINI motherboards in this device configuration. Reference Source: Where the motherboard should sync its time and clock references. @@ -243,7 +234,7 @@ Single channel example: :AB Dual channel example: :A :B Num Channels: -Selects the total number of channels in this multi-XMINI configuration. +Selects the total number of channels in this multi-SMINI configuration. Ex: 4 motherboards with 2 channels per board = 8 channels total Sample rate: @@ -257,15 +248,6 @@ For greater control of how the SHD tunes elements in the RF chain, \\ pass a tune_request object rather than a simple target frequency. Tuning with an LO offset example: shd.tune_request(freq, lo_off) -Antenna: -For subdevices 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. - -Bandwidth: -To use the default bandwidth filter setting, this should be zero. \\ -Only certain subdevices have configurable bandwidth filters. \\ -See the daughterboard application notes for possible configurations. </doc> </block> """ @@ -285,36 +267,6 @@ PARAMS_TMPL = """ <type>real</type> <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide> </param> - <param> - <name>Ch$(n): Antenna</name> - <key>ant$(n)</key> - <value></value> - <type>string</type> - <hide> - \#if not \$nchan() > $n - all - \#elif \$ant$(n)() - none - \#else - part - \#end if - </hide> - </param> - <param> - <name>Ch$(n): Bandwidth (Hz)</name> - <key>bw$(n)</key> - <value>0</value> - <type>real</type> - <hide> - \#if not \$nchan() > $n - all - \#elif \$bw$(n)() - none - \#else - part - \#end if - </hide> - </param> """ def parse_tmpl(_tmpl, **kwargs): diff --git a/gr-shd/grc/shd_block_tree.xml b/gr-shd/grc/shd_block_tree.xml index 8d340d739..5d9786f67 100644 --- a/gr-shd/grc/shd_block_tree.xml +++ b/gr-shd/grc/shd_block_tree.xml @@ -8,7 +8,7 @@ <name></name> <!-- Blank for Root Name --> <cat> <name>SHD</name> - <block>shd_xmini_source</block> - <block>shd_xmini_sink</block> + <block>shd_smini_source</block> + <block>shd_smini_sink</block> </cat> </cat> diff --git a/gr-shd/include/Makefile.am b/gr-shd/include/Makefile.am index e7bfc6570..2cb1597df 100644 --- a/gr-shd/include/Makefile.am +++ b/gr-shd/include/Makefile.am @@ -23,5 +23,5 @@ include $(top_srcdir)/Makefile.common grinclude_HEADERS = \ gr_shd_api.h \ - gr_shd_xmini_source.h \ - gr_shd_xmini_sink.h
\ No newline at end of file + gr_shd_smini_source.h \ + gr_shd_smini_sink.h
\ No newline at end of file diff --git a/gr-shd/include/gr_shd_xmini_sink.h b/gr-shd/include/gr_shd_smini_sink.h index 8bc0c2889..938958687 100644 --- a/gr-shd/include/gr_shd_xmini_sink.h +++ b/gr-shd/include/gr_shd_smini_sink.h @@ -19,22 +19,22 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GR_SHD_XMINI_SINK_H -#define INCLUDED_GR_SHD_XMINI_SINK_H +#ifndef INCLUDED_GR_SHD_SMINI_SINK_H +#define INCLUDED_GR_SHD_SMINI_SINK_H #include <gr_shd_api.h> #include <gr_sync_block.h> #include <shd/xmini/multi_xmini.hpp> -class shd_xmini_sink; +class shd_smini_sink; -GR_SHD_API boost::shared_ptr<shd_xmini_sink> shd_make_xmini_sink( +GR_SHD_API boost::shared_ptr<shd_smini_sink> shd_make_smini_sink( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels ); -class GR_SHD_API shd_xmini_sink : virtual public gr_sync_block +class GR_SHD_API shd_smini_sink : virtual public gr_sync_block { public: @@ -46,20 +46,20 @@ class GR_SHD_API shd_xmini_sink : virtual public gr_sync_block virtual void set_subdev_spec(const std::string &spec, size_t mboard = 0) = 0; /*! - * Set the sample rate for the xmini device. + * Set the sample rate for the smini device. * \param rate a new rate in Sps */ virtual void set_samp_rate(double rate) = 0; /*! - * Get the sample rate for the xmini device. + * Get the sample rate for the smini 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 xmini device to the desired center frequency. + * Tune the smini device to the desired center frequency. * \param tune_request the tune request instructions * \param chan the channel index 0 to N-1 * \return a tune result with the actual frequencies @@ -69,7 +69,7 @@ class GR_SHD_API shd_xmini_sink : virtual public gr_sync_block ) = 0; /*! - * Tune the xmini device to the desired center frequency. + * Tune the smini device to the desired center frequency. * This is a wrapper around set center freq so that in this case, * the user can pass a single frequency in the call through swig. * \param freq the desired frequency in Hz @@ -235,14 +235,14 @@ class GR_SHD_API shd_xmini_sink : virtual public gr_sync_block /*! * Get the current time registers. * \param mboard the motherboard index 0 to M-1 - * \return the current xmini time + * \return the current smini time */ virtual shd::time_spec_t get_time_now(size_t mboard = 0) = 0; /*! * Get the time when the last pps pulse occured. * \param mboard the motherboard index 0 to M-1 - * \return the current xmini time + * \return the current smini time */ virtual shd::time_spec_t get_time_last_pps(size_t mboard = 0) = 0; @@ -274,9 +274,9 @@ class GR_SHD_API shd_xmini_sink : virtual public gr_sync_block /*! * Get access to the underlying shd device object. - * \return the multi xmini device object + * \return the multi smini device object */ virtual shd::xmini::multi_xmini::sptr get_device(void) = 0; }; -#endif /* INCLUDED_GR_SHD_XMINI_SINK_H */ +#endif /* INCLUDED_GR_SHD_SMINI_SINK_H */ diff --git a/gr-shd/include/gr_shd_xmini_source.h b/gr-shd/include/gr_shd_smini_source.h index b4f1c5571..3e3dbf427 100644 --- a/gr-shd/include/gr_shd_xmini_source.h +++ b/gr-shd/include/gr_shd_smini_source.h @@ -19,22 +19,22 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GR_SHD_XMINI_SOURCE_H -#define INCLUDED_GR_SHD_XMINI_SOURCE_H +#ifndef INCLUDED_GR_SHD_SMINI_SOURCE_H +#define INCLUDED_GR_SHD_SMINI_SOURCE_H #include <gr_shd_api.h> #include <gr_sync_block.h> #include <shd/xmini/multi_xmini.hpp> -class shd_xmini_source; +class shd_smini_source; -GR_SHD_API boost::shared_ptr<shd_xmini_source> shd_make_xmini_source( +GR_SHD_API boost::shared_ptr<shd_smini_source> shd_make_smini_source( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels ); -class GR_SHD_API shd_xmini_source : virtual public gr_sync_block +class GR_SHD_API shd_smini_source : virtual public gr_sync_block { public: @@ -47,20 +47,20 @@ class GR_SHD_API shd_xmini_source : virtual public gr_sync_block size_t mboard = 0) = 0; /*! - * Set the sample rate for the xmini device. + * Set the sample rate for the smini device. * \param rate a new rate in Sps */ virtual void set_samp_rate(double rate) = 0; /*! - * Get the sample rate for the xmini device. + * Get the sample rate for the smini 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 xmini device to the desired center frequency. + * Tune the smini device to the desired center frequency. * \param tune_request the tune request instructions * \param chan the channel index 0 to N-1 * \return a tune result with the actual frequencies @@ -71,7 +71,7 @@ class GR_SHD_API shd_xmini_source : virtual public gr_sync_block ) = 0; /*! - * Tune the xmini device to the desired center frequency. + * Tune the smini device to the desired center frequency. * This is a wrapper around set center freq so that in this case, * the user can pass a single frequency in the call through swig. * \param freq the desired frequency in Hz @@ -239,14 +239,14 @@ class GR_SHD_API shd_xmini_source : virtual public gr_sync_block /*! * Get the current time registers. * \param mboard the motherboard index 0 to M-1 - * \return the current xmini time + * \return the current smini time */ virtual shd::time_spec_t get_time_now(size_t mboard = 0) = 0; /*! * Get the time when the last pps pulse occured. * \param mboard the motherboard index 0 to M-1 - * \return the current xmini time + * \return the current smini time */ virtual shd::time_spec_t get_time_last_pps(size_t mboard = 0) = 0; @@ -278,9 +278,9 @@ class GR_SHD_API shd_xmini_source : virtual public gr_sync_block /*! * Get access to the underlying shd device object. - * \return the multi xmini device object + * \return the multi smini device object */ virtual shd::xmini::multi_xmini::sptr get_device(void) = 0; }; -#endif /* INCLUDED_GR_SHD_XMINI_SOURCE_H */ +#endif /* INCLUDED_GR_SHD_SMINI_SOURCE_H */ diff --git a/gr-shd/lib/Makefile.am b/gr-shd/lib/Makefile.am index fe0f51e3d..7a887aebf 100644 --- a/gr-shd/lib/Makefile.am +++ b/gr-shd/lib/Makefile.am @@ -30,8 +30,8 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libgnuradio-shd.la libgnuradio_shd_la_SOURCES = \ - gr_shd_xmini_source.cc \ - gr_shd_xmini_sink.cc + gr_shd_smini_source.cc \ + gr_shd_smini_sink.cc libgnuradio_shd_la_LIBADD = \ $(GNURADIO_CORE_LA) \ diff --git a/gr-shd/lib/gr_shd_xmini_sink.cc b/gr-shd/lib/gr_shd_smini_sink.cc index d2dfb19ff..c9fb222d0 100644 --- a/gr-shd/lib/gr_shd_xmini_sink.cc +++ b/gr-shd/lib/gr_shd_smini_sink.cc @@ -19,20 +19,20 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_shd_xmini_sink.h> +#include <gr_shd_smini_sink.h> #include <gr_io_signature.h> #include <stdexcept> /********************************************************************* - * SHD Multi XMINI Sink Impl + * SHD Multi SMINI Sink Impl ********************************************************************/ -class shd_xmini_sink_impl : public shd_xmini_sink +class shd_smini_sink_impl : public shd_smini_sink { public: - shd_xmini_sink_impl(const shd::device_addr_t &device_addr, + shd_smini_sink_impl(const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels): - gr_sync_block("gr shd xmini sink", + gr_sync_block("gr shd smini sink", gr_make_io_signature(num_channels, num_channels, io_type.size), gr_make_io_signature(0, 0, 0)), _type(io_type), @@ -263,14 +263,14 @@ protected: }; /********************************************************************* - * Make SHD Multi XMINI Sink + * Make SHD Multi SMINI Sink ********************************************************************/ -boost::shared_ptr<shd_xmini_sink> shd_make_xmini_sink( +boost::shared_ptr<shd_smini_sink> shd_make_smini_sink( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels) { - return boost::shared_ptr<shd_xmini_sink>( - new shd_xmini_sink_impl(device_addr, io_type, num_channels)); + return boost::shared_ptr<shd_smini_sink>( + new shd_smini_sink_impl(device_addr, io_type, num_channels)); } diff --git a/gr-shd/lib/gr_shd_xmini_source.cc b/gr-shd/lib/gr_shd_smini_source.cc index ac8e58709..caf98f311 100644 --- a/gr-shd/lib/gr_shd_xmini_source.cc +++ b/gr-shd/lib/gr_shd_smini_source.cc @@ -19,25 +19,25 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_shd_xmini_source.h> +#include <gr_shd_smini_source.h> #include <gr_io_signature.h> #include <stdexcept> #include <iostream> #include <boost/format.hpp> /********************************************************************* - * SHD Multi XMINI Source Impl + * SHD Multi S-MINI Source Impl ********************************************************************/ -class shd_xmini_source_impl : public shd_xmini_source +class shd_smini_source_impl : public shd_smini_source { public: - shd_xmini_source_impl( + shd_smini_source_impl( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels ): gr_sync_block( - "gr shd xmini source", + "gr shd smini source", gr_make_io_signature(0, 0, 0), gr_make_io_signature(num_channels, num_channels, io_type.size) ), @@ -286,14 +286,14 @@ private: /********************************************************************* - * Make SHD Multi XMINI Source + * Make SHD Multi SMINI Source ********************************************************************/ -boost::shared_ptr<shd_xmini_source> shd_make_xmini_source( +boost::shared_ptr<shd_smini_source> shd_make_smini_source( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels) { - return boost::shared_ptr<shd_xmini_source>( - new shd_xmini_source_impl(device_addr, io_type, num_channels)); + return boost::shared_ptr<shd_smini_source>( + new shd_smini_source_impl(device_addr, io_type, num_channels)); } diff --git a/gr-shd/swig/__init__.py b/gr-shd/swig/__init__.py index 3b228791a..17589625c 100644 --- a/gr-shd/swig/__init__.py +++ b/gr-shd/swig/__init__.py @@ -60,7 +60,7 @@ def _prepare_shd_swig(): if attr.endswith('_t'): setattr(shd_swig, attr[:-2], myobj) #Cast constructor args (FIXME swig handle overloads?) - for attr in ('xmini_source', 'xmini_sink'): + for attr in ('smini_source', 'smini_sink'): def constructor_factory(old_constructor): def constructor_interceptor(*args, **kwargs): args = list(args) @@ -76,10 +76,10 @@ def _prepare_shd_swig(): setattr(shd_swig, attr, constructor_factory(getattr(shd_swig, attr))) #Aliases for deprecated constructors - setattr(shd_swig, 'single_xmini_source', shd_swig.xmini_source) - setattr(shd_swig, 'single_xmini_sink', shd_swig.xmini_sink) - setattr(shd_swig, 'multi_xmini_source', shd_swig.xmini_source) - setattr(shd_swig, 'multi_xmini_sink', shd_swig.xmini_sink) + setattr(shd_swig, 'single_smini_source', shd_swig.smini_source) + setattr(shd_swig, 'single_smini_sink', shd_swig.smini_sink) + setattr(shd_swig, 'multi_smini_source', shd_swig.smini_source) + setattr(shd_swig, 'multi_smini_sink', shd_swig.smini_sink) ######################################################################## # Initialize this module with the contents of shd swig diff --git a/gr-shd/swig/shd_swig.i b/gr-shd/swig/shd_swig.i index 8d19c1680..217b2f1af 100644 --- a/gr-shd/swig/shd_swig.i +++ b/gr-shd/swig/shd_swig.i @@ -53,8 +53,8 @@ // block headers //////////////////////////////////////////////////////////////////////// %{ -#include <gr_shd_xmini_source.h> -#include <gr_shd_xmini_sink.h> +#include <gr_shd_smini_source.h> +#include <gr_shd_smini_sink.h> %} //////////////////////////////////////////////////////////////////////// @@ -108,11 +108,11 @@ //////////////////////////////////////////////////////////////////////// // block magic //////////////////////////////////////////////////////////////////////// -GR_SWIG_BLOCK_MAGIC(shd,xmini_source) -%include <gr_shd_xmini_source.h> +GR_SWIG_BLOCK_MAGIC(shd,smini_source) +%include <gr_shd_smini_source.h> -GR_SWIG_BLOCK_MAGIC(shd,xmini_sink) -%include <gr_shd_xmini_sink.h> +GR_SWIG_BLOCK_MAGIC(shd,smini_sink) +%include <gr_shd_smini_sink.h> //////////////////////////////////////////////////////////////////////// // helpful constants |