diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:39:09 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:39:09 -0700 |
commit | 6fa9d33246251f44a0e78682e50e9a1cb0b03171 (patch) | |
tree | 513fed9b2dfb49f9c3fbb2a7a98526d27927c166 /gr-digital | |
parent | 07a0ca6c3664669f85faeee00fa69d2af3a7b59f (diff) | |
parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) |
Merge branch 'next' into python3
Diffstat (limited to 'gr-digital')
-rw-r--r-- | gr-digital/examples/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gr-digital/swig/digital_swig1.i | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt index 99c0712722..2cc4735c41 100644 --- a/gr-digital/examples/CMakeLists.txt +++ b/gr-digital/examples/CMakeLists.txt @@ -78,6 +78,7 @@ install( demod/pam_timing.grc demod/symbol_sync_test_complex.grc demod/symbol_sync_test_float.grc + demod/symbol_sync_test_float_ted_gain.m demod/test_corr_est.grc DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/demod ) diff --git a/gr-digital/swig/digital_swig1.i b/gr-digital/swig/digital_swig1.i index 972ddf5cb2..6d19da0328 100644 --- a/gr-digital/swig/digital_swig1.i +++ b/gr-digital/swig/digital_swig1.i @@ -1,5 +1,5 @@ /* - * Copyright 2016 Free Software Foundation, Inc. + * Copyright 2016,2017 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -53,6 +53,7 @@ #include "gnuradio/digital/diff_phasor_cc.h" #include "gnuradio/digital/fll_band_edge_cc.h" #include "gnuradio/digital/framer_sink_1.h" +#include "gnuradio/digital/glfsr.h" #include "gnuradio/digital/glfsr_source_b.h" #include "gnuradio/digital/glfsr_source_f.h" #include "gnuradio/digital/hdlc_deframer_bp.h" @@ -82,6 +83,7 @@ %include "gnuradio/digital/diff_phasor_cc.h" %include "gnuradio/digital/fll_band_edge_cc.h" %include "gnuradio/digital/framer_sink_1.h" +%include "gnuradio/digital/glfsr.h" %include "gnuradio/digital/glfsr_source_b.h" %include "gnuradio/digital/glfsr_source_f.h" %include "gnuradio/digital/hdlc_deframer_bp.h" |