diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-08-14 22:32:01 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-08-14 22:32:01 -0400 |
| commit | ed564be6c78a3e22b3c98862834192f8b20bc551 (patch) | |
| tree | c566277b3a39699669eb684156d09aedae1925be /gr-digital/swig | |
| parent | 7e47bddafc6b27c623137c6d76f460e608952fcc (diff) | |
digital: cleaned up Costas loop code by switching over to the gri_control_loop class to handle the inner loop. Had to add it to digital_swig.i to properly wrap the parent functions into Python.
Diffstat (limited to 'gr-digital/swig')
| -rw-r--r-- | gr-digital/swig/digital_costas_loop_cc.i | 18 | ||||
| -rw-r--r-- | gr-digital/swig/digital_swig.i | 2 |
2 files changed, 3 insertions, 17 deletions
diff --git a/gr-digital/swig/digital_costas_loop_cc.i b/gr-digital/swig/digital_costas_loop_cc.i index f6e2765626..ab09200a0a 100644 --- a/gr-digital/swig/digital_costas_loop_cc.i +++ b/gr-digital/swig/digital_costas_loop_cc.i @@ -26,24 +26,8 @@ digital_costas_loop_cc_sptr digital_make_costas_loop_cc (float loop_bw, int order ) throw (std::invalid_argument); - -class digital_costas_loop_cc : public gr_sync_block +class digital_costas_loop_cc : public gr_sync_block, public gri_control_loop { private: digital_costas_loop_cc (float loop_bw, int order); - - public: - 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; }; diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i index 9703aeeda8..0328ca2fcc 100644 --- a/gr-digital/swig/digital_swig.i +++ b/gr-digital/swig/digital_swig.i @@ -21,6 +21,8 @@ %include "gnuradio.i" +%include <gri_control_loop.i> + %{ #include "digital_binary_slicer_fb.h" #include "digital_clock_recovery_mm_cc.h" |