mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-13 19:50:34 +00:00
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
This commit is contained in:
parent
ed43547aff
commit
c4204fd38d
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user