diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 17:12:06 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 17:12:06 -0400 |
| commit | 59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb (patch) | |
| tree | 8c399ba425fdf1845e677882d073fbc14d2a8b9d /gnuradio-core/src/lib/general | |
| parent | 1cd15f64cb2b53219133bcb3821f76ecd2582ff5 (diff) | |
| parent | ac9430cd39bf12395952ca49b1966ec428fdadf3 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/CMakeLists.txt
gr-digital/include/digital_additive_scrambler_bb.h
gr-digital/include/digital_descrambler_bb.h
gr-digital/include/digital_scrambler_bb.h
gr-digital/lib/CMakeLists.txt
Conflicts were for adding dependency on gr-analog.
additive_scrambler_bb_impl, descrambler_bb_impl, and scrambler_bb_impl were update to use LFSR from gr-analog.
Diffstat (limited to 'gnuradio-core/src/lib/general')
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_control_loop.cc | 23 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_control_loop.h | 39 |
2 files changed, 56 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/general/gri_control_loop.cc b/gnuradio-core/src/lib/general/gri_control_loop.cc index 5a93737f92..bb3c4a3263 100644 --- a/gnuradio-core/src/lib/general/gri_control_loop.cc +++ b/gnuradio-core/src/lib/general/gri_control_loop.cc @@ -144,6 +144,17 @@ gri_control_loop::set_phase(float phase) d_phase += M_TWOPI; } +void +gri_control_loop::set_max_freq(float freq) +{ + d_max_freq = freq; +} + +void +gri_control_loop::set_min_freq(float freq) +{ + d_min_freq = freq; +} /******************************************************************* GET FUNCTIONS @@ -185,3 +196,15 @@ gri_control_loop::get_phase() const { return d_phase; } + +float +gri_control_loop::get_max_freq() const +{ + return d_max_freq; +} + +float +gri_control_loop::get_min_freq() const +{ + return d_min_freq; +} diff --git a/gnuradio-core/src/lib/general/gri_control_loop.h b/gnuradio-core/src/lib/general/gri_control_loop.h index f10bc76be2..46aa6ae243 100644 --- a/gnuradio-core/src/lib/general/gri_control_loop.h +++ b/gnuradio-core/src/lib/general/gri_control_loop.h @@ -142,9 +142,9 @@ class GR_CORE_API gri_control_loop void set_beta(float beta); /*! - * \brief Set the Costas loop's frequency. + * \brief Set the control loop's frequency. * - * Set's the Costas Loop's frequency. While this is normally updated by the + * Set's the control loop's frequency. While this is normally updated by the * inner loop of the algorithm, it could be useful to manually initialize, * set, or reset this under certain circumstances. * @@ -154,9 +154,9 @@ class GR_CORE_API gri_control_loop void set_frequency(float freq); /*! - * \brief Set the Costas loop's phase. + * \brief Set the control loop's phase. * - * Set's the Costas Loop's phase. While this is normally updated by the + * Set's the control loop's phase. While this is normally updated by the * inner loop of the algorithm, it could be useful to manually initialize, * set, or reset this under certain circumstances. * @@ -165,6 +165,23 @@ class GR_CORE_API gri_control_loop */ void set_phase(float phase); + /*! + * \brief Set the control loop's maximum frequency. + * + * Set the maximum frequency the control loop can track. + * + * \param freq (float) new max frequency + */ + void set_max_freq(float freq); + + /*! + * \brief Set the control loop's minimum frequency. + * + * Set the minimum frequency the control loop can track. + * + * \param freq (float) new min frequency + */ + void set_min_freq(float freq); /******************************************************************* GET FUNCTIONS @@ -191,14 +208,24 @@ class GR_CORE_API gri_control_loop float get_beta() const; /*! - * \brief Get the Costas loop's frequency estimate + * \brief Get the control loop's frequency estimate */ float get_frequency() const; /*! - * \brief Get the Costas loop's phase estimate + * \brief Get the control loop's phase estimate */ float get_phase() const; + + /*! + * \brief Get the control loop's maximum frequency. + */ + float get_max_freq() const; + + /*! + * \brief Get the control loop's minimum frequency. + */ + float get_min_freq() const; }; #endif /* GRI_CONTROL_LOOP */ |