summaryrefslogtreecommitdiff
path: root/gr-digital/swig
diff options
context:
space:
mode:
authorJohnathan Corgan2012-03-13 17:38:12 -0700
committerJohnathan Corgan2012-03-13 17:38:12 -0700
commit62c6323bdb06d7d3f103d3a75265d45ae6ce00b4 (patch)
tree7f995aba5eb3f2e0bfeac3a4114307fd2c5a6f3a /gr-digital/swig
parent83c6ee03ada6a44788421ebfe813b7d594fc8a7a (diff)
parent8e013157752f1b42665430fde0f1c6f7d7147153 (diff)
downloadgnuradio-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/swig')
-rw-r--r--gr-digital/swig/digital_mpsk_receiver_cc.i5
1 files changed, 5 insertions, 0 deletions
diff --git a/gr-digital/swig/digital_mpsk_receiver_cc.i b/gr-digital/swig/digital_mpsk_receiver_cc.i
index b51411f6f..2338a1854 100644
--- a/gr-digital/swig/digital_mpsk_receiver_cc.i
+++ b/gr-digital/swig/digital_mpsk_receiver_cc.i
@@ -37,16 +37,21 @@ class digital_mpsk_receiver_cc : public gr_block, public gri_control_loop
float mu, float gain_mu,
float omega, float gain_omega, float omega_rel);
public:
+ float modulation_order() const { return d_M; }
float mu() const { return d_mu;}
float omega() const { return d_omega;}
float gain_mu() const { return d_gain_mu;}
float gain_omega() const { return d_gain_omega;}
+ float gain_omega_rel() const {return d_omega_rel; }
+ void set_modulation_order(unsigned int M);
void set_mu (float mu) { d_mu = mu; }
void set_omega (float omega) {
d_omega = omega;
d_min_omega = omega*(1.0 - d_omega_rel);
d_max_omega = omega*(1.0 + d_omega_rel);
}
+ void set_theta(float theta) { d_theta = theta; }
void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; }
void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
+ void set_gain_omega_rel(float omega_rel);
};