mirror of https://github.com/gnss-sdr/gnss-sdr
Cleaning flowgraph
This commit is contained in:
parent
5bde2595af
commit
a5af6ea889
|
@ -442,55 +442,6 @@ void GNSSFlowgraph::set_configuration(std::shared_ptr<ConfigurationInterface> co
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
std::shared_ptr<GNSSBlockInterface> GNSSFlowgraph::signal_source()
|
|
||||||
{
|
|
||||||
auto sig_source_ = std::move(blocks_->at(0));
|
|
||||||
return std::move(sig_source_);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<GNSSBlockInterface> GNSSFlowgraph::signal_conditioner()
|
|
||||||
{
|
|
||||||
auto sig_conditioner_ = std::move(blocks_->at(1));
|
|
||||||
return std::move(sig_conditioner_);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<ChannelInterface> GNSSFlowgraph::channel(unsigned int index)
|
|
||||||
{
|
|
||||||
auto chan_ = std::move(blocks_->at(index + 5));
|
|
||||||
std::shared_ptr<ChannelInterface> chan = std::dynamic_pointer_cast<ChannelInterface>(chan_);
|
|
||||||
return chan;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<GNSSBlockInterface> GNSSFlowgraph::observables()
|
|
||||||
{
|
|
||||||
observables_ = std::move(blocks_->at(2));
|
|
||||||
return std::move(observables_);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<GNSSBlockInterface> GNSSFlowgraph::pvt()
|
|
||||||
{
|
|
||||||
pvt_ = std::move(blocks_->at(3));
|
|
||||||
return std::move(pvt_);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<GNSSBlockInterface> GNSSFlowgraph::output_filter()
|
|
||||||
{
|
|
||||||
auto output_ = std::move(blocks_->at(4));
|
|
||||||
return std::move(output_);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
void GNSSFlowgraph::init()
|
void GNSSFlowgraph::init()
|
||||||
{
|
{
|
||||||
|
|
|
@ -93,20 +93,6 @@ public:
|
||||||
|
|
||||||
void set_configuration(std::shared_ptr<ConfigurationInterface> configuration);
|
void set_configuration(std::shared_ptr<ConfigurationInterface> configuration);
|
||||||
|
|
||||||
/*std::shared_ptr<GNSSBlockInterface> signal_source();
|
|
||||||
std::shared_ptr<GNSSBlockInterface> signal_conditioner();
|
|
||||||
std::shared_ptr<ChannelInterface> channel(unsigned int index);
|
|
||||||
std::shared_ptr<GNSSBlockInterface> observables();
|
|
||||||
std::shared_ptr<GNSSBlockInterface> pvt();
|
|
||||||
std::shared_ptr<GNSSBlockInterface> output_filter();*/
|
|
||||||
|
|
||||||
std::shared_ptr<GNSSBlockInterface> sig_source_;
|
|
||||||
std::shared_ptr<GNSSBlockInterface> sig_conditioner_;
|
|
||||||
std::shared_ptr<GNSSBlockInterface> observables_;
|
|
||||||
std::shared_ptr<GNSSBlockInterface> pvt_;
|
|
||||||
std::shared_ptr<GNSSBlockInterface> output_filter_;
|
|
||||||
std::vector<std::shared_ptr<ChannelInterface>> channels_;
|
|
||||||
|
|
||||||
unsigned int applied_actions()
|
unsigned int applied_actions()
|
||||||
{
|
{
|
||||||
return applied_actions_;
|
return applied_actions_;
|
||||||
|
@ -122,11 +108,11 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void init();
|
void init();
|
||||||
/*!
|
/*
|
||||||
* \brief Populates the SV PRN list available for acquisition and tracking
|
* \brief Populates the SV PRN list available for acquisition and tracking
|
||||||
*/
|
*/
|
||||||
void set_signals_list();
|
void set_signals_list();
|
||||||
/*!
|
/*
|
||||||
* \brief Initializes the channels state (start acquisition or keep standby) using the configuration parameters (number of channels and max channels in acquisition)
|
* \brief Initializes the channels state (start acquisition or keep standby) using the configuration parameters (number of channels and max channels in acquisition)
|
||||||
*/
|
*/
|
||||||
void set_channels_state();
|
void set_channels_state();
|
||||||
|
@ -140,12 +126,12 @@ private:
|
||||||
std::shared_ptr<ConfigurationInterface> configuration_;
|
std::shared_ptr<ConfigurationInterface> configuration_;
|
||||||
std::shared_ptr<GNSSBlockFactory> block_factory_;
|
std::shared_ptr<GNSSBlockFactory> block_factory_;
|
||||||
std::shared_ptr<std::vector<std::shared_ptr<GNSSBlockInterface>>> blocks_ = std::make_shared<std::vector<std::shared_ptr<GNSSBlockInterface>>>();
|
std::shared_ptr<std::vector<std::shared_ptr<GNSSBlockInterface>>> blocks_ = std::make_shared<std::vector<std::shared_ptr<GNSSBlockInterface>>>();
|
||||||
/* std::shared_ptr<GNSSBlockInterface> sig_source_;
|
std::shared_ptr<GNSSBlockInterface> sig_source_;
|
||||||
std::shared_ptr<GNSSBlockInterface> sig_conditioner_;
|
std::shared_ptr<GNSSBlockInterface> sig_conditioner_;
|
||||||
std::shared_ptr<GNSSBlockInterface> observables_;
|
std::shared_ptr<GNSSBlockInterface> observables_;
|
||||||
std::shared_ptr<GNSSBlockInterface> pvt_;
|
std::shared_ptr<GNSSBlockInterface> pvt_;
|
||||||
std::shared_ptr<GNSSBlockInterface> output_filter_;
|
std::shared_ptr<GNSSBlockInterface> output_filter_;
|
||||||
std::vector<std::shared_ptr<ChannelInterface>> channels_; */
|
std::vector<std::shared_ptr<ChannelInterface>> channels_;
|
||||||
gr::top_block_sptr top_block_;
|
gr::top_block_sptr top_block_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
boost::shared_ptr<gr::msg_queue> queue_;
|
||||||
std::list<Gnss_Signal> available_GNSS_signals_;
|
std::list<Gnss_Signal> available_GNSS_signals_;
|
||||||
|
|
Loading…
Reference in New Issue