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-analog | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-analog')
| -rw-r--r-- | gr-analog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-analog/docs/CMakeLists.txt (renamed from gr-analog/doc/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-analog/docs/README.analog (renamed from gr-analog/doc/README.analog) | 0 | ||||
| -rw-r--r-- | gr-analog/docs/analog.dox (renamed from gr-analog/doc/analog.dox) | 0 | ||||
| -rw-r--r-- | gr-analog/include/gnuradio/analog/agc.h | 4 | ||||
| -rw-r--r-- | gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h | 2 | ||||
| -rw-r--r-- | gr-analog/include/gnuradio/analog/pll_freqdet_cf.h | 2 | ||||
| -rw-r--r-- | gr-analog/include/gnuradio/analog/pll_refout_cc.h | 2 | ||||
| -rw-r--r-- | gr-analog/python/analog/fm_emph.py | 4 |
9 files changed, 8 insertions, 8 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index 1255092f2..d874ae3cf 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -56,7 +56,7 @@ if(ENABLE_GR_ANALOG) ######################################################################## add_subdirectory(include/gnuradio/analog) add_subdirectory(lib) -add_subdirectory(doc) +add_subdirectory(docs) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python/analog) diff --git a/gr-analog/doc/CMakeLists.txt b/gr-analog/docs/CMakeLists.txt index 009c2d3dc..009c2d3dc 100644 --- a/gr-analog/doc/CMakeLists.txt +++ b/gr-analog/docs/CMakeLists.txt diff --git a/gr-analog/doc/README.analog b/gr-analog/docs/README.analog index 9e242878b..9e242878b 100644 --- a/gr-analog/doc/README.analog +++ b/gr-analog/docs/README.analog diff --git a/gr-analog/doc/analog.dox b/gr-analog/docs/analog.dox index b6ce1c247..b6ce1c247 100644 --- a/gr-analog/doc/analog.dox +++ b/gr-analog/docs/analog.dox diff --git a/gr-analog/include/gnuradio/analog/agc.h b/gr-analog/include/gnuradio/analog/agc.h index 44896250d..1e9759c45 100644 --- a/gr-analog/include/gnuradio/analog/agc.h +++ b/gr-analog/include/gnuradio/analog/agc.h @@ -25,7 +25,7 @@ #include <gnuradio/analog/api.h> #include <gnuradio/gr_complex.h> -#include <math.h> +#include <cmath> namespace gr { namespace analog { @@ -70,7 +70,7 @@ namespace gr { { gr_complex output = input * _gain; - _gain += _rate * (_reference - sqrt(output.real()*output.real() + + _gain += _rate * (_reference - std::sqrt(output.real()*output.real() + output.imag()*output.imag())); if(_max_gain > 0.0 && _gain > _max_gain) { _gain = _max_gain; diff --git a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index ce4170fff..dceb3a618 100644 --- a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -43,7 +43,7 @@ namespace gr { * input and outputs that signal, downconverted to DC * * All settings max_freq and min_freq are in terms of radians per - * sample, NOT HERTZ. The loop bandwidth determins the lock range + * sample, NOT HERTZ. The loop bandwidth determines the lock range * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ diff --git a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index 88eb46edc..a7bd654c9 100644 --- a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -42,7 +42,7 @@ namespace gr { * This PLL locks onto a [possibly noisy] reference carrier on * the input and outputs an estimate of that frequency in radians per sample. * All settings max_freq and min_freq are in terms of radians per sample, - * NOT HERTZ. The loop bandwidth determins the lock range and should be set + * NOT HERTZ. The loop bandwidth determines the lock range and should be set * around pi/200 -- 2pi/100. * \sa pll_refout_cc, pll_carriertracking_cc */ diff --git a/gr-analog/include/gnuradio/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index 9f9d16811..c73be9430 100644 --- a/gr-analog/include/gnuradio/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -43,7 +43,7 @@ namespace gr { * aligned to it. * * All settings max_freq and min_freq are in terms of radians per - * sample, NOT HERTZ. The loop bandwidth determins the lock range + * sample, NOT HERTZ. The loop bandwidth determines the lock range * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ diff --git a/gr-analog/python/analog/fm_emph.py b/gr-analog/python/analog/fm_emph.py index bfa4742ac..348fb172d 100644 --- a/gr-analog/python/analog/fm_emph.py +++ b/gr-analog/python/analog/fm_emph.py @@ -61,7 +61,7 @@ import cmath # The digital deemphasis filter design below, uses the # "bilinear transformation" method of designing digital filters: # -# 1. Convert digitial specifications into the analog domain, by prewarping +# 1. Convert digital specifications into the analog domain, by prewarping # digital frequency specifications into analog frequencies. # # w_a = (2/T)tan(wT/2) @@ -206,7 +206,7 @@ class fm_deemph(gr.hier_block2): # The digital preemphasis filter design below, uses the # "bilinear transformation" method of designing digital filters: # -# 1. Convert digitial specifications into the analog domain, by prewarping +# 1. Convert digital specifications into the analog domain, by prewarping # digital frequency specifications into analog frequencies. # # w_a = (2/T)tan(wT/2) |