diff options
| -rw-r--r-- | docs/doxygen/doxyxml/doxyindex.py | 3 | ||||
| -rw-r--r-- | gr-digital/include/digital_constellation.h | 2 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/digital_impl_mpsk_snr_est.cc | 6 | ||||
| -rw-r--r-- | gr-digital/lib/digital_mpsk_snr_est_cc.cc | 2 | ||||
| -rwxr-xr-x | gr-digital/python/qa_mpsk_snr_est.py | 2 | ||||
| -rw-r--r-- | gr-filter/grc/pfb_arb_resampler.xml | 10 | ||||
| -rw-r--r-- | gr-filter/lib/interp_fir_filter_XXX_impl.cc.t | 4 | ||||
| -rw-r--r-- | gr-utils/src/python/modtool/util_functions.py | 2 | ||||
| -rw-r--r-- | gr-video-sdl/gnuradio-video-sdl.pc.in | 2 |
10 files changed, 26 insertions, 11 deletions
diff --git a/docs/doxygen/doxyxml/doxyindex.py b/docs/doxygen/doxyxml/doxyindex.py index 304109a8e..8c5502a61 100644 --- a/docs/doxygen/doxyxml/doxyindex.py +++ b/docs/doxygen/doxyxml/doxyindex.py @@ -278,7 +278,8 @@ class DoxyOther(Base): __module__ = "gnuradio.utils.doxyxml" - kinds = set(['variable', 'struct', 'union', 'define', 'typedef', 'enum', 'dir', 'page']) + kinds = set(['variable', 'struct', 'union', 'define', 'typedef', 'enum', + 'dir', 'page', 'signal', 'slot', 'property']) @classmethod def can_parse(cls, obj): diff --git a/gr-digital/include/digital_constellation.h b/gr-digital/include/digital_constellation.h index 76cd30b25..9d34d951f 100644 --- a/gr-digital/include/digital_constellation.h +++ b/gr-digital/include/digital_constellation.h @@ -63,6 +63,8 @@ public: unsigned int dimensionality); digital_constellation (); + virtual ~digital_constellation(); + //! Returns the constellation points for a symbol value void map_to_points(unsigned int value, gr_complex *points); std::vector<gr_complex> map_to_points_v(unsigned int value); diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc index da79f2caa..8b34d9e6b 100644 --- a/gr-digital/lib/digital_constellation.cc +++ b/gr-digital/lib/digital_constellation.cc @@ -77,6 +77,10 @@ digital_constellation::digital_constellation () : calc_arity(); } +digital_constellation::~digital_constellation() +{ +} + //! Returns the constellation points for a symbol value void digital_constellation::map_to_points(unsigned int value, gr_complex *points) diff --git a/gr-digital/lib/digital_impl_mpsk_snr_est.cc b/gr-digital/lib/digital_impl_mpsk_snr_est.cc index 38177083f..b2ad0369f 100644 --- a/gr-digital/lib/digital_impl_mpsk_snr_est.cc +++ b/gr-digital/lib/digital_impl_mpsk_snr_est.cc @@ -236,9 +236,9 @@ digital_impl_mpsk_snr_est_svr::update( int noutput_items, const gr_complex *in) { - for (int i = 0; i < noutput_items; i++){ - double x = abs(in[i]); - double x1 = abs(in[i-1]); + for(int i = 0; i < noutput_items; i++) { + double x = abs(in[i+1]); + double x1 = abs(in[i]); double y1 = (x*x)*(x1*x1); d_y1 = d_alpha*y1 + d_beta*d_y1; diff --git a/gr-digital/lib/digital_mpsk_snr_est_cc.cc b/gr-digital/lib/digital_mpsk_snr_est_cc.cc index b5a60f0d3..38a452ac2 100644 --- a/gr-digital/lib/digital_mpsk_snr_est_cc.cc +++ b/gr-digital/lib/digital_mpsk_snr_est_cc.cc @@ -82,7 +82,7 @@ digital_mpsk_snr_est_cc::work(int noutput_items, // Update, calculate, and issue an SNR tag every d_nsamples int index = 0, x = 0; int64_t nwritten = nitems_written(0); - while(index + (d_nsamples-d_count) <= noutput_items) { + while(index + (d_nsamples-d_count) < noutput_items) { x = d_nsamples - d_count; nwritten += x; diff --git a/gr-digital/python/qa_mpsk_snr_est.py b/gr-digital/python/qa_mpsk_snr_est.py index d392567bf..e21bad831 100755 --- a/gr-digital/python/qa_mpsk_snr_est.py +++ b/gr-digital/python/qa_mpsk_snr_est.py @@ -88,7 +88,7 @@ class test_mpsk_snr_est (gr_unittest.TestCase): self.assertFloatTuplesAlmostEqual (expected_result, actual_result, 2) def test_mpsk_snr_est_svn (self): - expected_result = [10.90, 6.00, 4.76, 4.97, 5.49] + expected_result = [10.92, 6.02, 4.78, 4.98, 5.51] N = 10000 alpha = 0.001 diff --git a/gr-filter/grc/pfb_arb_resampler.xml b/gr-filter/grc/pfb_arb_resampler.xml index f3048000a..774cb9186 100644 --- a/gr-filter/grc/pfb_arb_resampler.xml +++ b/gr-filter/grc/pfb_arb_resampler.xml @@ -9,10 +9,14 @@ <key>pfb_arb_resampler_xxx</key> <import>from gnuradio import filter</import> <import>from gnuradio.filter import firdes</import> - <make>filter.pfb_arb_resampler_$(type)( + <make>filter.pfb.arb_resampler_$(type)( $rrate, - $taps, - $nfilts) +#if $taps() + taps=$taps, +#else + taps=None, +#end if + flt_size=$nfilts) </make> <callback>set_taps($taps)</callback> <param> diff --git a/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t b/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t index c9127d737..fea3b1c8e 100644 --- a/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t +++ b/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t @@ -54,6 +54,10 @@ namespace gr { throw std::out_of_range("@IMPL_NAME@: interpolation must be > 0\n"); } + if(taps.size() == 0) { + throw std::runtime_error("@IMPL_NAME@: no filter taps provided.\n"); + } + std::vector<@TAP_TYPE@> dummy_taps; for(unsigned i = 0; i < interpolation; i++) { diff --git a/gr-utils/src/python/modtool/util_functions.py b/gr-utils/src/python/modtool/util_functions.py index 4ca294ac3..c40dbd73b 100644 --- a/gr-utils/src/python/modtool/util_functions.py +++ b/gr-utils/src/python/modtool/util_functions.py @@ -92,7 +92,7 @@ def get_modname(): pass # OK, there's no gnuradio.project. So, we need to guess. cmfile = open('CMakeLists.txt', 'r').read() - regexp = r'(project\s*\(\s*|GR_REGISTER_COMPONENT\(")gr-(?P<modname>[a-zA-Z1-9-_]+)(\s*(CXX)?|" ENABLE)' + regexp = r'(project\s*\(\s*|GR_REGISTER_COMPONENT\(")gr-(?P<modname>[a-zA-Z0-9-_]+)(\s*(CXX)?|" ENABLE)' try: modname = re.search(regexp, cmfile, flags=re.MULTILINE).group('modname').strip() if modname in modname_trans.keys(): diff --git a/gr-video-sdl/gnuradio-video-sdl.pc.in b/gr-video-sdl/gnuradio-video-sdl.pc.in index 8586a2884..ade9ba910 100644 --- a/gr-video-sdl/gnuradio-video-sdl.pc.in +++ b/gr-video-sdl/gnuradio-video-sdl.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: gnuradio-comedi +Name: gnuradio-video-sdl Description: GNU Radio blocks for the SDL library Requires: gnuradio-core sdl Version: @LIBVER@ |