[Commit-gnuradio] [gnuradio] 03/09: digital: addresses issue #876.

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 5441f350c563a92d9eb741eb51d7689fdcf1090f
Author: Tom Rondeau <address@hidden>
Date:   Wed Jan 27 05:29:07 2016 -0500

    digital: addresses issue #876.
    
    The constellation receiver controlport interface was modeled after the
    costas_loop_cc block, but the inheritance of the two blocks to
    control_loop was different. This changes the inheritance of
    constellation_reciever_cb.
    
    It also fixes the name of the "loop_bw" parameter to be consistent
    between the set and get ControlPort interfaces.
---
 gr-digital/include/gnuradio/digital/constellation_receiver_cb.h | 4 +++-
 gr-digital/lib/constellation_receiver_cb_impl.cc                | 3 +--
 gr-digital/lib/constellation_receiver_cb_impl.h                 | 3 +--
 gr-digital/lib/costas_loop_cc_impl.cc                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h 
b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
index 36cfd57..af00c36 100644
--- a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
+++ b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
@@ -25,6 +25,7 @@
 
 #include <gnuradio/digital/api.h>
 #include <gnuradio/digital/constellation.h>
+#include <gnuradio/blocks/control_loop.h>
 #include <gnuradio/block.h>
 
 namespace gr {
@@ -55,7 +56,8 @@ namespace gr {
      *    current phase of the receiver.
      */
     class DIGITAL_API constellation_receiver_cb
-      : virtual public block
+      : virtual public block,
+        virtual public blocks::control_loop
     {
     public:
       // gr::digital::constellation_receiver_cb::sptr
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc 
b/gr-digital/lib/constellation_receiver_cb_impl.cc
index 01a9201..97c4d83 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.cc
+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc
@@ -217,7 +217,7 @@ namespace gr {
       // Setters
       add_rpc_variable(
           rpcbasic_sptr(new rpcbasic_register_set<control_loop, float>(
-             alias(), "loop bw",
+             alias(), "loop_bw",
              &control_loop::set_loop_bandwidth,
              pmt::mp(0.0f), pmt::mp(1.0f), pmt::mp(0.0f),
              "", "Loop bandwidth",
@@ -225,6 +225,5 @@ namespace gr {
 #endif /* GR_CTRLPORT */
     }
 
-
   } /* namespace digital */
 } /* namespace gr */
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h 
b/gr-digital/lib/constellation_receiver_cb_impl.h
index 90482e2..398d740 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.h
+++ b/gr-digital/lib/constellation_receiver_cb_impl.h
@@ -26,13 +26,12 @@
 #include <gnuradio/digital/constellation_receiver_cb.h>
 #include <gnuradio/attributes.h>
 #include <gnuradio/gr_complex.h>
-#include <gnuradio/blocks/control_loop.h>
 
 namespace gr {
   namespace digital {
 
     class constellation_receiver_cb_impl
-      : public constellation_receiver_cb, blocks::control_loop
+      : public constellation_receiver_cb
     {
     public:
       constellation_receiver_cb_impl(constellation_sptr constell,
diff --git a/gr-digital/lib/costas_loop_cc_impl.cc 
b/gr-digital/lib/costas_loop_cc_impl.cc
index a53045a..d29d956 100644
--- a/gr-digital/lib/costas_loop_cc_impl.cc
+++ b/gr-digital/lib/costas_loop_cc_impl.cc
@@ -277,7 +277,7 @@ namespace gr {
       // Setters
       add_rpc_variable(
           rpcbasic_sptr(new rpcbasic_register_set<control_loop, float>(
-             alias(), "loop bw",
+             alias(), "loop_bw",
              &control_loop::set_loop_bandwidth,
              pmt::mp(0.0f), pmt::mp(1.0f), pmt::mp(0.0f),
              "", "Loop bandwidth",