From 3ec9749852ec5d7d0afd7c715e216c3e75c73dd5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 23 Feb 2021 13:36:58 +0100 Subject: [PATCH] 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 --- src/core/receiver/gnss_flowgraph.cc | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index e8f5ac03f..6d853dcaa 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -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(sig_conditioner_.size(), false); } - - signal_conditioner_connected_ = std::vector(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;