diff options
| author | Volker Schroer <3470424+dl1ksv@users.noreply.github.com> | 2019-05-07 18:08:20 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-06-18 23:06:17 -0700 |
| commit | e1053e44c2ed76c94c33187c44f1562e43a5fc1d (patch) | |
| tree | 18f0ba901c9d974c4e6c93d9ce96cf78705205f3 | |
| parent | 542a17226c94eefdf056599397550d048fbd3472 (diff) | |
digital: Move enum tm_type from digital.core_est_cc to digital
6 files changed, 10 insertions, 10 deletions
diff --git a/gr-digital/examples/packet/example_corr_est.grc b/gr-digital/examples/packet/example_corr_est.grc index d889f8a291..bc9e5c85ed 100644 --- a/gr-digital/examples/packet/example_corr_est.grc +++ b/gr-digital/examples/packet/example_corr_est.grc @@ -347,7 +347,7 @@ blocks: sps: sps symbols: modulated_sync_word threshold: '0.999' - threshold_method: digital.corr_est_cc.THRESHOLD_ABSOLUTE + threshold_method: digital.THRESHOLD_ABSOLUTE states: coordinate: [264, 211] rotation: 0 diff --git a/gr-digital/examples/packet/example_corr_est_and_clock_sync.grc b/gr-digital/examples/packet/example_corr_est_and_clock_sync.grc index 092ce58622..916a3fe874 100644 --- a/gr-digital/examples/packet/example_corr_est_and_clock_sync.grc +++ b/gr-digital/examples/packet/example_corr_est_and_clock_sync.grc @@ -365,7 +365,7 @@ blocks: sps: sps symbols: modulated_sync_word threshold: '0.999' - threshold_method: digital.corr_est_cc.THRESHOLD_ABSOLUTE + threshold_method: digital.THRESHOLD_ABSOLUTE states: coordinate: [264, 211] rotation: 0 diff --git a/gr-digital/examples/packet/example_corr_est_and_phase_sync.grc b/gr-digital/examples/packet/example_corr_est_and_phase_sync.grc index d1467f30d5..0874d6d42b 100644 --- a/gr-digital/examples/packet/example_corr_est_and_phase_sync.grc +++ b/gr-digital/examples/packet/example_corr_est_and_phase_sync.grc @@ -365,7 +365,7 @@ blocks: sps: sps symbols: modulated_sync_word threshold: '0.999' - threshold_method: digital.corr_est_cc.THRESHOLD_ABSOLUTE + threshold_method: digital.THRESHOLD_ABSOLUTE states: coordinate: [264, 211] rotation: 0 diff --git a/gr-digital/examples/packet/packet_rx.grc b/gr-digital/examples/packet/packet_rx.grc index 0cee621422..9e57e26f13 100644 --- a/gr-digital/examples/packet/packet_rx.grc +++ b/gr-digital/examples/packet/packet_rx.grc @@ -199,7 +199,7 @@ blocks: sps: sps symbols: modulated_sync_word threshold: '0.999' - threshold_method: digital.corr_est_cc.THRESHOLD_ABSOLUTE + threshold_method: digital.THRESHOLD_ABSOLUTE states: coordinate: [144, 308.0] rotation: 0 diff --git a/gr-digital/grc/digital_corr_est_cc.block.yml b/gr-digital/grc/digital_corr_est_cc.block.yml index 5d7730f3c1..c32952b53f 100644 --- a/gr-digital/grc/digital_corr_est_cc.block.yml +++ b/gr-digital/grc/digital_corr_est_cc.block.yml @@ -19,7 +19,7 @@ parameters: - id: threshold_method label: Threshold Method dtype: enum - options: [digital.corr_est_cc.THRESHOLD_ABSOLUTE, digital.corr_est_cc.THRESHOLD_DYNAMIC] + options: [digital.THRESHOLD_ABSOLUTE, digital.THRESHOLD_DYNAMIC] option_labels: [Absolute, Dynamic] inputs: diff --git a/gr-digital/include/gnuradio/digital/corr_est_cc.h b/gr-digital/include/gnuradio/digital/corr_est_cc.h index f61b62636e..a861b0dc05 100644 --- a/gr-digital/include/gnuradio/digital/corr_est_cc.h +++ b/gr-digital/include/gnuradio/digital/corr_est_cc.h @@ -82,16 +82,16 @@ namespace gr { * _on_Signal_Processing_, Volume 47, No. 9, September 1999 * */ + typedef enum { + THRESHOLD_DYNAMIC, + THRESHOLD_ABSOLUTE, + } tm_type; + class DIGITAL_API corr_est_cc : virtual public sync_block { public: typedef boost::shared_ptr<corr_est_cc> sptr; - enum tm_type { - THRESHOLD_DYNAMIC, - THRESHOLD_ABSOLUTE, - }; - /*! * Make a block that correlates against the \p symbols vector * and outputs a phase and symbol timing estimate. |