diff options
author | Martin Braun <martin.braun@kit.edu> | 2013-03-15 02:12:20 -0700 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-16 23:52:19 -0400 |
commit | 7fd15b67afa5abd20c0982bdd6bcb7191831bf73 (patch) | |
tree | 3bd525f2850e662a9ccfe0a6c286ff7c20ad57e3 /gr-analog/swig | |
parent | 34216336205ba3edc0bc308a8da9ad388f3d0774 (diff) |
Squash/rebased martin/ofdm-master onto trial merge branch
Conflicts:
gr-blocks/include/blocks/CMakeLists.txt
Diffstat (limited to 'gr-analog/swig')
-rw-r--r-- | gr-analog/swig/analog_swig.i | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i index 016537c949..ca9220f4c6 100644 --- a/gr-analog/swig/analog_swig.i +++ b/gr-analog/swig/analog_swig.i @@ -65,6 +65,7 @@ #include "analog/simple_squelch_cc.h" #include "analog/squelch_base_cc.h" #include "analog/squelch_base_ff.h" +#include "analog/plateau_detector_fb.h" %} %include "analog/cpm.h" @@ -135,3 +136,5 @@ GR_SWIG_BLOCK_MAGIC2(analog, sig_source_i); GR_SWIG_BLOCK_MAGIC2(analog, sig_source_f); GR_SWIG_BLOCK_MAGIC2(analog, sig_source_c); GR_SWIG_BLOCK_MAGIC2(analog, simple_squelch_cc); +%include "analog/plateau_detector_fb.h" +GR_SWIG_BLOCK_MAGIC2(analog, plateau_detector_fb); |