mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 03:30:33 +00:00
Code Issues Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Carles Fernandez 2015-05-10 20:57:29 +02:00
parent 9fa8efba5b
commit 8bd795e414
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/receiver/gnss_block_factory.cc
View File

@ -666,14 +666,10 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
{ {
apply_ = true; apply_ = true;
} }
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_Galileo" + boost::lexical_cast<std::string>(i) + ".implementation", "Acquisition_Galileo" + boost::lexical_cast<std::string>(i) + ".implementation",
default_implementation); default_implementation);
std::string s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W"));
if( s.compare("1B") == 0 )
{
apply_ = true;
}
//(i.e. Acquisition_1B0.implementation=xxxx) //(i.e. Acquisition_1B0.implementation=xxxx)
if(acquisition_implementation_specific.compare(default_implementation) == 0) if(acquisition_implementation_specific.compare(default_implementation) == 0)
{ {

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

@ -306,7 +306,7 @@ void GNSSFlowgraph::connect()
std::string default_signal = configuration_->property("Channel.signal", std::string("1C")); std::string default_signal = configuration_->property("Channel.signal", std::string("1C"));
std::string gnss_signal = (configuration_->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", default_signal)); std::string gnss_signal = (configuration_->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", default_signal));
while (gnss_signal != available_GNSS_signals_.front().get_signal() ) while (gnss_signal.compare(available_GNSS_signals_.front().get_signal()) != 0 )
{ {
available_GNSS_signals_.push_back(available_GNSS_signals_.front()); available_GNSS_signals_.push_back(available_GNSS_signals_.front());
available_GNSS_signals_.pop_front(); available_GNSS_signals_.pop_front();