mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-08-07 22:43:52 +00:00
Code Issues Releases Wiki Activity

Fixing generic configuration of channels for signals 1B (Galileo E1 B)

Browse Source
This commit is contained in:
Carles Fernandez 2015-05-11 20:19:26 +02:00
parent 1105da661f
commit 67833c0b2f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,8 +368,8 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1C(
std::unique_ptr<GNSSBlockInterface> pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue); std::unique_ptr<GNSSBlockInterface> pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue);
std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_1C" + appendix1, acq, 1, 0, queue); std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_1C" + appendix1, acq, 1, 0, queue);
std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1C"+ appendix2, trk, 1, 1, queue); std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1C "+ appendix2, trk, 1, 1, queue);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1C"+ appendix3, tlm, 1, 1, queue); std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1C" + appendix3, tlm, 1, 1, queue);
std::unique_ptr<GNSSBlockInterface> channel_(new Channel(configuration.get(), channel, pass_through_.release(), std::unique_ptr<GNSSBlockInterface> channel_(new Channel(configuration.get(), channel, pass_through_.release(),
acq_.release(), acq_.release(),
@ -818,19 +818,20 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
tracking_implementation = configuration->property("Tracking_Galileo.implementation", default_implementation); // DEPRECATED tracking_implementation = configuration->property("Tracking_Galileo.implementation", default_implementation); // DEPRECATED
if (tracking_implementation.compare(default_implementation) == 0) if (tracking_implementation.compare(default_implementation) == 0)
{ {
tracking_implementation = configuration->property("Tracking_1B.count", 0); tracking_implementation = configuration->property("Tracking_1B.implementation", std::string("W"));
std::cout << "HHELLO " << tracking_implementation << std::endl;
} }
telemetry_decoder_implementation = configuration->property("TelemetryDecoder_Galileo.implementation", default_implementation); // DEPRECATED telemetry_decoder_implementation = configuration->property("TelemetryDecoder_Galileo.implementation", default_implementation); // DEPRECATED
if (telemetry_decoder_implementation.compare(default_implementation) == 0) if (telemetry_decoder_implementation.compare(default_implementation) == 0)
{ {
telemetry_decoder_implementation = configuration->property("TelemetryDecoder_1B.count", 0); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_1B.implementation", std::string("W"));
} }
acquisition_implementation = configuration->property("Acquisition_Galileo.implementation", default_implementation); // DEPRECATED acquisition_implementation = configuration->property("Acquisition_Galileo.implementation", default_implementation); // DEPRECATED
if (acquisition_implementation.compare(default_implementation) == 0) if (acquisition_implementation.compare(default_implementation) == 0)
{ {
acquisition_implementation = configuration->property("Acquisition_1B.count", 0); acquisition_implementation = configuration->property("Acquisition_1B.implementation", std::string("W"));
} }
for (unsigned int i = 0; i < total_channels; i++) for (unsigned int i = 0; i < total_channels; i++)