mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-07-02 01:43:20 +00:00
Code Issues Releases Wiki Activity

Remove unused queue in Signal Conditioners

Browse Source
This commit is contained in:
Carles Fernandez 2016-05-09 18:53:48 +02:00
parent 953bc4686e
commit f1a5708891
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/conditioner/adapters/array_signal_conditioner.cc
View File

@ -38,10 +38,9 @@ using google::LogMessage;
// Constructor // Constructor
ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configuration, ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt, std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation, std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation) :
boost::shared_ptr<gr::msg_queue> queue) : data_type_adapt_(data_type_adapt), data_type_adapt_(data_type_adapt),
in_filt_(in_filt), res_(res), role_(role), implementation_(implementation), in_filt_(in_filt), res_(res), role_(role), implementation_(implementation)
queue_(queue)
{ {
connected_ = false; connected_ = false;
if(configuration){ }; if(configuration){ };

4
src/algorithms/conditioner/adapters/array_signal_conditioner.h
View File

@ -53,8 +53,7 @@ public:
//! Constructor //! Constructor
ArraySignalConditioner(ConfigurationInterface *configuration, ArraySignalConditioner(ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt, std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation, std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
boost::shared_ptr<gr::msg_queue> queue);
//! Virtual destructor //! Virtual destructor
virtual ~ArraySignalConditioner(); virtual ~ArraySignalConditioner();
@ -81,7 +80,6 @@ private:
std::string implementation_; std::string implementation_;
bool connected_; bool connected_;
//bool stop_; //bool stop_;
boost::shared_ptr<gr::msg_queue> queue_;
}; };
#endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/ #endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/

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

@ -38,10 +38,9 @@ using google::LogMessage;
// Constructor // Constructor
SignalConditioner::SignalConditioner(ConfigurationInterface *configuration, SignalConditioner::SignalConditioner(ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt, std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation, std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation) :
boost::shared_ptr<gr::msg_queue> queue) : data_type_adapt_(data_type_adapt), data_type_adapt_(data_type_adapt),
in_filt_(in_filt), res_(res), role_(role), implementation_(implementation), in_filt_(in_filt), res_(res), role_(role), implementation_(implementation)
queue_(queue)
{ {
connected_ = false; connected_ = false;
if(configuration){ }; if(configuration){ };
@ -64,11 +63,10 @@ void SignalConditioner::connect(gr::top_block_sptr top_block)
in_filt_->connect(top_block); in_filt_->connect(top_block);
res_->connect(top_block); res_->connect(top_block);
top_block->connect(data_type_adapt_->get_right_block(), 0, top_block->connect(data_type_adapt_->get_right_block(), 0, in_filt_->get_left_block(), 0);
in_filt_->get_left_block(), 0);
DLOG(INFO) << "data_type_adapter -> input_filter"; DLOG(INFO) << "data_type_adapter -> input_filter";
top_block->connect(in_filt_->get_right_block(), 0,
res_->get_left_block(), 0); top_block->connect(in_filt_->get_right_block(), 0, res_->get_left_block(), 0);
DLOG(INFO) << "input_filter -> resampler"; DLOG(INFO) << "input_filter -> resampler";
connected_ = true; connected_ = true;
} }

5
src/algorithms/conditioner/adapters/signal_conditioner.h
View File

@ -33,7 +33,6 @@
#define GNSS_SDR_SIGNAL_CONDITIONER_H_ #define GNSS_SDR_SIGNAL_CONDITIONER_H_
#include <string> #include <string>
#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
@ -52,8 +51,7 @@ public:
//! Constructor //! Constructor
SignalConditioner(ConfigurationInterface *configuration, SignalConditioner(ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt, std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation, std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
boost::shared_ptr<gr::msg_queue> queue);
//! Virtual destructor //! Virtual destructor
virtual ~SignalConditioner(); virtual ~SignalConditioner();
@ -80,7 +78,6 @@ private:
std::string implementation_; std::string implementation_;
bool connected_; bool connected_;
//bool stop_; //bool stop_;
boost::shared_ptr<gr::msg_queue> queue_;
}; };
#endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/ #endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/

4
src/core/receiver/gnss_block_factory.cc
View File

@ -203,7 +203,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
std::move(GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1, queue)), std::move(GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1, queue)),
std::move(GetBlock(configuration, role_inputfilter, input_filter, 1, 1, queue)), std::move(GetBlock(configuration, role_inputfilter, input_filter, 1, 1, queue)),
std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)), std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)),
role_conditioner, "Signal_Conditioner", queue)); role_conditioner, "Signal_Conditioner"));
return conditioner_; return conditioner_;
} }
else else
@ -213,7 +213,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
std::move(GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1, queue)), std::move(GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1, queue)),
std::move(GetBlock(configuration, role_inputfilter, input_filter, 1, 1, queue)), std::move(GetBlock(configuration, role_inputfilter, input_filter, 1, 1, queue)),
std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)), std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)),
role_conditioner, "Signal_Conditioner", queue)); role_conditioner, "Signal_Conditioner"));
return conditioner_; return conditioner_;
} }
} }