mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-10-31 23:26:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into e6-pvt

Browse Source
This commit is contained in:
Carles Fernandez 2022-06-01 17:10:36 +02:00
commit 266b3bdfe8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,7 +488,20 @@ int GNSSFlowgraph::connect_desktop_flowgraph()
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 ENABLE_FPGA
if (enable_fpga_offloading_)
{
// create a task for the FPGA such that it doesn't stop the flow
std::thread tmp_thread(&ChannelInterface::start_acquisition, channels_[i]);
tmp_thread.detach();
}
else
{
channels_.at(i)->start_acquisition();
}
#else
channels_.at(i)->start_acquisition(); channels_.at(i)->start_acquisition();
#endif
LOG(INFO) << "Channel " << i << " connected to observables and ready for acquisition"; LOG(INFO) << "Channel " << i << " connected to observables and ready for acquisition";
} }
else else
@ -1824,9 +1837,16 @@ void GNSSFlowgraph::acquisition_manager(unsigned int who)
channels_[current_channel]->assist_acquisition_doppler(0); channels_[current_channel]->assist_acquisition_doppler(0);
} }
#if ENABLE_FPGA #if ENABLE_FPGA
// create a task for the FPGA such that it doesn't stop the flow if (enable_fpga_offloading_)
std::thread tmp_thread(&ChannelInterface::start_acquisition, channels_[current_channel]); {
tmp_thread.detach(); // create a task for the FPGA such that it doesn't stop the flow
std::thread tmp_thread(&ChannelInterface::start_acquisition, channels_[current_channel]);
tmp_thread.detach();
}
else
{
channels_[current_channel]->start_acquisition();
}
#else #else
channels_[current_channel]->start_acquisition(); channels_[current_channel]->start_acquisition();
#endif #endif
@ -1930,9 +1950,16 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what)
channels_[who]->set_signal(channels_[who]->get_signal()); channels_[who]->set_signal(channels_[who]->get_signal());
#if ENABLE_FPGA #if ENABLE_FPGA
// create a task for the FPGA such that it doesn't stop the flow if (enable_fpga_offloading_)
std::thread tmp_thread(&ChannelInterface::start_acquisition, channels_[who]); {
tmp_thread.detach(); // create a task for the FPGA such that it doesn't stop the flow
std::thread tmp_thread(&ChannelInterface::start_acquisition, channels_[who]);
tmp_thread.detach();
}
else
{
channels_[who]->start_acquisition();
}
#else #else
channels_[who]->start_acquisition(); channels_[who]->start_acquisition();
#endif #endif
@ -2060,7 +2087,20 @@ void GNSSFlowgraph::start_acquisition_helper()
{ {
if (channels_state_[i] == 1) if (channels_state_[i] == 1)
{ {
#if ENABLE_FPGA
if (enable_fpga_offloading_)
{
// create a task for the FPGA such that it doesn't stop the flow
std::thread tmp_thread(&ChannelInterface::start_acquisition, channels_[i]);
tmp_thread.detach();
}
else
{
channels_.at(i)->start_acquisition();
}
#else
channels_.at(i)->start_acquisition(); channels_.at(i)->start_acquisition();
#endif
} }
} }
} }