mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 12:10:34 +00:00
Do not instantiate the Signal Conditioner when the software is compiled with ENABLE_FPGA=ON
so that part can be removed from the configuration file when using the FPGA offloading flowgraph
This commit is contained in:
parent
b4d9a3a84b
commit
3ec9749852
@ -107,6 +107,8 @@ void GNSSFlowgraph::init()
|
||||
{
|
||||
std::cout << "Creating source " << i << '\n';
|
||||
sig_source_.push_back(block_factory->GetSignalSource(configuration_.get(), queue_.get(), i));
|
||||
#if ENABLE_FPGA
|
||||
#else
|
||||
auto& src = sig_source_.back();
|
||||
auto RF_Channels = src->getRfChannels();
|
||||
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));
|
||||
signal_conditioner_ID++;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (!sig_conditioner_.empty())
|
||||
{
|
||||
signal_conditioner_connected_ = std::vector<bool>(sig_conditioner_.size(), false);
|
||||
}
|
||||
|
||||
observables_ = block_factory->GetObservables(configuration_.get());
|
||||
|
||||
@ -577,16 +582,6 @@ int GNSSFlowgraph::disconnect_fpga_flowgraph()
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (disconnect_signal_sources() != 0)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (disconnect_signal_conditioners() != 0)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (disconnect_channels() != 0)
|
||||
{
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user