diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-07-06 18:10:20 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-07-06 18:11:08 -0400 |
| commit | ee59ee2864254fc6a6788083fcaae46bea2fa877 (patch) | |
| tree | 0c0ced979cc33b625fde5fc996b73dadf036db81 /gr-digital | |
| parent | 491e6b0b94e4973ee9b763f85fabda578fbe7f92 (diff) | |
digital: updated CPM and GMSK modulators to use blocks out of gr-filter.
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/include/digital_cpmmod_bc.h | 7 | ||||
| -rw-r--r-- | gr-digital/include/digital_gmskmod_bc.h | 5 | ||||
| -rw-r--r-- | gr-digital/lib/digital_cpmmod_bc.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/digital_gmskmod_bc.cc | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/gr-digital/include/digital_cpmmod_bc.h b/gr-digital/include/digital_cpmmod_bc.h index f0f11ee30e..55837230cb 100644 --- a/gr-digital/include/digital_cpmmod_bc.h +++ b/gr-digital/include/digital_cpmmod_bc.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,10 +26,9 @@ #include <digital_api.h> #include <gr_hier_block2.h> #include <gr_char_to_float.h> -#include <gr_interp_fir_filter_fff.h> #include <gr_frequency_modulator_fc.h> #include <gr_cpm.h> - +#include <filter/interp_fir_filter_fff.h> class digital_cpmmod_bc; typedef boost::shared_ptr<digital_cpmmod_bc> digital_cpmmod_bc_sptr; @@ -81,7 +80,7 @@ class DIGITAL_API digital_cpmmod_bc : public gr_hier_block2 std::vector<float> d_taps; gr_char_to_float_sptr d_char_to_float; - gr_interp_fir_filter_fff_sptr d_pulse_shaper; + gr::filter::interp_fir_filter_fff::sptr d_pulse_shaper; gr_frequency_modulator_fc_sptr d_fm; protected: diff --git a/gr-digital/include/digital_gmskmod_bc.h b/gr-digital/include/digital_gmskmod_bc.h index 9f378c8a70..b47f35879f 100644 --- a/gr-digital/include/digital_gmskmod_bc.h +++ b/gr-digital/include/digital_gmskmod_bc.h @@ -53,8 +53,9 @@ digital_make_gmskmod_bc(unsigned samples_per_sym=2, */ class DIGITAL_API digital_gmskmod_bc : public digital_cpmmod_bc { - friend DIGITAL_API digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym, - double bt, unsigned L); + friend DIGITAL_API digital_gmskmod_bc_sptr + digital_make_gmskmod_bc(unsigned samples_per_sym, + double bt, unsigned L); digital_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L); }; diff --git a/gr-digital/lib/digital_cpmmod_bc.cc b/gr-digital/lib/digital_cpmmod_bc.cc index a95b604d14..35695ae34d 100644 --- a/gr-digital/lib/digital_cpmmod_bc.cc +++ b/gr-digital/lib/digital_cpmmod_bc.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010,2012 Free Software Foundation, Inc. * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ digital_cpmmod_bc::digital_cpmmod_bc(gr_cpm::cpm_type type, float h, gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))), d_taps(gr_cpm::phase_response(type, samples_per_sym, L, beta)), d_char_to_float(gr_make_char_to_float()), - d_pulse_shaper(gr_make_interp_fir_filter_fff(samples_per_sym, d_taps)), + d_pulse_shaper(gr::filter::interp_fir_filter_fff::make(samples_per_sym, d_taps)), d_fm(gr_make_frequency_modulator_fc(M_PI * h)) { switch (type) { diff --git a/gr-digital/lib/digital_gmskmod_bc.cc b/gr-digital/lib/digital_gmskmod_bc.cc index e53e900370..146293d824 100644 --- a/gr-digital/lib/digital_gmskmod_bc.cc +++ b/gr-digital/lib/digital_gmskmod_bc.cc @@ -32,7 +32,8 @@ digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L) { - return gnuradio::get_initial_sptr(new digital_gmskmod_bc(samples_per_sym, bt, L)); + return gnuradio::get_initial_sptr + (new digital_gmskmod_bc(samples_per_sym, bt, L)); } |