mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Fix indentation

Browse Source
This commit is contained in:
Carles Fernandez 2018-01-26 12:49:04 +01:00
parent 30988b8e14
commit 2f8be49d0a
1 changed files with 110 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,6 @@
#include "two_bit_packed_file_signal_source.h" #include "two_bit_packed_file_signal_source.h"
#include "labsat_signal_source.h" #include "labsat_signal_source.h"
#include "channel.h" #include "channel.h"
#include "signal_conditioner.h" #include "signal_conditioner.h"
#include "array_signal_conditioner.h" #include "array_signal_conditioner.h"
#include "byte_to_short.h" #include "byte_to_short.h"
@ -236,7 +235,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
} }
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetObservables(std::shared_ptr<ConfigurationInterface> configuration) std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetObservables(std::shared_ptr<ConfigurationInterface> configuration)
{ {
std::string default_implementation = "Hybrid_Observables"; std::string default_implementation = "Hybrid_Observables";
@ -252,7 +250,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetObservables(std::shared
} }
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetPVT(std::shared_ptr<ConfigurationInterface> configuration) std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetPVT(std::shared_ptr<ConfigurationInterface> configuration)
{ {
std::string default_implementation = "RTKLIB_PVT"; std::string default_implementation = "RTKLIB_PVT";
@ -336,13 +333,13 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1C(
return channel_; return channel_;
} }
//********* GPS L2C (M) CHANNEL ***************** //********* GPS L2C (M) CHANNEL *****************
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_2S( std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_2S(
std::shared_ptr<ConfigurationInterface> configuration, std::shared_ptr<ConfigurationInterface> configuration,
std::string acq, std::string trk, std::string tlm, int channel, std::string acq, std::string trk, std::string tlm, int channel,
gr::msg_queue::sptr queue) gr::msg_queue::sptr queue)
{ {
LOG(INFO) << "Instantiating Channel " << channel << " with Acquisition Implementation: " LOG(INFO) << "Instantiating Channel " << channel << " with Acquisition Implementation: "
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
std::string aux = configuration->property("Acquisition_2S" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W")); std::string aux = configuration->property("Acquisition_2S" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
@ -401,6 +398,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_2S(
return channel_; return channel_;
} }
//********* GALILEO E1 B CHANNEL ***************** //********* GALILEO E1 B CHANNEL *****************
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1B( std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1B(
std::shared_ptr<ConfigurationInterface> configuration, std::shared_ptr<ConfigurationInterface> configuration,
@ -468,6 +466,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1B(
return channel_; return channel_;
} }
//********* GALILEO E5a CHANNEL ***************** //********* GALILEO E5a CHANNEL *****************
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_5X( std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_5X(
std::shared_ptr<ConfigurationInterface> configuration, std::shared_ptr<ConfigurationInterface> configuration,
@ -535,6 +534,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_5X(
return channel_; return channel_;
} }
//********* GLONASS L1 C/A CHANNEL ***************** //********* GLONASS L1 C/A CHANNEL *****************
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1G( std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1G(
std::shared_ptr<ConfigurationInterface> configuration, std::shared_ptr<ConfigurationInterface> configuration,
@ -699,7 +699,6 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> channels(new std::vector<std::unique_ptr<GNSSBlockInterface>>(total_channels)); std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> channels(new std::vector<std::unique_ptr<GNSSBlockInterface>>(total_channels));
//**************** GPS L1 C/A CHANNELS ********************** //**************** GPS L1 C/A CHANNELS **********************
LOG(INFO) << "Getting " << Channels_1C_count << " GPS L1 C/A channels"; LOG(INFO) << "Getting " << Channels_1C_count << " GPS L1 C/A channels";
acquisition_implementation = configuration->property("Acquisition_1C.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_1C.implementation", default_implementation);
tracking_implementation = configuration->property("Tracking_1C.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_1C.implementation", default_implementation);
@ -709,24 +708,24 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
{ {
//(i.e. Acquisition_1C0.implementation=xxxx) //(i.e. Acquisition_1C0.implementation=xxxx)
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_1C" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Acquisition_1C" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
acquisition_implementation); acquisition_implementation);
//(i.e. Tracking_1C0.implementation=xxxx) //(i.e. Tracking_1C0.implementation=xxxx)
std::string tracking_implementation_specific = configuration->property( std::string tracking_implementation_specific = configuration->property(
"Tracking_1C" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Tracking_1C" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
tracking_implementation); tracking_implementation);
std::string telemetry_decoder_implementation_specific = configuration->property( std::string telemetry_decoder_implementation_specific = configuration->property(
"TelemetryDecoder_1C" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "TelemetryDecoder_1C" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
telemetry_decoder_implementation); telemetry_decoder_implementation);
// Push back the channel to the vector of channels // Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_1C(configuration, channels->at(channel_absolute_id) = std::move(GetChannel_1C(configuration,
acquisition_implementation_specific, acquisition_implementation_specific,
tracking_implementation_specific, tracking_implementation_specific,
telemetry_decoder_implementation_specific, telemetry_decoder_implementation_specific,
channel_absolute_id, channel_absolute_id,
queue)); queue));
channel_absolute_id++; channel_absolute_id++;
} }
//**************** GPS L2C (M) CHANNELS ********************** //**************** GPS L2C (M) CHANNELS **********************
@ -738,25 +737,26 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
{ {
//(i.e. Acquisition_1C0.implementation=xxxx) //(i.e. Acquisition_1C0.implementation=xxxx)
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_2S" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Acquisition_2S" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
acquisition_implementation); acquisition_implementation);
//(i.e. Tracking_1C0.implementation=xxxx) //(i.e. Tracking_1C0.implementation=xxxx)
std::string tracking_implementation_specific = configuration->property( std::string tracking_implementation_specific = configuration->property(
"Tracking_2S" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Tracking_2S" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
tracking_implementation); tracking_implementation);
std::string telemetry_decoder_implementation_specific = configuration->property( std::string telemetry_decoder_implementation_specific = configuration->property(
"TelemetryDecoder_2S" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "TelemetryDecoder_2S" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
telemetry_decoder_implementation); telemetry_decoder_implementation);
// Push back the channel to the vector of channels // Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_2S(configuration, channels->at(channel_absolute_id) = std::move(GetChannel_2S(configuration,
acquisition_implementation_specific, acquisition_implementation_specific,
tracking_implementation_specific, tracking_implementation_specific,
telemetry_decoder_implementation_specific, telemetry_decoder_implementation_specific,
channel_absolute_id, channel_absolute_id,
queue)); queue));
channel_absolute_id++; channel_absolute_id++;
} }
//**************** GPS L5 CHANNELS ********************** //**************** GPS L5 CHANNELS **********************
LOG(INFO)<< "Getting " << Channels_L5_count << " GPS L5 channels"; LOG(INFO)<< "Getting " << Channels_L5_count << " GPS L5 channels";
tracking_implementation = configuration->property("Tracking_L5.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_L5.implementation", default_implementation);
@ -766,85 +766,83 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
{ {
//(i.e. Acquisition_1C0.implementation=xxxx) //(i.e. Acquisition_1C0.implementation=xxxx)
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_L5" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Acquisition_L5" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
acquisition_implementation); acquisition_implementation);
//(i.e. Tracking_1C0.implementation=xxxx) //(i.e. Tracking_1C0.implementation=xxxx)
std::string tracking_implementation_specific = configuration->property( std::string tracking_implementation_specific = configuration->property(
"Tracking_L5" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Tracking_L5" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
tracking_implementation); tracking_implementation);
std::string telemetry_decoder_implementation_specific = configuration->property( std::string telemetry_decoder_implementation_specific = configuration->property(
"TelemetryDecoder_L5" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "TelemetryDecoder_L5" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
telemetry_decoder_implementation); telemetry_decoder_implementation);
// Push back the channel to the vector of channels // Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_L5(configuration, channels->at(channel_absolute_id) = std::move(GetChannel_L5(configuration,
acquisition_implementation_specific, acquisition_implementation_specific,
tracking_implementation_specific, tracking_implementation_specific,
telemetry_decoder_implementation_specific, telemetry_decoder_implementation_specific,
channel_absolute_id, channel_absolute_id,
queue)); queue));
channel_absolute_id++; channel_absolute_id++;
} }
//**************** GALILEO E1 B (I/NAV OS) CHANNELS ********************** //**************** GALILEO E1 B (I/NAV OS) CHANNELS **********************
LOG(INFO) << "Getting " << Channels_1B_count << " GALILEO E1 B (I/NAV OS) channels"; LOG(INFO) << "Getting " << Channels_1B_count << " GALILEO E1 B (I/NAV OS) channels";
tracking_implementation = configuration->property("Tracking_1B.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_1B.implementation", default_implementation);
telemetry_decoder_implementation = configuration->property("TelemetryDecoder_1B.implementation", default_implementation); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_1B.implementation", default_implementation);
acquisition_implementation = configuration->property("Acquisition_1B.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_1B.implementation", default_implementation);
for (unsigned int i = 0; i < Channels_1B_count; i++) for (unsigned int i = 0; i < Channels_1B_count; i++)
{ {
//(i.e. Acquisition_1C0.implementation=xxxx) //(i.e. Acquisition_1C0.implementation=xxxx)
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_1B" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Acquisition_1B" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
acquisition_implementation); acquisition_implementation);
//(i.e. Tracking_1C0.implementation=xxxx) //(i.e. Tracking_1C0.implementation=xxxx)
std::string tracking_implementation_specific = configuration->property( std::string tracking_implementation_specific = configuration->property(
"Tracking_1B" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Tracking_1B" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
tracking_implementation); tracking_implementation);
std::string telemetry_decoder_implementation_specific = configuration->property( std::string telemetry_decoder_implementation_specific = configuration->property(
"TelemetryDecoder_1B" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "TelemetryDecoder_1B" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
telemetry_decoder_implementation); telemetry_decoder_implementation);
// Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_1B(configuration,
acquisition_implementation_specific,
tracking_implementation_specific,
telemetry_decoder_implementation_specific,
channel_absolute_id,
queue));
channel_absolute_id++;
}
// Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_1B(configuration,
acquisition_implementation_specific,
tracking_implementation_specific,
telemetry_decoder_implementation_specific,
channel_absolute_id,
queue));
channel_absolute_id++;
}
//**************** GALILEO E5a I (F/NAV OS) CHANNELS ********************** //**************** GALILEO E5a I (F/NAV OS) CHANNELS **********************
LOG(INFO) << "Getting " << Channels_5X_count << " GALILEO E5a I (F/NAV OS) channels"; LOG(INFO) << "Getting " << Channels_5X_count << " GALILEO E5a I (F/NAV OS) channels";
tracking_implementation = configuration->property("Tracking_5X.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_5X.implementation", default_implementation);
telemetry_decoder_implementation = configuration->property("TelemetryDecoder_5X.implementation", default_implementation); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_5X.implementation", default_implementation);
acquisition_implementation = configuration->property("Acquisition_5X.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_5X.implementation", default_implementation);
for (unsigned int i = 0; i < Channels_5X_count; i++) for (unsigned int i = 0; i < Channels_5X_count; i++)
{ {
//(i.e. Acquisition_1C0.implementation=xxxx) //(i.e. Acquisition_1C0.implementation=xxxx)
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_5X" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Acquisition_5X" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
acquisition_implementation); acquisition_implementation);
//(i.e. Tracking_1C0.implementation=xxxx) //(i.e. Tracking_1C0.implementation=xxxx)
std::string tracking_implementation_specific = configuration->property( std::string tracking_implementation_specific = configuration->property(
"Tracking_5X" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Tracking_5X" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
tracking_implementation); tracking_implementation);
std::string telemetry_decoder_implementation_specific = configuration->property( std::string telemetry_decoder_implementation_specific = configuration->property(
"TelemetryDecoder_5X" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "TelemetryDecoder_5X" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
telemetry_decoder_implementation); telemetry_decoder_implementation);
// Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_5X(configuration,
acquisition_implementation_specific,
tracking_implementation_specific,
telemetry_decoder_implementation_specific,
channel_absolute_id,
queue));
channel_absolute_id++;
}
// Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_5X(configuration,
acquisition_implementation_specific,
tracking_implementation_specific,
telemetry_decoder_implementation_specific,
channel_absolute_id,
queue));
channel_absolute_id++;
}
//**************** GLONASS L1 C/A CHANNELS ********************** //**************** GLONASS L1 C/A CHANNELS **********************
LOG(INFO) << "Getting " << Channels_1G_count << " GLONASS L1 C/A channels"; LOG(INFO) << "Getting " << Channels_1G_count << " GLONASS L1 C/A channels";
@ -856,29 +854,30 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
{ {
//(i.e. Acquisition_1G0.implementation=xxxx) //(i.e. Acquisition_1G0.implementation=xxxx)
std::string acquisition_implementation_specific = configuration->property( std::string acquisition_implementation_specific = configuration->property(
"Acquisition_1G" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Acquisition_1G" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
acquisition_implementation); acquisition_implementation);
//(i.e. Tracking_1G0.implementation=xxxx) //(i.e. Tracking_1G0.implementation=xxxx)
std::string tracking_implementation_specific = configuration->property( std::string tracking_implementation_specific = configuration->property(
"Tracking_1G" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "Tracking_1G" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
tracking_implementation); tracking_implementation);
std::string telemetry_decoder_implementation_specific = configuration->property( std::string telemetry_decoder_implementation_specific = configuration->property(
"TelemetryDecoder_1G" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation", "TelemetryDecoder_1G" + boost::lexical_cast<std::string>(channel_absolute_id) + ".implementation",
telemetry_decoder_implementation); telemetry_decoder_implementation);
// Push back the channel to the vector of channels // Push back the channel to the vector of channels
channels->at(channel_absolute_id) = std::move(GetChannel_1G(configuration, channels->at(channel_absolute_id) = std::move(GetChannel_1G(configuration,
acquisition_implementation_specific, acquisition_implementation_specific,
tracking_implementation_specific, tracking_implementation_specific,
telemetry_decoder_implementation_specific, telemetry_decoder_implementation_specific,
channel_absolute_id, channel_absolute_id,
queue)); queue));
channel_absolute_id++; channel_absolute_id++;
} }
return channels; return channels;
} }
/* /*
* Returns the block with the required configuration and implementation * Returns the block with the required configuration and implementation
* *
@ -1163,7 +1162,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
block = std::move(block_); block = std::move(block_);
} }
// RESAMPLER ------------------------------------------------------------------- // RESAMPLER -------------------------------------------------------------------
else if (implementation.compare("Direct_Resampler") == 0) else if (implementation.compare("Direct_Resampler") == 0)
{ {
@ -1277,9 +1275,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
block = std::move(block_); block = std::move(block_);
} }
// TRACKING BLOCKS ------------------------------------------------------------- // TRACKING BLOCKS -------------------------------------------------------------
else if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0) else if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
{ {
@ -1410,6 +1405,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
// PVT ------------------------------------------------------------------------- // PVT -------------------------------------------------------------------------
else if ((implementation.compare("RTKLIB_PVT") == 0) || (implementation.compare("GPS_L1_CA_PVT") == 0) || (implementation.compare("Galileo_E1_PVT") == 0) || (implementation.compare("Hybrid_PVT") == 0)) else if ((implementation.compare("RTKLIB_PVT") == 0) || (implementation.compare("GPS_L1_CA_PVT") == 0) || (implementation.compare("Galileo_E1_PVT") == 0) || (implementation.compare("Hybrid_PVT") == 0))
{ {