mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bugfix' of https://github.com/iucgnaw/gnss-sdr into iucgnaw-bugfix

This commit is contained in:
Carles Fernandez 2021-03-13 14:01:46 +01:00
parent 24037ded4e b721703339
commit 99818fdcc2
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/receiver/control_thread.cc
View File

@ -92,23 +92,37 @@ ControlThread::ControlThread()
const std::string empty_implementation;
std::string src_impl = configuration_->property("SignalSource.implementation", empty_implementation);
int src_count = configuration_->property("Receiver.sources_count", 1);
if (src_impl.empty() && (src_count != 1))
if (src_impl.empty())
{
int num_src = 0;
for (int i = 0; i < src_count; i++)
if ((src_count == 1))
{
std::string src_impl_multiple = configuration_->property("SignalSource" + std::to_string(i) + ".implementation", empty_implementation);
if (!src_impl_multiple.empty())
conf_has_signal_sources_ = false;
}
else
{
int num_src = 0;
for (int i = 0; i < src_count; i++)
{
num_src++;
std::string src_impl_multiple = configuration_->property("SignalSource" + std::to_string(i) + ".implementation", empty_implementation);
if (!src_impl_multiple.empty())
{
num_src++;
}
}
if (num_src == src_count)
{
conf_has_signal_sources_ = true;
}
else
{
conf_has_signal_sources_ = false;
}
}
if (num_src != src_count)
{
src_impl = std::string("");
}
}
conf_has_signal_sources_ = !src_impl.empty();
else
{
conf_has_signal_sources_ = true;
}
std::string pvt_impl = configuration_->property("PVT.implementation", empty_implementation);
conf_has_pvt_ = !pvt_impl.empty();