diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-digital/include | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-digital/include')
4 files changed, 13 insertions, 13 deletions
diff --git a/gr-digital/include/gnuradio/digital/lfsr.h b/gr-digital/include/gnuradio/digital/lfsr.h index ce82f6f5e1..57bda3b0a6 100644 --- a/gr-digital/include/gnuradio/digital/lfsr.h +++ b/gr-digital/include/gnuradio/digital/lfsr.h @@ -52,12 +52,12 @@ namespace gr { * x^6 + x^5 + x^0 = 0x61 * * \param seed - the initialization vector placed into the - * register durring initialization. Low order bit + * register during initialization. Low order bit * corresponds to x^0 coefficient -- the first to be * shifted as output. * * \param reg_len - specifies the length of the feedback shift - * register to be used. Durring each iteration, the + * register to be used. During each iteration, the * register is rightshifted one and the new bit is * placed in bit reg_len. reg_len should generally be * at least order(mask) + 1 diff --git a/gr-digital/include/gnuradio/digital/simple_framer.h b/gr-digital/include/gnuradio/digital/simple_framer.h index f0588eb20e..cddb152ca3 100644 --- a/gr-digital/include/gnuradio/digital/simple_framer.h +++ b/gr-digital/include/gnuradio/digital/simple_framer.h @@ -36,7 +36,7 @@ namespace gr { * * \details * Takes in enough samples to create a full output frame. The - * frame is prepended with the GRSF_SYNC (defind in + * frame is prepended with the GRSF_SYNC (defined in * simple_framer_sync.h) and an 8-bit sequence number. */ class DIGITAL_API simple_framer : virtual public block diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h index dc856ecaf6..24cd0a14de 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h @@ -148,7 +148,7 @@ namespace gr { * \brief Returns the normalized approximate loop bandwidth. * * \details - * See the documenation for set_loop_bandwidth() for more details. + * See the documentation for set_loop_bandwidth() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -159,7 +159,7 @@ namespace gr { * \brief Returns the loop damping factor. * * \details - * See the documenation for set_damping_factor() for more details. + * See the documentation for set_damping_factor() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -171,7 +171,7 @@ namespace gr { * Detector. * * \details - * See the documenation for set_ted_gain() for more details. + * See the documentation for set_ted_gain() for more details. */ virtual float ted_gain() const = 0; @@ -179,7 +179,7 @@ namespace gr { * \brief Returns the PI filter proportional gain, alpha. * * \details - * See the documenation for set_alpha() for more details. + * See the documentation for set_alpha() for more details. */ virtual float alpha() const = 0; @@ -187,7 +187,7 @@ namespace gr { * \brief Returns the PI filter integral gain, beta. * * \details - * See the documenation for set_beta() for more details. + * See the documentation for set_beta() for more details. */ virtual float beta() const = 0; diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h index f551c0a96c..027ecca520 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h @@ -148,7 +148,7 @@ namespace gr { * \brief Returns the normalized approximate loop bandwidth. * * \details - * See the documenation for set_loop_bandwidth() for more details. + * See the documentation for set_loop_bandwidth() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -159,7 +159,7 @@ namespace gr { * \brief Returns the loop damping factor. * * \details - * See the documenation for set_damping_factor() for more details. + * See the documentation for set_damping_factor() for more details. * * Note that if set_alpha() or set_beta() were called to directly * set gains, the value returned by this method will be inaccurate/stale. @@ -171,7 +171,7 @@ namespace gr { * Detector. * * \details - * See the documenation for set_ted_gain() for more details. + * See the documentation for set_ted_gain() for more details. */ virtual float ted_gain() const = 0; @@ -179,7 +179,7 @@ namespace gr { * \brief Returns the PI filter proportional gain, alpha. * * \details - * See the documenation for set_alpha() for more details. + * See the documentation for set_alpha() for more details. */ virtual float alpha() const = 0; @@ -187,7 +187,7 @@ namespace gr { * \brief Returns the PI filter integral gain, beta. * * \details - * See the documenation for set_beta() for more details. + * See the documentation for set_beta() for more details. */ virtual float beta() const = 0; |