From c4204fd38dda99cef54cc21fa03084009a4beb1e Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 9 Sep 2014 11:45:58 +0200
Subject: [PATCH] Set 0 as the default number of channels if a given system is
 not specified in the conf file, so Channels_GPS.count=0 is no longer needed
 when instantiating a Galileo-only receiver

---
 src/core/receiver/gnss_block_factory.cc | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 8ebf592af..2acbb3090 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -184,8 +184,8 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetObservables(std::shared
     std::string default_implementation = "GPS_L1_CA_Observables";
     std::string implementation = configuration->property("Observables.implementation", default_implementation);
     LOG(INFO) << "Getting Observables with implementation " << implementation;
-    unsigned int Galileo_channels = configuration->property("Channels_Galileo.count", 12);
-    unsigned int GPS_channels = configuration->property("Channels_GPS.count", 12);
+    unsigned int Galileo_channels = configuration->property("Channels_Galileo.count", 0);
+    unsigned int GPS_channels = configuration->property("Channels_GPS.count", 0);
     return GetBlock(configuration, "Observables", implementation, Galileo_channels + GPS_channels, Galileo_channels + GPS_channels, queue);
 }
 
@@ -197,8 +197,8 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetPVT(std::shared_ptr<Con
     std::string default_implementation = "Pass_Through";
     std::string implementation = configuration->property("PVT.implementation", default_implementation);
     LOG(INFO) << "Getting PVT with implementation " << implementation;
-    unsigned int Galileo_channels = configuration->property("Channels_Galileo.count", 12);
-    unsigned int GPS_channels = configuration->property("Channels_GPS.count", 12);
+    unsigned int Galileo_channels = configuration->property("Channels_Galileo.count", 0);
+    unsigned int GPS_channels = configuration->property("Channels_GPS.count", 0);
     return GetBlock(configuration, "PVT", implementation, Galileo_channels + GPS_channels, 1, queue);
 }
 
@@ -280,7 +280,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
     unsigned int channel_absolute_id=0;
 
     //**************** GPS CHANNELS **********************
-    channel_count= configuration->property("Channels_GPS.count", 12);
+    channel_count= configuration->property("Channels_GPS.count", 0);
 
     LOG(INFO) << "Getting " << channel_count << " GPS channels";
 
@@ -304,7 +304,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
         }
 
     //**************** GALILEO CHANNELS **********************
-    channel_count= configuration->property("Channels_Galileo.count", 12);
+    channel_count= configuration->property("Channels_Galileo.count", 0);
 
     LOG(INFO) << "Getting " << channel_count << " Galileo channels";
 
@@ -325,9 +325,6 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
                     acquisition_implementation, tracking, telemetry_decoder, channel_absolute_id, queue)));
             channel_absolute_id++;
         }
-
-
-
     return channels;
 }