mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

Do not instantiate the Signal Conditioner when the software is compiled with ENABLE_FPGA=ON

Browse Source 
so that part can be removed from the configuration file when using the FPGA offloading flowgraph
This commit is contained in:
Carles Fernandez 2021-02-23 13:36:58 +01:00
parent b4d9a3a84b
commit 3ec9749852
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,8 @@ void GNSSFlowgraph::init()
{ {
std::cout << "Creating source " << i << '\n'; std::cout << "Creating source " << i << '\n';
sig_source_.push_back(block_factory->GetSignalSource(configuration_.get(), queue_.get(), i)); sig_source_.push_back(block_factory->GetSignalSource(configuration_.get(), queue_.get(), i));
#if ENABLE_FPGA
#else
auto& src = sig_source_.back(); auto& src = sig_source_.back();
auto RF_Channels = src->getRfChannels(); auto RF_Channels = src->getRfChannels();
std::cout << "RF Channels " << RF_Channels << '\n'; std::cout << "RF Channels " << RF_Channels << '\n';
@ -115,9 +117,12 @@ void GNSSFlowgraph::init()
sig_conditioner_.push_back(block_factory->GetSignalConditioner(configuration_.get(), signal_conditioner_ID)); sig_conditioner_.push_back(block_factory->GetSignalConditioner(configuration_.get(), signal_conditioner_ID));
signal_conditioner_ID++; signal_conditioner_ID++;
} }
#endif
} }
if (!sig_conditioner_.empty())
{
signal_conditioner_connected_ = std::vector<bool>(sig_conditioner_.size(), false); signal_conditioner_connected_ = std::vector<bool>(sig_conditioner_.size(), false);
}
observables_ = block_factory->GetObservables(configuration_.get()); observables_ = block_factory->GetObservables(configuration_.get());
@ -577,16 +582,6 @@ int GNSSFlowgraph::disconnect_fpga_flowgraph()
return 1; return 1;
} }
if (disconnect_signal_sources() != 0)
{
return 1;
}
if (disconnect_signal_conditioners() != 0)
{
return 1;
}
if (disconnect_channels() != 0) if (disconnect_channels() != 0)
{ {
return 1; return 1;