mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-28 20:24:10 +00:00
Code Issues Releases Wiki Activity

Apply code formatting

Browse Source
This commit is contained in:
Carles Fernandez 2019-03-26 23:05:18 +01:00
parent b6cb3c6a08
commit 0f2e350d3c
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,12 @@
#include "acquisition_interface.h" // for AcquisitionInterface #include "acquisition_interface.h" // for AcquisitionInterface
#include "array_signal_conditioner.h" #include "array_signal_conditioner.h"
#include "beamformer_filter.h" #include "beamformer_filter.h"
#include "beidou_b1i_dll_pll_tracking.h"
#include "beidou_b1i_pcps_acquisition.h"
#include "beidou_b1i_telemetry_decoder.h"
#include "beidou_b3i_dll_pll_tracking.h"
#include "beidou_b3i_pcps_acquisition.h"
#include "beidou_b3i_telemetry_decoder.h"
#include "byte_to_short.h" #include "byte_to_short.h"
#include "channel.h" #include "channel.h"
#include "configuration_interface.h" #include "configuration_interface.h"
@ -66,12 +72,6 @@
#include "glonass_l2_ca_dll_pll_tracking.h" #include "glonass_l2_ca_dll_pll_tracking.h"
#include "glonass_l2_ca_pcps_acquisition.h" #include "glonass_l2_ca_pcps_acquisition.h"
#include "glonass_l2_ca_telemetry_decoder.h" #include "glonass_l2_ca_telemetry_decoder.h"
#include "beidou_b1i_pcps_acquisition.h"
#include "beidou_b1i_dll_pll_tracking.h"
#include "beidou_b1i_telemetry_decoder.h"
#include "beidou_b3i_pcps_acquisition.h"
#include "beidou_b3i_dll_pll_tracking.h"
#include "beidou_b3i_telemetry_decoder.h"
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include "gps_l1_ca_dll_pll_c_aid_tracking.h" #include "gps_l1_ca_dll_pll_c_aid_tracking.h"
#include "gps_l1_ca_dll_pll_tracking.h" #include "gps_l1_ca_dll_pll_tracking.h"
@ -289,12 +289,12 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetObservables(const std::
Galileo_channels + Galileo_channels +
GPS_channels + GPS_channels +
Glonass_channels + Glonass_channels +
Beidou_channels + Beidou_channels +
extra_channels, extra_channels,
Galileo_channels + Galileo_channels +
GPS_channels + GPS_channels +
Glonass_channels + Glonass_channels +
Beidou_channels); Beidou_channels);
} }
@ -313,7 +313,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetPVT(const std::shared_p
unsigned int Beidou_channels = configuration->property("Channels_B1.count", 0); unsigned int Beidou_channels = configuration->property("Channels_B1.count", 0);
Beidou_channels += configuration->property("Channels_B3.count", 0); Beidou_channels += configuration->property("Channels_B3.count", 0);
return GetBlock(configuration, "PVT", implementation, return GetBlock(configuration, "PVT", implementation,
Galileo_channels + GPS_channels + Glonass_channels + Beidou_channels, 0); Galileo_channels + GPS_channels + Glonass_channels + Beidou_channels, 0);
} }
@ -948,7 +948,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
Channels_5X_count + Channels_5X_count +
Channels_L5_count + Channels_L5_count +
Channels_B1_count + Channels_B1_count +
Channels_B3_count; Channels_B3_count;
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));
try try
@ -1218,7 +1218,6 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
queue); queue);
channel_absolute_id++; channel_absolute_id++;
} }
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -1704,8 +1703,8 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
block = std::move(block_); block = std::move(block_);
} }
else if (implementation == "BEIDOU_B3I_PCPS_Acquisition") else if (implementation == "BEIDOU_B3I_PCPS_Acquisition")
{ {
std::unique_ptr<AcquisitionInterface> block_(new BeidouB3iPcpsAcquisition(configuration.get(), role, in_streams, std::unique_ptr<AcquisitionInterface> block_(new BeidouB3iPcpsAcquisition(configuration.get(), role, in_streams,
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
@ -1720,7 +1719,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
else if (implementation == "GPS_L1_CA_KF_Tracking") else if (implementation == "GPS_L1_CA_KF_Tracking")
{ {
std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaKfTracking(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaKfTracking(configuration.get(), role, in_streams,
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
else if (implementation == "GPS_L1_CA_DLL_PLL_C_Aid_Tracking") else if (implementation == "GPS_L1_CA_DLL_PLL_C_Aid_Tracking")
@ -1844,11 +1843,11 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
block = std::move(block_); block = std::move(block_);
} }
else if (implementation == "BEIDOU_B3I_DLL_PLL_Tracking") else if (implementation == "BEIDOU_B3I_DLL_PLL_Tracking")
{ {
std::unique_ptr<GNSSBlockInterface> block_(new BeidouB3iDllPllTracking(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new BeidouB3iDllPllTracking(configuration.get(), role, in_streams,
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
// TELEMETRY DECODERS ---------------------------------------------------------- // TELEMETRY DECODERS ----------------------------------------------------------
else if (implementation == "GPS_L1_CA_Telemetry_Decoder") else if (implementation == "GPS_L1_CA_Telemetry_Decoder")
{ {
@ -2138,7 +2137,7 @@ std::unique_ptr<TrackingInterface> GNSSBlockFactory::GetTrkBlock(
else if (implementation == "GPS_L1_CA_KF_Tracking") else if (implementation == "GPS_L1_CA_KF_Tracking")
{ {
std::unique_ptr<TrackingInterface> block_(new GpsL1CaKfTracking(configuration.get(), role, in_streams, std::unique_ptr<TrackingInterface> block_(new GpsL1CaKfTracking(configuration.get(), role, in_streams,
out_streams)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
else if (implementation == "GPS_L1_CA_DLL_PLL_C_Aid_Tracking") else if (implementation == "GPS_L1_CA_DLL_PLL_C_Aid_Tracking")