summaryrefslogtreecommitdiff
path: root/gr-digital/swig
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2011-08-10 22:35:17 -0400
committerTom Rondeau <trondeau@vt.edu>2011-08-10 22:35:17 -0400
commit612be3956603941f6cf530c090eba02d26d33bcd (patch)
tree069e98637f03cabfd11c85d5759d0a15268e9471 /gr-digital/swig
parentaed7404ad43d5e0c5dd2c79a7d205ea6748cff28 (diff)
digital: updated constellation receiver to use loop bandwidth and damping factor instead of setting alpha and beta independently. Also cleaning up Costas loop a bit more.
Diffstat (limited to 'gr-digital/swig')
-rw-r--r--gr-digital/swig/digital_constellation_receiver_cb.i27
1 files changed, 15 insertions, 12 deletions
diff --git a/gr-digital/swig/digital_constellation_receiver_cb.i b/gr-digital/swig/digital_constellation_receiver_cb.i
index ad17ef3713..e4be5f39f1 100644
--- a/gr-digital/swig/digital_constellation_receiver_cb.i
+++ b/gr-digital/swig/digital_constellation_receiver_cb.i
@@ -26,22 +26,25 @@ GR_SWIG_BLOCK_MAGIC(digital,constellation_receiver_cb);
digital_constellation_receiver_cb_sptr
digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
- float alpha, float beta,
- float fmin, float fmax);
+ float loop_bw, float fmin, float fmax);
class digital_constellation_receiver_cb : public gr_block
{
private:
digital_constellation_receiver_cb (digital_contellation_sptr constellation,
- float alpha, float beta,
- float fmin, float fmax);
+ float loop_bw, float fmin, float fmax);
public:
- 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; }
+ void set_loop_bandwidth(float bw);
+ void set_damping_factor(float df);
+ void set_alpha(float alpha);
+ void set_beta(float beta);
+ void set_frequency(float freq);
+ void set_phase(float phase);
+
+ float get_loop_bandwidth() const;
+ float get_damping_factor() const;
+ float get_alpha() const;
+ float get_beta() const;
+ float get_frequency() const;
+ float get_phase() const;
};