mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fix in multisource/multichannel gnss_block_interface

This commit is contained in:
Javier 2015-02-27 10:36:09 +01:00
parent 8606191311
commit 5b37329200
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/conditioner/adapters/signal_conditioner.cc
View File

@ -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();

4
src/algorithms/signal_source/adapters/uhd_signal_source.cc
View File

@ -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)
{

1
src/algorithms/signal_source/adapters/uhd_signal_source.h
View File

@ -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:

7
src/core/interfaces/gnss_block_interface.h
View File

@ -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
{