[hamradio-commits] [gnss-sdr] 68/251: Reading generic configuration for Channel

[Carles Fernandez]

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 ef046f9a148c7577239ef23fc600eaa5b2b04e8d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue May 12 08:07:02 2015 +0200

    Reading generic configuration for Channel
---
 src/core/receiver/gnss_block_factory.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 8ca07ec..272c8ba 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -665,7 +665,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
 
             // Search for specific implementation of that particular channel in config file
             //(i.e. Acquisition_GPS0.implementation=xxxx) DEPRECATED
-            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W"));
+            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
             if( s.compare("1C") == 0 )
                 {
                     apply_ = true;
@@ -758,7 +758,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
 
             // Search for specific implementation of that particular channel in config file
             //(i.e. Acquisition_2S0.implementation=xxxx)
-            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W"));
+            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
             if( s.compare("2S") == 0 )
                 {
                     apply_ = true;
@@ -842,7 +842,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
                 }
             // Search for specific implementation of that particular channel in config file
             //(i.e. Acquisition_Galileo0.implementation=xxxx) DEPRECATED
-            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W"));
+            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
             if( s.compare("1B") == 0 )
                 {
                     apply_ = true;
@@ -936,7 +936,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
                 }
             // Search for specific implementation of that particular channel in config file
             //(i.e. Acquisition_5X0.implementation=xxxx)
-            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W"));
+            s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
             if( s.compare("5X") == 0 )
                 {
                     apply_ = true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git