diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-08-30 16:36:13 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-08-30 16:36:13 -0400 |
| commit | ea7cd530c1f9ba58c6d0582d6381b1ea1f104d6d (patch) | |
| tree | 4fd01772f22205f37c0db6108a6bc333e3afb72b /gr-digital/swig | |
| parent | 317e8321472cb9e921757636b561897b12199195 (diff) | |
| parent | ba3a3158456cfc866204071183ccdd773f0ab5a2 (diff) | |
Merge branch 'digital' of github.com:trondeau/gnuradio into digital
Diffstat (limited to 'gr-digital/swig')
| -rw-r--r-- | gr-digital/swig/digital_fll_band_edge_cc.i | 2 | ||||
| -rw-r--r-- | gr-digital/swig/digital_mpsk_receiver_cc.i | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/gr-digital/swig/digital_fll_band_edge_cc.i b/gr-digital/swig/digital_fll_band_edge_cc.i index f022bc7e18..3efcb89ed1 100644 --- a/gr-digital/swig/digital_fll_band_edge_cc.i +++ b/gr-digital/swig/digital_fll_band_edge_cc.i @@ -27,7 +27,7 @@ digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym int filter_size, float bandwidth); -class digital_fll_band_edge_cc : public gr_sync_block +class digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop { private: digital_fll_band_edge_cc (float samps_per_sym, float rolloff, diff --git a/gr-digital/swig/digital_mpsk_receiver_cc.i b/gr-digital/swig/digital_mpsk_receiver_cc.i index cdc9f661b5..b51411f6fb 100644 --- a/gr-digital/swig/digital_mpsk_receiver_cc.i +++ b/gr-digital/swig/digital_mpsk_receiver_cc.i @@ -23,16 +23,16 @@ GR_SWIG_BLOCK_MAGIC(digital,mpsk_receiver_cc); digital_mpsk_receiver_cc_sptr digital_make_mpsk_receiver_cc (unsigned int M, float theta, - float alpha, float beta, + float loop_bw, float fmin, float fmax, float mu, float gain_mu, float omega, float gain_omega, float omega_rel); -class digital_mpsk_receiver_cc : public gr_block +class digital_mpsk_receiver_cc : public gr_block, public gri_control_loop { private: digital_mpsk_receiver_cc (unsigned int M,float theta, - float alpha, float beta, + float loop_bw, float fmin, float fmax, float mu, float gain_mu, float omega, float gain_omega, float omega_rel); @@ -49,12 +49,4 @@ public: } void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; } void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; } - float alpha() const { return d_alpha; } - float beta() const { return d_beta; } - float freq() const { return d_freq; } - float phase() const { return d_phase; } - void set_alpha(float alpha) { d_alpha = alpha; } - void set_beta(float beta) { d_beta = beta; } - void set_freq(float freq) { d_freq = freq; } - void set_phase(float phase) { d_phase = phase; } }; |