mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00
Code Issues Releases Wiki Activity

Instantiate Gal E6 receiver only if needed

Browse Source
This commit is contained in:
Carles Fernandez 2021-09-20 18:02:17 +02:00
parent 271c59f475
commit b062598713
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/receiver/gnss_flowgraph.cc
View File

@ -73,6 +73,7 @@ GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configurati
{ {
connected_ = false; connected_ = false;
running_ = false; running_ = false;
enable_e6_has_rx_ = false;
configuration_ = std::move(configuration); configuration_ = std::move(configuration);
queue_ = std::move(queue); queue_ = std::move(queue);
multiband_ = GNSSFlowgraph::is_multiband(); multiband_ = GNSSFlowgraph::is_multiband();
@ -100,7 +101,15 @@ void GNSSFlowgraph::init()
channels_status_ = channel_status_msg_receiver_make(); channels_status_ = channel_status_msg_receiver_make();
gal_e6_has_rx_ = galileo_e6_has_msg_receiver_make(); if (configuration_->property("Channels_E6.count", 0) > 0)
{
enable_e6_has_rx_ = true;
gal_e6_has_rx_ = galileo_e6_has_msg_receiver_make();
}
else
{
gal_e6_has_rx_ = nullptr;
}
// 1. read the number of RF front-ends available (one file_source per RF front-end) // 1. read the number of RF front-ends available (one file_source per RF front-end)
int sources_count_deprecated = configuration_->property("Receiver.sources_count", 1); int sources_count_deprecated = configuration_->property("Receiver.sources_count", 1);
@ -460,11 +469,13 @@ int GNSSFlowgraph::connect_desktop_flowgraph()
return 1; return 1;
} }
if (connect_gal_e6_has() != 0) if (enable_e6_has_rx_)
{ {
return 1; if (connect_gal_e6_has() != 0)
{
return 1;
}
} }
// Activate acquisition in enabled channels // Activate acquisition in enabled channels
for (int i = 0; i < channels_count_; i++) for (int i = 0; i < channels_count_; i++)
{ {
@ -1536,8 +1547,11 @@ int GNSSFlowgraph::connect_navdata_monitor()
{ {
top_block_->msg_connect(channels_.at(i)->get_right_block(), pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM")); top_block_->msg_connect(channels_.at(i)->get_right_block(), pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM"));
} }
gal_e6_has_rx_->set_enable_navdata_monitor(true); if (enable_e6_has_rx_)
top_block_->msg_connect(gal_e6_has_rx_, pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM")); {
gal_e6_has_rx_->set_enable_navdata_monitor(true);
top_block_->msg_connect(gal_e6_has_rx_, pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM"));
}
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -1648,7 +1662,10 @@ int GNSSFlowgraph::disconnect_monitors()
if (enable_navdata_monitor_) if (enable_navdata_monitor_)
{ {
top_block_->msg_disconnect(channels_.at(i)->get_right_block(), pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM")); top_block_->msg_disconnect(channels_.at(i)->get_right_block(), pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM"));
top_block_->msg_disconnect(gal_e6_has_rx_, pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM")); if (enable_e6_has_rx_)
{
top_block_->msg_disconnect(gal_e6_has_rx_, pmt::mp("Nav_msg_from_TLM"), NavDataMonitor_, pmt::mp("Nav_msg_from_TLM"));
}
} }
} }
} }

1
src/core/receiver/gnss_flowgraph.h
View File

@ -305,6 +305,7 @@ private:
bool enable_tracking_monitor_; bool enable_tracking_monitor_;
bool enable_navdata_monitor_; bool enable_navdata_monitor_;
bool enable_fpga_offloading_; bool enable_fpga_offloading_;
bool enable_e6_has_rx_;
}; };