diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 22:16:12 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 22:16:12 -0400 |
| commit | d03481a18f37fe249f0db216fb063f0c4efd3b61 (patch) | |
| tree | 4d8418f328cb9ff396d1145debf5179cf38aad05 | |
| parent | e07ecb74fe554ecf818e1ae1408cc15f1bafe748 (diff) | |
fixed pmt and other generic_mod_demod for recent changes.
| -rw-r--r-- | gnuradio-runtime/swig/pmt_swig.i | 10 | ||||
| -rw-r--r-- | gr-digital/python/generic_mod_demod.py | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gnuradio-runtime/swig/pmt_swig.i b/gnuradio-runtime/swig/pmt_swig.i index 11e9c96d81..d05a0b48a6 100644 --- a/gnuradio-runtime/swig/pmt_swig.i +++ b/gnuradio-runtime/swig/pmt_swig.i @@ -45,8 +45,18 @@ %include <gr_extras.i> +%include <std_complex.i> %include <std_vector.i> +%template(pmt_vector_int8) std::vector<int8_t>; +%template(pmt_vector_uint8) std::vector<uint8_t>; +%template(pmt_vector_int16) std::vector<int16_t>; +%template(pmt_vector_uint16) std::vector<uint16_t>; +%template(pmt_vector_int32) std::vector<int32_t>; %template(pmt_vector_uint32) std::vector<uint32_t>; +%template(pmt_vector_float) std::vector<float>; +%template(pmt_vector_double) std::vector<double>; +%template(pmt_vector_cfloat) std::vector< std::complex<float> >; +%template(pmt_vector_cdouble) std::vector< std::complex<double> >; //////////////////////////////////////////////////////////////////////// // Language independent exception handler diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py index b812fe1c37..92329e3fab 100644 --- a/gr-digital/python/generic_mod_demod.py +++ b/gr-digital/python/generic_mod_demod.py @@ -274,7 +274,7 @@ class generic_demod(gr.hier_block2): ntaps = 11 * int(self._samples_per_symbol*nfilts) # Automatic gain control - self.agc = analog.agc2_cc(0.6e-1, 1e-3, 1, 1, 100) + self.agc = analog.agc2_cc(0.6e-1, 1e-3, 1, 1) # Frequency correction fll_ntaps = 55 |