mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-13 19:50:34 +00:00
Remove unused queue in Signal Conditioners
This commit is contained in:
parent
953bc4686e
commit
f1a5708891
@ -38,10 +38,9 @@ using google::LogMessage;
|
||||
// Constructor
|
||||
ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configuration,
|
||||
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
|
||||
boost::shared_ptr<gr::msg_queue> queue) : data_type_adapt_(data_type_adapt),
|
||||
in_filt_(in_filt), res_(res), role_(role), implementation_(implementation),
|
||||
queue_(queue)
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation) :
|
||||
data_type_adapt_(data_type_adapt),
|
||||
in_filt_(in_filt), res_(res), role_(role), implementation_(implementation)
|
||||
{
|
||||
connected_ = false;
|
||||
if(configuration){ };
|
||||
|
@ -53,8 +53,7 @@ public:
|
||||
//! Constructor
|
||||
ArraySignalConditioner(ConfigurationInterface *configuration,
|
||||
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
|
||||
boost::shared_ptr<gr::msg_queue> queue);
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
|
||||
|
||||
//! Virtual destructor
|
||||
virtual ~ArraySignalConditioner();
|
||||
@ -81,7 +80,6 @@ private:
|
||||
std::string implementation_;
|
||||
bool connected_;
|
||||
//bool stop_;
|
||||
boost::shared_ptr<gr::msg_queue> queue_;
|
||||
};
|
||||
|
||||
#endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/
|
||||
|
@ -38,10 +38,9 @@ using google::LogMessage;
|
||||
// Constructor
|
||||
SignalConditioner::SignalConditioner(ConfigurationInterface *configuration,
|
||||
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
|
||||
boost::shared_ptr<gr::msg_queue> queue) : data_type_adapt_(data_type_adapt),
|
||||
in_filt_(in_filt), res_(res), role_(role), implementation_(implementation),
|
||||
queue_(queue)
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation) :
|
||||
data_type_adapt_(data_type_adapt),
|
||||
in_filt_(in_filt), res_(res), role_(role), implementation_(implementation)
|
||||
{
|
||||
connected_ = false;
|
||||
if(configuration){ };
|
||||
@ -64,11 +63,10 @@ void SignalConditioner::connect(gr::top_block_sptr top_block)
|
||||
in_filt_->connect(top_block);
|
||||
res_->connect(top_block);
|
||||
|
||||
top_block->connect(data_type_adapt_->get_right_block(), 0,
|
||||
in_filt_->get_left_block(), 0);
|
||||
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);
|
||||
|
||||
top_block->connect(in_filt_->get_right_block(), 0, res_->get_left_block(), 0);
|
||||
DLOG(INFO) << "input_filter -> resampler";
|
||||
connected_ = true;
|
||||
}
|
||||
|
@ -33,7 +33,6 @@
|
||||
#define GNSS_SDR_SIGNAL_CONDITIONER_H_
|
||||
|
||||
#include <string>
|
||||
#include <gnuradio/msg_queue.h>
|
||||
#include "gnss_block_interface.h"
|
||||
|
||||
|
||||
@ -52,8 +51,7 @@ public:
|
||||
//! Constructor
|
||||
SignalConditioner(ConfigurationInterface *configuration,
|
||||
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
|
||||
boost::shared_ptr<gr::msg_queue> queue);
|
||||
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
|
||||
|
||||
//! Virtual destructor
|
||||
virtual ~SignalConditioner();
|
||||
@ -80,7 +78,6 @@ private:
|
||||
std::string implementation_;
|
||||
bool connected_;
|
||||
//bool stop_;
|
||||
boost::shared_ptr<gr::msg_queue> queue_;
|
||||
};
|
||||
|
||||
#endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/
|
||||
|
@ -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_inputfilter, input_filter, 1, 1, queue)),
|
||||
std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)),
|
||||
role_conditioner, "Signal_Conditioner", queue));
|
||||
role_conditioner, "Signal_Conditioner"));
|
||||
return conditioner_;
|
||||
}
|
||||
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_inputfilter, input_filter, 1, 1, queue)),
|
||||
std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)),
|
||||
role_conditioner, "Signal_Conditioner", queue));
|
||||
role_conditioner, "Signal_Conditioner"));
|
||||
return conditioner_;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user