diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-03 15:01:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-03 15:01:46 -0700 |
| commit | 41e1a272e6794feb4d58fed9807d409bd1930c01 (patch) | |
| tree | d254831fe61361eb52d1b6176873ca547ef32786 /gr-digital/lib/symbol_sync_ff_impl.cc | |
| parent | e776f1e7196a7543de240b88005b26a02a4c87af (diff) | |
| parent | f9dd0a8a347e97e08bc7644f0467e58dcaf1ca66 (diff) | |
Merge branch 'next' into python3
Conflicts:
grc/core/Param.py
grc/gui/Application.py
grc/gui/NotebookPage.py
Diffstat (limited to 'gr-digital/lib/symbol_sync_ff_impl.cc')
| -rw-r--r-- | gr-digital/lib/symbol_sync_ff_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc index 48509e4ba9..2497e52359 100644 --- a/gr-digital/lib/symbol_sync_ff_impl.cc +++ b/gr-digital/lib/symbol_sync_ff_impl.cc @@ -38,6 +38,7 @@ namespace gr { float sps, float loop_bw, float damping_factor, + float ted_gain, float max_deviation, int osps, constellation_sptr slicer, @@ -50,6 +51,7 @@ namespace gr { sps, loop_bw, damping_factor, + ted_gain, max_deviation, osps, slicer, @@ -63,6 +65,7 @@ namespace gr { float sps, float loop_bw, float damping_factor, + float ted_gain, float max_deviation, int osps, constellation_sptr slicer, @@ -146,7 +149,8 @@ namespace gr { sps + max_deviation, sps - max_deviation, sps, - damping_factor); + damping_factor, + ted_gain); // Timing Error Detector d_ted->sync_reset(); |