diff options
| author |   Nick Foster <bistromath@gmail.com> | 2021-03-09 11:58:53 -0800 |
|---|---|---|
| committer |   Martin Braun <martin@gnuradio.org> | 2021-03-10 14:00:16 -0800 |
| commit | d4897cec4e011821f82d268617fb0b5ef3c516e5 (patch) | |
| tree | 4f37def1f164ba773a0c6127ca89ec7f85637f94 /gr-digital | |
| parent | gr_filter : fix variable filter taps blocks (diff) | |
| download | gnuradio-d4897cec4e011821f82d268617fb0b5ef3c516e5.tar.xz gnuradio-d4897cec4e011821f82d268617fb0b5ef3c516e5.zip | |
gr-digital: Fix MSK timing error detector (issue #3678).
Signed-off-by: Nick Foster <bistromath@gmail.com>
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/lib/timing_error_detector.cc | 8 | ||||
| -rw-r--r-- | gr-digital/lib/timing_error_detector.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gr-digital/lib/timing_error_detector.cc b/gr-digital/lib/timing_error_detector.cc index e7a95dfc5..547687707 100644 --- a/gr-digital/lib/timing_error_detector.cc +++ b/gr-digital/lib/timing_error_detector.cc @@ -311,8 +311,8 @@ float ted_generalized_msk::compute_error_cf() { gr_complex u; - u = (d_input[0] * d_input[0] * conj(d_input[2] * d_input[2])) - - (d_input[1] * d_input[1] * conj(d_input[3] * d_input[3])); + u = (d_input[1] * d_input[1] * conj(d_input[5] * d_input[5])) - + (d_input[3] * d_input[3] * conj(d_input[7] * d_input[7])); return gr::branchless_clip(u.real(), 3.0f); } @@ -321,8 +321,8 @@ float ted_generalized_msk::compute_error_ff() { float u; - u = (d_input[0].real() * d_input[0].real() * d_input[2].real() * d_input[2].real()) - - (d_input[1].real() * d_input[1].real() * d_input[3].real() * d_input[3].real()); + u = (d_input[1].real() * d_input[1].real() * d_input[5].real() * d_input[5].real()) - + (d_input[3].real() * d_input[3].real() * d_input[7].real() * d_input[7].real()); return gr::branchless_clip(u, 3.0f); } diff --git a/gr-digital/lib/timing_error_detector.h b/gr-digital/lib/timing_error_detector.h index 7d11c9c99..a8fc0d84c 100644 --- a/gr-digital/lib/timing_error_detector.h +++ b/gr-digital/lib/timing_error_detector.h @@ -379,7 +379,7 @@ public: */ ted_generalized_msk() : timing_error_detector( - TED_DANDREA_AND_MENGALI_GEN_MSK, 2, 4, false, false, constellation_sptr()) + TED_DANDREA_AND_MENGALI_GEN_MSK, 4, 8, false, false, constellation_sptr()) { } ~ted_generalized_msk() override{}; |