diff options
| author | Johnathan Corgan | 2012-03-13 17:38:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-13 17:38:12 -0700 |
| commit | 62c6323bdb06d7d3f103d3a75265d45ae6ce00b4 (patch) | |
| tree | 7f995aba5eb3f2e0bfeac3a4114307fd2c5a6f3a /gr-digital/lib | |
| parent | 83c6ee03ada6a44788421ebfe813b7d594fc8a7a (diff) | |
| parent | 8e013157752f1b42665430fde0f1c6f7d7147153 (diff) | |
| download | gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.tar.gz gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.tar.bz2 gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.zip | |
Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-register
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/digital_mpsk_receiver_cc.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gr-digital/lib/digital_mpsk_receiver_cc.cc b/gr-digital/lib/digital_mpsk_receiver_cc.cc index 363b86c9f..6d2bab8a4 100644 --- a/gr-digital/lib/digital_mpsk_receiver_cc.cc +++ b/gr-digital/lib/digital_mpsk_receiver_cc.cc @@ -85,7 +85,18 @@ digital_mpsk_receiver_cc::digital_mpsk_receiver_cc (unsigned int M, float theta, // zero double length delay line. for (unsigned int i = 0; i < 2 * DLLEN; i++) d_dl[i] = gr_complex(0.0,0.0); + + set_modulation_order(d_M); +} + +digital_mpsk_receiver_cc::~digital_mpsk_receiver_cc () +{ + delete d_interp; +} +void +digital_mpsk_receiver_cc::set_modulation_order(unsigned int M) +{ // build the constellation vector from M make_constellation(); @@ -108,9 +119,11 @@ digital_mpsk_receiver_cc::digital_mpsk_receiver_cc (unsigned int M, float theta, } } -digital_mpsk_receiver_cc::~digital_mpsk_receiver_cc () +void +digital_mpsk_receiver_cc::set_gain_omega_rel(float omega_rel) { - delete d_interp; + d_omega_rel = omega_rel; + set_omega(d_omega); } void |