diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-28 12:35:10 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-28 12:35:10 -0700 |
| commit | d8d5087d097e3edfa2fe5b7e5b7bbca991cfda03 (patch) | |
| tree | 52c379d117edde2a67cb20c6b545db313d3f5394 | |
| parent | 4deec7f014bfd65e0476c3e2845e53ae331dcf3b (diff) | |
| parent | 8a465a72331e060474760a4b1a7900d65b12616a (diff) | |
Merge branch 'maint'
| -rwxr-xr-x | gr-digital/python/digital/qa_ofdm_serializer_vcc.py | 2 | ||||
| -rw-r--r-- | gr-fft/lib/fft_vcc_fftw.cc | 2 | ||||
| -rw-r--r-- | gr-fft/lib/fft_vfc_fftw.cc | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/gr-digital/python/digital/qa_ofdm_serializer_vcc.py b/gr-digital/python/digital/qa_ofdm_serializer_vcc.py index fbef2b1f27..69997ce981 100755 --- a/gr-digital/python/digital/qa_ofdm_serializer_vcc.py +++ b/gr-digital/python/digital/qa_ofdm_serializer_vcc.py @@ -192,7 +192,7 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase): pilot_symbols, (), tag_name) tx_ifft = fft.fft_vcc(fft_len, False, (1.0/fft_len,)*fft_len, True) - oscillator = analog.sig_source_c(1.0, analog.GR_COS_WAVE, freq_offset, 1.0/fft_len) + oscillator = analog.sig_source_c(1.0, analog.GR_COS_WAVE, freq_offset, 1.0) mixer = blocks.multiply_cc() rx_fft = fft.fft_vcc(fft_len, True, (), True) sink2 = blocks.vector_sink_c(fft_len) diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc index 96f3e5b51c..6873e74f45 100644 --- a/gr-fft/lib/fft_vcc_fftw.cc +++ b/gr-fft/lib/fft_vcc_fftw.cc @@ -50,6 +50,8 @@ namespace gr { d_fft_size(fft_size), d_forward(forward), d_shift(shift) { d_fft = new fft_complex(d_fft_size, forward, nthreads); + if(!set_window(window)) + throw std::runtime_error("fft_vcc: window not the same length as fft_size\n"); } fft_vcc_fftw::~fft_vcc_fftw() diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc index dec2157b06..cb8d223d95 100644 --- a/gr-fft/lib/fft_vfc_fftw.cc +++ b/gr-fft/lib/fft_vfc_fftw.cc @@ -50,6 +50,8 @@ namespace gr { d_fft_size(fft_size), d_forward(forward) { d_fft = new fft_complex(d_fft_size, forward, nthreads); + if(!set_window(window)) + throw std::runtime_error("fft_vfc: window not the same length as fft_size\n"); } fft_vfc_fftw::~fft_vfc_fftw() |