mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-11-15 14:25:00 +00:00
Remove redundant parameter SignalSource.enable_FPGA
This commit is contained in:
parent
c2223e3dad
commit
b4d9a3a84b
@ -518,22 +518,12 @@ int GNSSFlowgraph::connect_fpga_flowgraph()
|
||||
|
||||
// Connect the counter
|
||||
if (sig_source_.at(0) != nullptr)
|
||||
{
|
||||
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
|
||||
{
|
||||
if (connect_sample_counter() != 0)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (connect_fpga_sample_counter() != 0)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
help_hint_ += " * Check implementation name for SignalSource block\n";
|
||||
@ -546,11 +536,6 @@ int GNSSFlowgraph::connect_fpga_flowgraph()
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
|
||||
{
|
||||
check_signal_conditioners();
|
||||
}
|
||||
|
||||
assign_channels();
|
||||
|
||||
if (connect_observables_to_pvt() != 0)
|
||||
@ -571,29 +556,11 @@ int GNSSFlowgraph::connect_fpga_flowgraph()
|
||||
|
||||
|
||||
int GNSSFlowgraph::disconnect_fpga_flowgraph()
|
||||
{
|
||||
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
|
||||
{
|
||||
if (disconnect_signal_sources_from_signal_conditioners() != 0)
|
||||
{
|
||||
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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user