[Commit-gnuradio] [gnuradio] 05/12: dtv: atsc: adds controlport hooks to equalizer.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 994169c4e3bd5d484a5f9b2e32b3709d2226c66e
Author: Tom Rondeau <address@hidden>
Date:   Fri May 8 13:15:37 2015 -0400

    dtv: atsc: adds controlport hooks to equalizer.
    
    Can get equalizer taps and the equalized symbols out.
---
 gr-dtv/include/gnuradio/dtv/atsc_equalizer.h |  1 +
 gr-dtv/lib/atsc/atsc_equalizer_impl.cc       | 17 +++++++++++++++++
 gr-dtv/lib/atsc/atsc_equalizer_impl.h        |  1 +
 3 files changed, 19 insertions(+)

diff --git a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h 
b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
index 566dafc..17f2e8f 100644
--- a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
+++ b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h
@@ -47,6 +47,7 @@ namespace gr {
       static sptr make();
 
       virtual std::vector<float> taps() const = 0;
+      virtual std::vector<float> data() const = 0;
     };
 
   } /* namespace dtv */
diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.cc 
b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
index e2782a9..de01cea 100644
--- a/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
@@ -96,6 +96,13 @@ namespace gr {
       return d_taps;
     }
 
+    std::vector<float>
+    atsc_equalizer_impl::data() const
+    {
+      std::vector<float> ret(&data_mem2[0], 
&data_mem2[ATSC_DATA_SEGMENT_LENGTH-1]);
+      return ret;
+    }
+
     void
     atsc_equalizer_impl::filterN(const float *input_samples,
                                  float *output_samples,
@@ -206,6 +213,16 @@ namespace gr {
          pmt::make_f32vector(1,0),
          "", "Equalizer Taps", RPC_PRIVLVL_MIN,
           DISPTIME)));
+
+      add_rpc_variable(
+        rpcbasic_sptr(new rpcbasic_register_get<atsc_equalizer, 
std::vector<float> >(
+         alias(), "data",
+         &atsc_equalizer::data,
+         pmt::make_f32vector(1,-10),
+         pmt::make_f32vector(1,10),
+         pmt::make_f32vector(1,0),
+         "", "Post-equalizer Data", RPC_PRIVLVL_MIN,
+          DISPTIME)));
 #endif /* GR_CTRLPORT */
     }
 
diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.h 
b/gr-dtv/lib/atsc/atsc_equalizer_impl.h
index 3fcefc6..75862f6 100644
--- a/gr-dtv/lib/atsc/atsc_equalizer_impl.h
+++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.h
@@ -62,6 +62,7 @@ namespace gr {
       void setup_rpc();
 
       std::vector<float> taps() const;
+      std::vector<float> data() const;
 
       virtual int general_work(int noutput_items,
                                gr_vector_int &ninput_items,