mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-08-31 09:57:58 +00:00
Code Issues Releases Wiki Activity

Setting GPS L1 C/A channels first is not required anymore

Browse Source
This commit is contained in:
Carles Fernandez
2015-05-10 23:17:17 +02:00
parent 7a63870ea6
commit 443a356f99
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,7 +330,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_2S(
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
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_2S", acq, 1, 1, queue); std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_2S", acq, 1, 0, queue);
std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_2S", trk, 1, 1, queue); std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_2S", trk, 1, 1, queue);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_2S", tlm, 1, 1, queue); std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_2S", tlm, 1, 1, queue);
@@ -357,7 +357,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_Galileo(
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
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_Galileo", acq, 1, 1, queue); std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_Galileo", acq, 1, 0, queue);
std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_Galileo", trk, 1, 1, queue); std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_Galileo", trk, 1, 1, queue);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_Galileo", tlm, 1, 1, queue); std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_Galileo", tlm, 1, 1, queue);
@@ -383,7 +383,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1B(
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
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_1B", acq, 1, 1, queue); std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_1B", acq, 1, 0, queue);
std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1B", trk, 1, 1, queue); std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1B", trk, 1, 1, queue);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1B", tlm, 1, 1, queue); std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1B", tlm, 1, 1, queue);
@@ -409,7 +409,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_5X(
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
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_5X", acq, 1, 1, queue); std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_5X", acq, 1, 0, queue);
std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_5X", trk, 1, 1, queue); std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_5X", trk, 1, 1, queue);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_5X", tlm, 1, 1, queue); std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_5X", tlm, 1, 1, queue);
@@ -440,7 +440,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
configuration->property("Channels_5X.count", 0); configuration->property("Channels_5X.count", 0);
std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> channels(new std::vector<std::unique_ptr<GNSSBlockInterface>>()); std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> channels(new std::vector<std::unique_ptr<GNSSBlockInterface>>(total_channels));
unsigned int channel_absolute_id = 0; unsigned int channel_absolute_id = 0;
@@ -546,14 +546,14 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
// Push back the channel to the vector of channels, if apply. // Push back the channel to the vector of channels, if apply.
if((configuration->property("Channels_GPS.count", 0) > 0) and apply_) if((configuration->property("Channels_GPS.count", 0) > 0) and apply_)
{ {
channels->push_back(std::move(GetChannel_GPS(configuration, channels->at(i) = std::move(GetChannel_GPS(configuration,
acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue))); acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
channel_absolute_id++; channel_absolute_id++;
} }
if((configuration->property("Channels_1C.count", 0) > 0) and apply_) if((configuration->property("Channels_1C.count", 0) > 0) and apply_)
{ {
channels->push_back(std::move(GetChannel_1C(configuration, channels->at(i) = std::move(GetChannel_1C(configuration,
acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue))); acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
channel_absolute_id++; channel_absolute_id++;
} }
} }
@@ -618,8 +618,8 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
// Push back the channel to the vector of channels, if apply. // Push back the channel to the vector of channels, if apply.
if((channel_count > 0) and apply_) if((channel_count > 0) and apply_)
{ {
channels->push_back(std::move(GetChannel_2S(configuration, channels->at(i) = std::move(GetChannel_2S(configuration,
acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue))); acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
channel_absolute_id++; channel_absolute_id++;
} }
} }
@@ -724,14 +724,14 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
// Push back the channel to the vector of channels, if apply. // Push back the channel to the vector of channels, if apply.
if((configuration->property("Channels_Galileo.count", 0) > 0) and apply_) if((configuration->property("Channels_Galileo.count", 0) > 0) and apply_)
{ {
channels->push_back(std::move(GetChannel_Galileo(configuration, channels->at(i) = std::move(GetChannel_Galileo(configuration,
acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue))); acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
channel_absolute_id++; channel_absolute_id++;
} }
if((configuration->property("Channels_1B.count", 0) > 0) and apply_) if((configuration->property("Channels_1B.count", 0) > 0) and apply_)
{ {
channels->push_back(std::move(GetChannel_1B(configuration, channels->at(i) = std::move(GetChannel_1B(configuration,
acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue))); acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
channel_absolute_id++; channel_absolute_id++;
} }
} }
@@ -796,8 +796,8 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
// Push back the channel to the vector of channels, if apply. // Push back the channel to the vector of channels, if apply.
if((channel_count > 0) and apply_) if((channel_count > 0) and apply_)
{ {
channels->push_back(std::move(GetChannel_5X(configuration, channels->at(i) = std::move(GetChannel_5X(configuration,
acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue))); acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
channel_absolute_id++; channel_absolute_id++;
} }
} }