mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-04 08:24:11 +00:00
Code Issues Releases Wiki Activity

removed commented-out code

Browse Source
This commit is contained in:
Marc Majoral 2019-02-27 15:51:01 +01:00
parent 46082e9334
commit 484b0f4b02
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,7 +277,6 @@ void GNSSFlowgraph::connect()
#endif #endif
#if ENABLE_FPGA #if ENABLE_FPGA
// bool FPGA_enabled = configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false);
if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
{ {
@ -357,8 +356,6 @@ void GNSSFlowgraph::connect()
} }
#endif #endif
//bool FPGA_enabled = configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false);
// Signal conditioner (selected_signal_source) >> channels (i) (dependent of their associated SignalSource_ID) // Signal conditioner (selected_signal_source) >> channels (i) (dependent of their associated SignalSource_ID)
int selected_signal_conditioner_ID = 0; int selected_signal_conditioner_ID = 0;
bool use_acq_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false); bool use_acq_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false);
@ -673,10 +670,7 @@ void GNSSFlowgraph::connect()
LOG(INFO) << "Channel " << i << " assigned to " << channels_.at(i)->get_signal(); LOG(INFO) << "Channel " << i << " assigned to " << channels_.at(i)->get_signal();
if (channels_state_[i] == 1) if (channels_state_[i] == 1)
{ {
// if (FPGA_enabled == false) channels_.at(i)->start_acquisition();
// {
channels_.at(i)->start_acquisition();
// }
LOG(INFO) << "Channel " << i << " connected to observables and ready for acquisition"; LOG(INFO) << "Channel " << i << " connected to observables and ready for acquisition";
} }
else else
@ -708,8 +702,7 @@ void GNSSFlowgraph::disconnect()
#ifdef ENABLE_FPGA #ifdef ENABLE_FPGA
bool FPGA_enabled = configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false); if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
if (FPGA_enabled == false)
{ {
for (int i = 0; i < sources_count_; i++) for (int i = 0; i < sources_count_; i++)
{ {
@ -821,8 +814,7 @@ void GNSSFlowgraph::disconnect()
#endif #endif
#ifdef ENABLE_FPGA #ifdef ENABLE_FPGA
//bool FPGA_enabled = configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false); if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false)
if (FPGA_enabled == false)
{ {
// disconnect the signal source to sample counter // disconnect the signal source to sample counter
// disconnect the sample counter to Observables // disconnect the sample counter to Observables