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

Remove redundant parameter SignalSource.enable_FPGA

Browse Source
This commit is contained in:
Carles Fernandez 2021-02-23 12:24:21 +01:00
parent c2223e3dad
commit b4d9a3a84b
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -519,19 +519,9 @@ int GNSSFlowgraph::connect_fpga_flowgraph()
// Connect the counter // Connect the counter
if (sig_source_.at(0) != nullptr) if (sig_source_.at(0) != nullptr)
{ {
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) if (connect_fpga_sample_counter() != 0)
{ {
if (connect_sample_counter() != 0) return 1;
{
return 1;
}
}
else
{
if (connect_fpga_sample_counter() != 0)
{
return 1;
}
} }
} }
else else
@ -546,11 +536,6 @@ int GNSSFlowgraph::connect_fpga_flowgraph()
return 1; return 1;
} }
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
{
check_signal_conditioners();
}
assign_channels(); assign_channels();
if (connect_observables_to_pvt() != 0) if (connect_observables_to_pvt() != 0)
@ -572,27 +557,9 @@ int GNSSFlowgraph::connect_fpga_flowgraph()
int GNSSFlowgraph::disconnect_fpga_flowgraph() int GNSSFlowgraph::disconnect_fpga_flowgraph()
{ {
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) if (disconnect_fpga_sample_counter() != 0)
{ {
if (disconnect_signal_sources_from_signal_conditioners() != 0) return 1;
{
return 1;
}
}
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
{
if (disconnect_sample_counter() != 0)
{
return 1;
}
}
else
{
if (disconnect_fpga_sample_counter() != 0)
{
return 1;
}
} }
if (disconnect_monitors() != 0) if (disconnect_monitors() != 0)