[hamradio-commits] [gnss-sdr] 08/60: Bug fix in multisource/multichannel gnss_block_interface

[Carles Fernandez]

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

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 5b373292007be6f8e42ccbfa66b0f5e4398425bc
Author: Javier <jarribas at cttc.es>
Date:   Fri Feb 27 10:36:09 2015 +0100

    Bug fix in multisource/multichannel gnss_block_interface
---
 src/algorithms/conditioner/adapters/signal_conditioner.cc  | 8 --------
 src/algorithms/signal_source/adapters/uhd_signal_source.cc | 4 ++++
 src/algorithms/signal_source/adapters/uhd_signal_source.h  | 1 +
 src/core/interfaces/gnss_block_interface.h                 | 7 +++++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc
index 02af139..6be9d31 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.cc
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc
@@ -63,7 +63,6 @@ SignalConditioner::~SignalConditioner()
 }
 
 
-
 void SignalConditioner::connect(gr::top_block_sptr top_block)
 {
     if (connected_)
@@ -77,19 +76,14 @@ void SignalConditioner::connect(gr::top_block_sptr top_block)
 
     top_block->connect(data_type_adapt_->get_right_block(), 0,
                        in_filt_->get_left_block(), 0);
-
     DLOG(INFO) << "data_type_adapter -> input_filter";
-
     top_block->connect(in_filt_->get_right_block(), 0,
                        res_->get_left_block(), 0);
-
     DLOG(INFO) << "input_filter -> resampler";
-
     connected_ = true;
 }
 
 
-
 void SignalConditioner::disconnect(gr::top_block_sptr top_block)
 {
     if (!connected_)
@@ -116,8 +110,6 @@ gr::basic_block_sptr SignalConditioner::get_left_block()
     return data_type_adapt_->get_left_block();
 }
 
-
-
 gr::basic_block_sptr SignalConditioner::get_right_block()
 {
     return res_->get_right_block();
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
index feb04a3..7531821 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@@ -292,6 +292,10 @@ gr::basic_block_sptr UhdSignalSource::get_left_block()
 }
 
 
+gr::basic_block_sptr UhdSignalSource::get_right_block()
+{
+	return get_right_block(0);
+}
 
 gr::basic_block_sptr UhdSignalSource::get_right_block(int RF_channel)
 {
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h
index c137de5..0a248b5 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -75,6 +75,7 @@ public:
     void connect(gr::top_block_sptr top_block);
     void disconnect(gr::top_block_sptr top_block);
     gr::basic_block_sptr get_left_block();
+    gr::basic_block_sptr get_right_block();
     gr::basic_block_sptr get_right_block(int RF_channel);
 
 private:
diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h
index ad38bbe..78b408f 100644
--- a/src/core/interfaces/gnss_block_interface.h
+++ b/src/core/interfaces/gnss_block_interface.h
@@ -59,7 +59,10 @@ public:
     virtual void connect(gr::top_block_sptr top_block) = 0;
     virtual void disconnect(gr::top_block_sptr top_block) = 0;
 
-    virtual gr::basic_block_sptr get_left_block(int RF_channel=0)
+    virtual gr::basic_block_sptr get_left_block() = 0;
+    virtual gr::basic_block_sptr get_right_block() = 0;
+
+    virtual gr::basic_block_sptr get_left_block(int RF_channel)
     {
     	if (RF_channel==0) // avoid unused param warning
     	{
@@ -68,7 +71,7 @@ public:
     		return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
     	}
     }
-    virtual gr::basic_block_sptr get_right_block(int RF_channel=0)
+    virtual gr::basic_block_sptr get_right_block(int RF_channel)
     {
     	if (RF_channel==0) // avoid unused param warning
     	{

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git