diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-07 10:44:17 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-07 10:44:17 -0400 |
| commit | 104aa2b5827ccc7c30baff7bff139ab7a85fa9f9 (patch) | |
| tree | 11d14819dc6e32a0546ff960a5a5a7d676796d5c | |
| parent | 0fa5d821e0bb6d98388a0bf766837cbd6c73451f (diff) | |
| parent | dd387a3708196f382f0c1e8041077bf94038ae98 (diff) | |
Merge branch 'master' into next
Also updating to make changes in maint/master to next.
Conflicts:
docs/doxygen/CMakeLists.txt
gnuradio-runtime/lib/pmt/CMakeLists.txt
gr-digital/lib/digital_impl_mpsk_snr_est.cc
gr-digital/lib/digital_mpsk_snr_est_cc.cc
gr-digital/python/qa_mpsk_snr_est.py
| -rw-r--r-- | docs/doxygen/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-digital/lib/mpsk_snr_est.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/mpsk_snr_est_cc_impl.cc | 2 | ||||
| -rwxr-xr-x | gr-digital/python/qa_mpsk_snr_est.py | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index 5b5de2f4dd..8498511f9d 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -36,7 +36,10 @@ configure_file( @ONLY) set(BUILT_DIRS ${CMAKE_CURRENT_BINARY_DIR}/xml ${CMAKE_CURRENT_BINARY_DIR}/html) -set(GENERATED_DEPS pmt_generated) + +if(ENABLE_GNURADIO_RUNTIME) + list(APPEND GENERATED_DEPS pmt_generated) +endif(ENABLE_GNURADIO_RUNTIME) if(ENABLE_GR_BLOCKS) list(APPEND GENERATED_DEPS blocks_generated_includes) diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index d21beb1414..ee80ed4d5b 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -243,7 +243,7 @@ target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs}) GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel") add_dependencies(gnuradio-runtime - runtime_generated_includes + pmt_generated runtime_generated_includes ) ######################################################################## diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 9d191df06a..3c1a2dec03 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -53,8 +53,6 @@ ADD_FILE_DEPENDENCIES( ${PMT_SERIAL_TAGS_H} ) -add_custom_target(pmt_generated DEPENDS ${PMT_SERIAL_TAGS_H}) - ######################################################################## # Generate other pmt stuff ######################################################################## @@ -89,3 +87,6 @@ if(ENABLE_TESTING) ${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt.cc ) endif(ENABLE_TESTING) + +add_custom_target(pmt_generated + DEPENDS ${PMT_SERIAL_TAGS_H} ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h) diff --git a/gr-digital/lib/mpsk_snr_est.cc b/gr-digital/lib/mpsk_snr_est.cc index 1457a1a918..9b52334806 100644 --- a/gr-digital/lib/mpsk_snr_est.cc +++ b/gr-digital/lib/mpsk_snr_est.cc @@ -230,8 +230,8 @@ namespace gr { const gr_complex *input) { for(int i = 0; i < noutput_items; i++) { - double x = abs(input[i]); - double x1 = abs(input[i-1]); + double x = abs(input[i+1]); + double x1 = abs(input[i]); double y1 = (x*x)*(x1*x1); d_y1 = d_alpha*y1 + d_beta*d_y1; diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.cc b/gr-digital/lib/mpsk_snr_est_cc_impl.cc index 621c41b9f0..6d11dd315c 100644 --- a/gr-digital/lib/mpsk_snr_est_cc_impl.cc +++ b/gr-digital/lib/mpsk_snr_est_cc_impl.cc @@ -85,7 +85,7 @@ namespace gr { // 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 f500f0eb16..ac8af4374e 100755 --- a/gr-digital/python/qa_mpsk_snr_est.py +++ b/gr-digital/python/qa_mpsk_snr_est.py @@ -89,7 +89,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 |