diff options
| author | Martin Braun <martin.braun@kit.edu> | 2013-08-30 09:53:08 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@kit.edu> | 2013-08-30 09:53:08 +0200 |
| commit | edf2ac24c9c2f723eb80918de7addf6d299958c2 (patch) | |
| tree | 07b7300051f0e0791f8806a143d8b2210df119af | |
| parent | 7355cfb008b29197d913e215fdb41806cbaf68d6 (diff) | |
| parent | d19aa281291a4cb45b3c30cdaafcea9eee5d1887 (diff) | |
Merge branch 'master' of git://github.com/gnuradio/gnuradio into scrambler
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/file_descriptor_source.h | 2 | ||||
| -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 |
6 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 625d83def4..ec2bec2d10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) # Set the version information here set(VERSION_INFO_MAJOR_VERSION 3) set(VERSION_INFO_API_COMPAT 7) -set(VERSION_INFO_MINOR_VERSION 1) +set(VERSION_INFO_MINOR_VERSION 2) set(VERSION_INFO_MAINT_VERSION git) include(GrVersion) #setup version info diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt index 7e644635c3..f7733db628 100644 --- a/gnuradio-runtime/CMakeLists.txt +++ b/gnuradio-runtime/CMakeLists.txt @@ -135,7 +135,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf - ctrlport.conf.example DESTINATION ${GR_PREFSDIR} COMPONENT "runtime_runtime" ) diff --git a/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h index 6d1b9a4458..6292b6357b 100644 --- a/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h @@ -52,7 +52,7 @@ namespace gr { * \param fd file descriptor (as an integer). * \param repeat repeat the data stream continuously. */ - static sptr make(size_t itemsize, int fd, bool repeat); + static sptr make(size_t itemsize, int fd, bool repeat=false); }; } /* namespace blocks */ 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() |