[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit b96a96e039ec033bcf577c0a4f5b1f24cee6feef
Merge: b7a38bf 77550c7
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 10 08:31:43 2017 -0700

    Merge branch 'master' into next

 ...ml => digital_correlate_access_code_tag_xx.xml} |  23 +++-
 gr-digital/include/gnuradio/digital/CMakeLists.txt |   1 +
 .../digital/correlate_access_code_tag_ff.h         |  72 +++++++++++
 gr-digital/lib/CMakeLists.txt                      |   1 +
 .../lib/correlate_access_code_tag_ff_impl.cc       | 135 +++++++++++++++++++++
 gr-digital/lib/correlate_access_code_tag_ff_impl.h |  61 ++++++++++
 .../python/digital/qa_correlate_access_code.py     |  20 ++-
 .../python/digital/qa_correlate_access_code_tag.py |  38 +++++-
 gr-digital/swig/digital_swig0.i                    |   3 +
 9 files changed, 345 insertions(+), 9 deletions(-)

diff --cc gr-digital/include/gnuradio/digital/CMakeLists.txt
index 2b5aa85,911187c..9074df4
--- a/gr-digital/include/gnuradio/digital/CMakeLists.txt
+++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt
@@@ -46,8 -46,10 +46,9 @@@ install(FILE
      corr_est_cc.h
      correlate_access_code_bb.h
      correlate_access_code_tag_bb.h
+     correlate_access_code_tag_ff.h
      correlate_access_code_bb_ts.h
      correlate_access_code_ff_ts.h
 -    correlate_and_sync_cc.h
      costas_loop_cc.h
      cpmmod_bc.h
      crc32.h
diff --cc gr-digital/lib/CMakeLists.txt
index 7d7ffda,9df6808..838a14a
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@@ -62,8 -62,10 +62,9 @@@ list(APPEND digital_source
      corr_est_cc_impl.cc
      correlate_access_code_bb_impl.cc
      correlate_access_code_tag_bb_impl.cc
+     correlate_access_code_tag_ff_impl.cc
      correlate_access_code_bb_ts_impl.cc
      correlate_access_code_ff_ts_impl.cc
 -    correlate_and_sync_cc_impl.cc
      costas_loop_cc_impl.cc
      cpmmod_bc_impl.cc
      crc32.cc
diff --cc gr-digital/swig/digital_swig0.i
index 4741cc0,0f0652f..ac8d93c
--- a/gr-digital/swig/digital_swig0.i
+++ b/gr-digital/swig/digital_swig0.i
@@@ -46,8 -46,10 +46,9 @@@
  #include "gnuradio/digital/corr_est_cc.h"
  #include "gnuradio/digital/correlate_access_code_bb.h"
  #include "gnuradio/digital/correlate_access_code_tag_bb.h"
+ #include "gnuradio/digital/correlate_access_code_tag_ff.h"
  #include "gnuradio/digital/correlate_access_code_bb_ts.h"
  #include "gnuradio/digital/correlate_access_code_ff_ts.h"
 -#include "gnuradio/digital/correlate_and_sync_cc.h"
  #include "gnuradio/digital/costas_loop_cc.h"
  #include "gnuradio/digital/cpmmod_bc.h"
  #include "gnuradio/digital/crc32.h"
@@@ -75,8 -82,10 +76,9 @@@
  %include "gnuradio/digital/corr_est_cc.h"
  %include "gnuradio/digital/correlate_access_code_bb.h"
  %include "gnuradio/digital/correlate_access_code_tag_bb.h"
+ %include "gnuradio/digital/correlate_access_code_tag_ff.h"
  %include "gnuradio/digital/correlate_access_code_bb_ts.h"
  %include "gnuradio/digital/correlate_access_code_ff_ts.h"
 -%include "gnuradio/digital/correlate_and_sync_cc.h"
  %include "gnuradio/digital/costas_loop_cc.h"
  %include "gnuradio/digital/cpmmod_bc.h"
  %include "gnuradio/digital/crc32.h"
@@@ -102,8 -116,10 +104,9 @@@ GR_SWIG_BLOCK_MAGIC2(digital, constella
  GR_SWIG_BLOCK_MAGIC2(digital, corr_est_cc);
  GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_bb);
  GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_tag_bb);
+ GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_tag_ff);
  GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_bb_ts);
  GR_SWIG_BLOCK_MAGIC2(digital, correlate_access_code_ff_ts);
 -GR_SWIG_BLOCK_MAGIC2(digital, correlate_and_sync_cc);
  GR_SWIG_BLOCK_MAGIC2(digital, costas_loop_cc);
  GR_SWIG_BLOCK_MAGIC2(digital, crc32_bb);
  GR_SWIG_BLOCK_MAGIC2(digital, crc32_async_bb);