diff options
| author | Josh Blum <josh@joshknows.com> | 2011-08-17 11:56:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-08-17 11:56:33 -0700 |
| commit | e6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f (patch) | |
| tree | 09f43f64f581af7b5159debaf7489365b0a1259d /gr-digital/swig/digital_swig.i | |
| parent | 40a9071074b2ec0f6daf74e50e131b89b9f66226 (diff) | |
| parent | ed564be6c78a3e22b3c98862834192f8b20bc551 (diff) | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h
gnuradio-core/src/lib/general/gr_pll_refout_cc.h
gr-digital/lib/digital_constellation_receiver_cb.cc
gr-digital/lib/digital_constellation_receiver_cb.h
gr-digital/lib/digital_costas_loop_cc.h
Diffstat (limited to 'gr-digital/swig/digital_swig.i')
| -rw-r--r-- | gr-digital/swig/digital_swig.i | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i index cfaadcaea4..0328ca2fcc 100644 --- a/gr-digital/swig/digital_swig.i +++ b/gr-digital/swig/digital_swig.i @@ -21,6 +21,8 @@ %include "gnuradio.i" +%include <gri_control_loop.i> + %{ #include "digital_binary_slicer_fb.h" #include "digital_clock_recovery_mm_cc.h" @@ -32,6 +34,7 @@ #include "digital_correlate_access_code_bb.h" #include "digital_costas_loop_cc.h" #include "digital_crc32.h" +#include "digital_fll_band_edge_cc.h" #include "digital_kurtotic_equalizer_cc.h" #include "digital_lms_dd_equalizer_cc.h" #include "digital_mpsk_receiver_cc.h" @@ -47,6 +50,7 @@ %include "digital_correlate_access_code_bb.i" %include "digital_costas_loop_cc.i" %include "digital_crc32.i" +%include "digital_fll_band_edge_cc.i" %include "digital_kurtotic_equalizer_cc.i" %include "digital_lms_dd_equalizer_cc.i" %include "digital_mpsk_receiver_cc.i" |