From cad8659116b73070a7a857e299bf79bb3009ecbe Mon Sep 17 00:00:00 2001 From: Lenhart Date: Sat, 17 Apr 2021 19:32:10 +0200 Subject: [PATCH] added license to config file, applied clang-formatting rules to overlooked files --- conf/gnss-sdr_GPS_L1_fifo.conf | 9 +++++++++ src/core/receiver/gnss_block_factory.cc | 12 ++++++------ src/core/system_parameters/galileo_inav_message.h | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/conf/gnss-sdr_GPS_L1_fifo.conf b/conf/gnss-sdr_GPS_L1_fifo.conf index d73a77e10..a339ffb35 100644 --- a/conf/gnss-sdr_GPS_L1_fifo.conf +++ b/conf/gnss-sdr_GPS_L1_fifo.conf @@ -1,3 +1,12 @@ +; This is a GNSS-SDR configuration file +; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/ +; SPDX-License-Identifier: GPL-3.0-or-later +; SPDX-FileCopyrightText: (C) 2010-2021 (see AUTHORS file for a list of contributors) + +; You can define your own receiver and invoke it by doing +; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf +; + [GNSS-SDR] ;######### GLOBAL OPTIONS ################## diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 3d587b74b..b99f5a686 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -37,8 +37,8 @@ #include "channel.h" #include "configuration_interface.h" #include "direct_resampler_conditioner.h" -#include "file_signal_source.h" #include "fifo_signal_source.h" +#include "file_signal_source.h" #include "fir_filter.h" #include "freq_xlating_fir_filter.h" #include "galileo_e1_dll_pll_veml_tracking.h" @@ -649,11 +649,11 @@ std::unique_ptr GNSSBlockFactory::GetBlock( // SIGNAL SOURCES ---------------------------------------------------------- else if (implementation == "Fifo_Signal_Source") - { - std::unique_ptr block_ = std::make_unique(configuration, role, in_streams, - out_streams, queue); - block = std::move(block_); - } + { + std::unique_ptr block_ = std::make_unique(configuration, role, in_streams, + out_streams, queue); + block = std::move(block_); + } else if (implementation == "File_Signal_Source") { std::unique_ptr block_ = std::make_unique(configuration, role, in_streams, diff --git a/src/core/system_parameters/galileo_inav_message.h b/src/core/system_parameters/galileo_inav_message.h index f2e6273d6..5fbc960ec 100644 --- a/src/core/system_parameters/galileo_inav_message.h +++ b/src/core/system_parameters/galileo_inav_message.h @@ -366,7 +366,7 @@ private: int32_t current_IODnav{}; - std::vector rs_buffer; // Reed-Solomon buffer + std::vector rs_buffer; // Reed-Solomon buffer uint8_t IODnav_LSB17{}; uint8_t IODnav_LSB18{};