[hamradio-commits] [gnss-sdr] 57/251: minor fixes
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 8bd795e414a9097eaa5f9fe7dc74a1942ea7c14d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Sun May 10 20:57:29 2015 +0200
minor fixes
---
src/core/receiver/gnss_block_factory.cc | 6 +-----
src/core/receiver/gnss_flowgraph.cc | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 9d0fe65..3801312 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -666,14 +666,10 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
{
apply_ = true;
}
+
std::string acquisition_implementation_specific = configuration->property(
"Acquisition_Galileo" + boost::lexical_cast<std::string>(i) + ".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)
if(acquisition_implementation_specific.compare(default_implementation) == 0)
{
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 18755f2..0474a6a 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -306,7 +306,7 @@ void GNSSFlowgraph::connect()
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));
- 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_.pop_front();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list