diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:20:42 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:20:42 -0700 |
| commit | 49f4bfbd466a0750534f36677b564af310190081 (patch) | |
| tree | e8845b7b8f8c6e6a699ec1f95b85e6db04ea4d22 | |
| parent | 681846ff4f16388482ed7c6fb2a53e31e553e6a2 (diff) | |
| parent | 6efacb8e3a8dcefab94231e08827161cb8e0c737 (diff) | |
Merge branch 'maint'
4 files changed, 8 insertions, 6 deletions
diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h index ca53382944..85443da8f2 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h @@ -30,7 +30,8 @@ namespace gr { namespace digital { - /* \brief Base class for implementation details of frequency-domain OFDM equalizers. + /*! + * \brief Base class for implementation details of frequency-domain OFDM equalizers. * \ingroup ofdm_blk * \ingroup equalizers_blk */ diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h index d526f9f157..03a4c82b91 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h @@ -29,7 +29,8 @@ namespace gr { namespace digital { - /* \brief Simple decision feedback equalizer for OFDM. + /*! + * \brief Simple decision feedback equalizer for OFDM. * \ingroup ofdm_blk * \ingroup equalizers_blk * diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h index 892025c2b0..ed3fe83f04 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h @@ -29,7 +29,8 @@ namespace gr { namespace digital { - /* \brief Very simple static equalizer for OFDM. + /*! + * \brief Very simple static equalizer for OFDM. * \ingroup ofdm_blk * \ingroup equalizers_blk * diff --git a/gr-utils/python/modtool/modtool_add.py b/gr-utils/python/modtool/modtool_add.py index 3627dc6ad1..b60474740c 100644 --- a/gr-utils/python/modtool/modtool_add.py +++ b/gr-utils/python/modtool/modtool_add.py @@ -84,9 +84,8 @@ class ModToolAdd(ModTool): if self._info['lang'] is None: while self._info['lang'] not in ['cpp', 'python']: self._info['lang'] = raw_input("Language (python/cpp): ") - - if self._info['lang'] == 'c++': - self._info['lang'] = 'cpp' + if self._info['lang'] == 'c++': + self._info['lang'] = 'cpp' print "Language: %s" % {'cpp': 'C++', 'python': 'Python'}[self._info['lang']] |