From 35cd66cb552b87fdb0e71d9188f9bc8a57c55a62 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 9 Feb 2020 23:29:17 +0100 Subject: [PATCH 01/21] Improve documentation for macOS when building Matio and/or ProtocolBuffers from source --- CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09a305a09..fe1b4c147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1737,6 +1737,29 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS message(FATAL_ERROR "aclocal is required to build matio from source") endif() endif() + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + if((NOT EXISTS /usr/local/bin/glibtoolize AND NOT EXISTS /opt/local/bin/glibtoolize) OR + (NOT EXISTS /usr/local/bin/aclocal AND NOT EXISTS /opt/local/bin/aclocal)) + message(" libtool/automake tools have not been found.") + message(" You can try to install them by typing:") + message(" 'sudo port install libtool automake', if you use Macports, or 'brew install libtool automake', if you use Homebrew") + message(FATAL_ERROR "libtool/automake tools are required to build matio from source") + endif() + if(CMAKE_GENERATOR STREQUAL Xcode) + if(EXISTS /opt/local/bin/glibtoolize OR EXISTS /opt/local/bin/aclocal) + if(NOT EXISTS /usr/local/bin/glibtoolize OR NOT EXISTS /usr/local/bin/aclocal) + message(" WARNING: libtool/atomake binaries cannot be found by Xcode. Please do:") + message("sudo ln -s /opt/local/bin/glibtoolize /usr/local/bin/") + message("sudo ln -s /opt/local/bin/aclocal /usr/local/bin/") + message("sudo ln -s /opt/local/bin/autom4te /usr/local/bin/") + message("sudo ln -s /opt/local/bin/automake /usr/local/bin/") + message("sudo ln -s /opt/local/bin/autoconf /usr/local/bin/") + message("sudo ln -s /opt/local/bin/autoreconf /usr/local/bin/") # not needed by Matio, but by Protocol Buffers + message(FATAL_ERROR "libtool/automake tools cannot be found by Xcode") + endif() + endif() + endif() + endif() find_package(HDF5) set_package_properties(HDF5 PROPERTIES URL "https://support.hdfgroup.org/HDF5/" @@ -2083,6 +2106,29 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI message(FATAL_ERROR "aclocal is required to build Protocol Buffers from source") endif() endif() + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + if((NOT EXISTS /usr/local/bin/glibtoolize AND NOT EXISTS /opt/local/bin/glibtoolize) OR + (NOT EXISTS /usr/local/bin/aclocal AND NOT EXISTS /opt/local/bin/aclocal)) + message(" libtool/automake tools have not been found.") + message(" You can try to install them by typing:") + message(" 'sudo port install libtool automake', if you use Macports, or 'brew install libtool automake', if you use Homebrew") + message(FATAL_ERROR "libtool/automake tools are required to build Protocol Buffers from source") + endif() + if(CMAKE_GENERATOR STREQUAL Xcode) + if(EXISTS /opt/local/bin/glibtoolize OR EXISTS /opt/local/bin/aclocal) + if(NOT EXISTS /usr/local/bin/glibtoolize OR NOT EXISTS /usr/local/bin/aclocal) + message(" WARNING: libtool/automake binaries cannot be found by Xcode. Please do:") + message("sudo ln -s /opt/local/bin/glibtoolize /usr/local/bin/") + message("sudo ln -s /opt/local/bin/aclocal /usr/local/bin/") + message("sudo ln -s /opt/local/bin/autom4te /usr/local/bin/") + message("sudo ln -s /opt/local/bin/automake /usr/local/bin/") + message("sudo ln -s /opt/local/bin/autoconf /usr/local/bin/") + message("sudo ln -s /opt/local/bin/autoreconf /usr/local/bin/") + message(FATAL_ERROR "libtool/automake tools cannot be found by Xcode") + endif() + endif() + endif() + endif() set(PROTOBUF_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}) if(PROTOBUF_MAKE_PROGRAM MATCHES "ninja" OR CMAKE_GENERATOR STREQUAL Xcode) From aeaf68fe4770ea472f0b6249f4328b74a049b40b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 10 Feb 2020 01:16:58 +0100 Subject: [PATCH 02/21] Fix detection of Volk version if pkg-config is not present --- cmake/Modules/FindVOLK.cmake | 1 + .../Modules/VolkGnsssdrConfigVersion.cmake.in | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake index 5e837fb0f..b3e58f71f 100644 --- a/cmake/Modules/FindVOLK.cmake +++ b/cmake/Modules/FindVOLK.cmake @@ -84,6 +84,7 @@ if(NOT VOLK_VERSION) list(GET VOLK_LIBRARIES 0 FIRST_DIR) get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY) if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake) + set(PACKAGE_FIND_VERSION_MAJOR 0) include(${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake) endif() if(PACKAGE_VERSION) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in index 6946b0cb5..b7096e285 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) # # This file is part of GNSS-SDR. # @@ -8,14 +8,13 @@ set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@) set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@) set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@) -set(PACKAGE_VERSION - ${MAJOR_VERSION}.${MINOR_VERSION}.${MAINT_VERSION}) +set(PACKAGE_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${MAINT_VERSION}) -if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL ${MAJOR_VERSION}) - if(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${MINOR_VERSION}) - if(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MAINT_VERSION}) - set(PACKAGE_VERSION_EXACT 1) # exact match for API version - set(PACKAGE_VERSION_COMPATIBLE 1) # compat for minor/patch version +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL ${MAJOR_VERSION}) + if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL ${MINOR_VERSION}) + if(NOT "${PACKAGE_FIND_VERSION_PATCH}" GREATER ${MAINT_VERSION}) + set(PACKAGE_VERSION_EXACT 1) # exact match for API version + set(PACKAGE_VERSION_COMPATIBLE 1) # compat for minor/patch version + endif() endif() - endif() endif() From b1c0e867517f6339840e5cc1fdd4e07408be9963 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 10 Feb 2020 10:59:10 +0100 Subject: [PATCH 03/21] New receiver feature: optional carrier smoothing of code range observables --- src/algorithms/observables/CMakeLists.txt | 1 + .../observables/adapters/CMakeLists.txt | 1 + .../adapters/hybrid_observables.cc | 18 ++- .../gnuradio_blocks/CMakeLists.txt | 1 + .../gnuradio_blocks/hybrid_observables_gs.cc | 108 +++++++++++++++--- .../gnuradio_blocks/hybrid_observables_gs.h | 46 +++++--- .../observables/libs/CMakeLists.txt | 52 +++++++++ src/algorithms/observables/libs/obs_conf.cc | 43 +++++++ src/algorithms/observables/libs/obs_conf.h | 55 +++++++++ 9 files changed, 289 insertions(+), 36 deletions(-) create mode 100644 src/algorithms/observables/libs/CMakeLists.txt create mode 100644 src/algorithms/observables/libs/obs_conf.cc create mode 100644 src/algorithms/observables/libs/obs_conf.h diff --git a/src/algorithms/observables/CMakeLists.txt b/src/algorithms/observables/CMakeLists.txt index f17f1f9c7..87e9bf982 100644 --- a/src/algorithms/observables/CMakeLists.txt +++ b/src/algorithms/observables/CMakeLists.txt @@ -5,5 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later # +add_subdirectory(libs) add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index f16e74c12..6454fdd27 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries(obs_adapters PUBLIC obs_gr_blocks algorithms_libs + observables_libs PRIVATE Gflags::gflags Glog::glog diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index bf08436b9..85a265a46 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -18,9 +18,9 @@ * ------------------------------------------------------------------------- */ - #include "hybrid_observables.h" #include "configuration_interface.h" +#include "obs_conf.h" #include #include // for operator<< @@ -34,7 +34,21 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration, dump_mat_ = configuration->property(role + ".dump_mat", true); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); - observables_ = hybrid_observables_gs_make(in_streams_, out_streams_, dump_, dump_mat_, dump_filename_); + Obs_Conf conf; + + conf.dump = dump_; + conf.dump_mat = dump_mat_; + conf.dump_filename = dump_filename_; + conf.nchannels_in = in_streams_; + conf.nchannels_out = out_streams_; + + conf.enable_carrier_smoothing = configuration->property(role + ".enable_carrier_smoothing", false); + conf.smoothing_factor = configuration->property(role + ".smoothing_factor", 200.0); + if (conf.enable_carrier_smoothing == true) + { + LOG(INFO) << "Observables carrier smoothing enabled with smoothing factor " << conf.smoothing_factor; + } + observables_ = hybrid_observables_gs_make(conf); DLOG(INFO) << "Observables block ID (" << observables_->unique_id() << ")"; } diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 7293c25b4..2a3cd70f3 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -37,6 +37,7 @@ target_link_libraries(obs_gr_blocks Boost::headers Gnuradio::blocks PRIVATE + observables_libs algorithms_libs core_system_parameters Gflags::gflags diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index c3ab4df52..9e32585b6 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -55,19 +55,15 @@ namespace errorlib = boost::system; #endif -hybrid_observables_gs_sptr hybrid_observables_gs_make(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, const std::string &dump_filename) +hybrid_observables_gs_sptr hybrid_observables_gs_make(const Obs_Conf &conf_) { - return hybrid_observables_gs_sptr(new hybrid_observables_gs(nchannels_in, nchannels_out, dump, dump_mat, dump_filename)); + return hybrid_observables_gs_sptr(new hybrid_observables_gs(conf_)); } -hybrid_observables_gs::hybrid_observables_gs(uint32_t nchannels_in, - uint32_t nchannels_out, - bool dump, - bool dump_mat, - const std::string &dump_filename) : gr::block("hybrid_observables_gs", - gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)), - gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro))) +hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block("hybrid_observables_gs", + gr::io_signature::make(conf_.nchannels_in, conf_.nchannels_in, sizeof(Gnss_Synchro)), + gr::io_signature::make(conf_.nchannels_out, conf_.nchannels_out, sizeof(Gnss_Synchro))) { // PVT input message port this->message_port_register_in(pmt::mp("pvt_to_observables")); @@ -75,12 +71,12 @@ hybrid_observables_gs::hybrid_observables_gs(uint32_t nchannels_in, // Send Channel status to gnss_flowgraph this->message_port_register_out(pmt::mp("status")); - - d_dump = dump; - d_dump_mat = dump_mat and d_dump; - d_dump_filename = dump_filename; - d_nchannels_out = nchannels_out; - d_nchannels_in = nchannels_in; + d_conf = conf_; + d_dump = conf_.dump; + d_dump_mat = conf_.dump_mat and d_dump; + d_dump_filename = conf_.dump_filename; + d_nchannels_out = conf_.nchannels_out; + d_nchannels_in = conf_.nchannels_in; d_gnss_synchro_history = std::make_shared>(1000, d_nchannels_out); // ############# ENABLE DATA FILE LOG ################# @@ -134,6 +130,12 @@ hybrid_observables_gs::hybrid_observables_gs(uint32_t nchannels_in, // rework d_Rx_clock_buffer.set_capacity(10); // 10*20 ms = 200 ms of data in buffer d_Rx_clock_buffer.clear(); // Clear all the elements in the buffer + + d_channel_last_pll_lock = std::vector(d_nchannels_out, false); + d_channel_last_pseudorange_smooth = std::vector(d_nchannels_out, 0.0); + d_channel_last_carrier_phase_rads = std::vector(d_nchannels_out, 0.0); + + d_smooth_filter_M = conf_.smoothing_factor; } @@ -525,6 +527,75 @@ void hybrid_observables_gs::compute_pranges(std::vector &data) } } +void hybrid_observables_gs::smooth_pseudoranges(std::vector &data) +{ + std::vector::iterator it; + for (it = data.begin(); it != data.end(); it++) + { + if (it->Flag_valid_pseudorange) + { + //0. get wavelength for the current signal + double wavelength_m = 0; + switch (mapStringValues_[it->Signal]) + { + case evGPS_1C: + wavelength_m = SPEED_OF_LIGHT / FREQ1; + break; + case evGPS_L5: + wavelength_m = SPEED_OF_LIGHT / FREQ5; + break; + case evSBAS_1C: + wavelength_m = SPEED_OF_LIGHT / FREQ1; + break; + case evGAL_1B: + wavelength_m = SPEED_OF_LIGHT / FREQ1; + break; + case evGAL_5X: + wavelength_m = SPEED_OF_LIGHT / FREQ5; + break; + case evGPS_2S: + wavelength_m = SPEED_OF_LIGHT / FREQ2; + break; + case evBDS_B3: + wavelength_m = SPEED_OF_LIGHT / FREQ3_BDS; + break; + case evGLO_1G: + wavelength_m = SPEED_OF_LIGHT / FREQ1_GLO; + break; + case evGLO_2G: + wavelength_m = SPEED_OF_LIGHT / FREQ2_GLO; + break; + case evBDS_B1: + wavelength_m = SPEED_OF_LIGHT / FREQ1_BDS; + break; + case evBDS_B2: + wavelength_m = SPEED_OF_LIGHT / FREQ2_BDS; + break; + default: + break; + } + + //todo: propagate the PLL lock status in Gnss_Synchro + //1. check if last PLL lock status was false and initialize last d_channel_last_pseudorange_smooth + if (d_channel_last_pll_lock.at(it->Channel_ID) == true) + { + //2. Compute the smoothed pseudorange for this channel + // Hatch filter algorithm (https://insidegnss.com/can-you-list-all-the-properties-of-the-carrier-smoothing-filter/) + double r_sm = d_channel_last_pseudorange_smooth.at(it->Channel_ID); + double factor = ((d_smooth_filter_M - 1.0) / d_smooth_filter_M); + it->Pseudorange_m = factor * r_sm + (1.0 / d_smooth_filter_M) * it->Pseudorange_m + wavelength_m * (factor / PI_2) * (it->Carrier_phase_rads - d_channel_last_carrier_phase_rads.at(it->Channel_ID)); + } + d_channel_last_pseudorange_smooth.at(it->Channel_ID) = it->Pseudorange_m; + d_channel_last_carrier_phase_rads.at(it->Channel_ID) = it->Carrier_phase_rads; + d_channel_last_pll_lock.at(it->Channel_ID) = it->Flag_valid_pseudorange; + } + else + { + d_channel_last_pll_lock.at(it->Channel_ID) = false; + } + } +} + int hybrid_observables_gs::general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, @@ -607,11 +678,16 @@ int hybrid_observables_gs::general_work(int noutput_items __attribute__((unused) compute_pranges(epoch_data); } + //Carrier smoothing (optional) + if (d_conf.enable_carrier_smoothing == true) + { + smooth_pseudoranges(epoch_data); + } + //output the observables set to the PVT block for (uint32_t n = 0; n < d_nchannels_out; n++) { out[n][0] = epoch_data[n]; } - // report channel status every second T_status_report_timer_ms += T_rx_step_ms; if (T_status_report_timer_ms >= 1000) diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h index 54c89b39a..224a3f192 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h @@ -23,6 +23,7 @@ #ifndef GNSS_SDR_HYBRID_OBSERVABLES_GS_H #define GNSS_SDR_HYBRID_OBSERVABLES_GS_H +#include "obs_conf.h" #include // for boost::circular_buffer #include // for boost::shared_ptr #include // for block @@ -41,12 +42,7 @@ class Gnss_circular_deque; using hybrid_observables_gs_sptr = boost::shared_ptr; -hybrid_observables_gs_sptr hybrid_observables_gs_make( - unsigned int nchannels_in, - unsigned int nchannels_out, - bool dump, - bool dump_mat, - const std::string& dump_filename); +hybrid_observables_gs_sptr hybrid_observables_gs_make(const Obs_Conf& conf_); /*! * \brief This class implements a block that computes observables @@ -60,19 +56,33 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items); private: - friend hybrid_observables_gs_sptr hybrid_observables_gs_make( - uint32_t nchannels_in, - uint32_t nchannels_out, - bool dump, - bool dump_mat, - const std::string& dump_filename); + friend hybrid_observables_gs_sptr hybrid_observables_gs_make(const Obs_Conf& conf_); - hybrid_observables_gs( - uint32_t nchannels_in, - uint32_t nchannels_out, - bool dump, - bool dump_mat, - const std::string& dump_filename); + hybrid_observables_gs(const Obs_Conf& conf_); + + Obs_Conf d_conf; + + enum StringValue + { + evGPS_1C, + evGPS_2S, + evGPS_L5, + evSBAS_1C, + evGAL_1B, + evGAL_5X, + evGLO_1G, + evGLO_2G, + evBDS_B1, + evBDS_B2, + evBDS_B3 + }; + + std::map mapStringValues_; + std::vector d_channel_last_pll_lock; + std::vector d_channel_last_pseudorange_smooth; + std::vector d_channel_last_carrier_phase_rads; + double d_smooth_filter_M; + void smooth_pseudoranges(std::vector& data); bool T_rx_TOW_set; // rx time follow GPST bool d_dump; diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt new file mode 100644 index 000000000..dbb70d7b9 --- /dev/null +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -0,0 +1,52 @@ +# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# +# This file is part of GNSS-SDR. +# +# GNSS-SDR is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GNSS-SDR is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNSS-SDR. If not, see . +# + +set(OBSERVABLES_LIB_HEADERS ${OBSERVABLES_LIB_HEADERS} obs_conf.h) +set(OBSERVABLES_LIB_SOURCES ${OBSERVABLES_LIB_SOURCES} obs_conf.cc) + +list(SORT OBSERVABLES_LIB_HEADERS) +list(SORT OBSERVABLES_LIB_SOURCES) + +source_group(Headers FILES ${OBSERVABLES_LIB_HEADERS}) + +add_library(observables_libs + ${OBSERVABLES_LIB_SOURCES} + ${OBSERVABLES_LIB_HEADERS} +) + +target_link_libraries(observables_libs + PRIVATE + Gflags::gflags + Glog::glog + algorithms_libs + core_system_parameters +) + +if(ENABLE_CLANG_TIDY) + if(CLANG_TIDY_EXE) + set_target_properties(observables_libs + PROPERTIES + CXX_CLANG_TIDY "${DO_CLANG_TIDY}" + ) + endif() +endif() + +set_property(TARGET observables_libs + APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES + $ +) diff --git a/src/algorithms/observables/libs/obs_conf.cc b/src/algorithms/observables/libs/obs_conf.cc new file mode 100644 index 000000000..d16e3eb66 --- /dev/null +++ b/src/algorithms/observables/libs/obs_conf.cc @@ -0,0 +1,43 @@ +/*! + * \file obs_conf.h + * \brief Class that contains all the configuration parameters for generic + * observables block + * \author Javier Arribas, 2020. jarribas(at)cttc.es + * + * ------------------------------------------------------------------------- + * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software defined Global Navigation + * Satellite Systems receiver + * + * This file is part of GNSS-SDR. + * + * GNSS-SDR is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNSS-SDR is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNSS-SDR. If not, see . + * + * ------------------------------------------------------------------------- + */ + +#include "obs_conf.h" + +Obs_Conf::Obs_Conf() +{ + enable_carrier_smoothing = false; + smoothing_factor = 200; + nchannels_in = 0; + nchannels_out = 0; + dump = false; + dump_mat = false; + dump_filename = "obs_dump.dat"; +} diff --git a/src/algorithms/observables/libs/obs_conf.h b/src/algorithms/observables/libs/obs_conf.h new file mode 100644 index 000000000..6f98cd61b --- /dev/null +++ b/src/algorithms/observables/libs/obs_conf.h @@ -0,0 +1,55 @@ +/*! + * \file obs_conf.h + * \brief Class that contains all the configuration parameters for generic + * observables block + * \author Javier Arribas, 2020. jarribas(at)cttc.es + * + * ------------------------------------------------------------------------- + * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software defined Global Navigation + * Satellite Systems receiver + * + * This file is part of GNSS-SDR. + * + * GNSS-SDR is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNSS-SDR is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNSS-SDR. If not, see . + * + * ------------------------------------------------------------------------- + */ + +#ifndef GNSS_SDR_OBS_CONF_H_ +#define GNSS_SDR_OBS_CONF_H_ + +#include "configuration_interface.h" +#include +#include +#include + +class Obs_Conf +{ +public: + bool enable_carrier_smoothing; + double smoothing_factor; + unsigned int nchannels_in; + unsigned int nchannels_out; + bool dump; + bool dump_mat; + std::string dump_filename; + + + Obs_Conf(); +}; + +#endif From b2a17b23c5250a27194017e835ebe3353c195af1 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 10 Feb 2020 11:00:03 +0100 Subject: [PATCH 04/21] Move debug acquisition messages from LOG(INFO) to DLOG(INFO) --- .../gnuradio_blocks/pcps_acquisition.cc | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index 7ea5cb160..530886907 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -239,13 +239,13 @@ bool pcps_acquisition::is_fdma() if (strcmp(d_gnss_synchro->Signal, "1G") == 0) { d_doppler_bias = static_cast(DFRQ1_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN)); - LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; + DLOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; return true; } if (strcmp(d_gnss_synchro->Signal, "2G") == 0) { d_doppler_bias += static_cast(DFRQ2_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN)); - LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; + DLOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; return true; } return false; @@ -363,16 +363,16 @@ void pcps_acquisition::send_positive_acquisition() { // Declare positive acquisition using a message port // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL - LOG(INFO) << "positive acquisition" - << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN - << ", sample_stamp " << d_sample_counter - << ", test statistics value " << d_test_statistics - << ", test statistics threshold " << d_threshold - << ", code phase " << d_gnss_synchro->Acq_delay_samples - << ", doppler " << d_gnss_synchro->Acq_doppler_hz - << ", magnitude " << d_mag - << ", input signal power " << d_input_power - << ", Assist doppler_center " << d_doppler_center; + DLOG(INFO) << "positive acquisition" + << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN + << ", sample_stamp " << d_sample_counter + << ", test statistics value " << d_test_statistics + << ", test statistics threshold " << d_threshold + << ", code phase " << d_gnss_synchro->Acq_delay_samples + << ", doppler " << d_gnss_synchro->Acq_doppler_hz + << ", magnitude " << d_mag + << ", input signal power " << d_input_power + << ", Assist doppler_center " << d_doppler_center; d_positive_acq = 1; if (!d_channel_fsm.expired()) @@ -391,15 +391,15 @@ void pcps_acquisition::send_negative_acquisition() { // Declare negative acquisition using a message port // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL - LOG(INFO) << "negative acquisition" - << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN - << ", sample_stamp " << d_sample_counter - << ", test statistics value " << d_test_statistics - << ", test statistics threshold " << d_threshold - << ", code phase " << d_gnss_synchro->Acq_delay_samples - << ", doppler " << d_gnss_synchro->Acq_doppler_hz - << ", magnitude " << d_mag - << ", input signal power " << d_input_power; + DLOG(INFO) << "negative acquisition" + << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN + << ", sample_stamp " << d_sample_counter + << ", test statistics value " << d_test_statistics + << ", test statistics threshold " << d_threshold + << ", code phase " << d_gnss_synchro->Acq_delay_samples + << ", doppler " << d_gnss_synchro->Acq_doppler_hz + << ", magnitude " << d_mag + << ", input signal power " << d_input_power; d_positive_acq = 0; this->message_port_pub(pmt::mp("events"), pmt::from_long(2)); } From edc6444e5b3c706fe1e0d202c48d5656d562753f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 10 Feb 2020 11:13:15 +0100 Subject: [PATCH 05/21] Add SPDX license identifier in header --- src/algorithms/observables/libs/CMakeLists.txt | 13 +------------ src/algorithms/observables/libs/obs_conf.cc | 15 ++------------- src/algorithms/observables/libs/obs_conf.h | 13 +------------ 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index dbb70d7b9..fec53a212 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -2,18 +2,7 @@ # # This file is part of GNSS-SDR. # -# GNSS-SDR is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# GNSS-SDR is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNSS-SDR. If not, see . +# SPDX-License-Identifier: GPL-3.0-or-later # set(OBSERVABLES_LIB_HEADERS ${OBSERVABLES_LIB_HEADERS} obs_conf.h) diff --git a/src/algorithms/observables/libs/obs_conf.cc b/src/algorithms/observables/libs/obs_conf.cc index d16e3eb66..be42811df 100644 --- a/src/algorithms/observables/libs/obs_conf.cc +++ b/src/algorithms/observables/libs/obs_conf.cc @@ -1,5 +1,5 @@ /*! - * \file obs_conf.h + * \file obs_conf.cc * \brief Class that contains all the configuration parameters for generic * observables block * \author Javier Arribas, 2020. jarribas(at)cttc.es @@ -13,18 +13,7 @@ * * This file is part of GNSS-SDR. * - * GNSS-SDR is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * GNSS-SDR is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNSS-SDR. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later * * ------------------------------------------------------------------------- */ diff --git a/src/algorithms/observables/libs/obs_conf.h b/src/algorithms/observables/libs/obs_conf.h index 6f98cd61b..c523013c6 100644 --- a/src/algorithms/observables/libs/obs_conf.h +++ b/src/algorithms/observables/libs/obs_conf.h @@ -13,18 +13,7 @@ * * This file is part of GNSS-SDR. * - * GNSS-SDR is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * GNSS-SDR is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNSS-SDR. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later * * ------------------------------------------------------------------------- */ From ce9d4b48e929a34885b80d7035b23c94ea26d62c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 10 Feb 2020 12:17:10 +0100 Subject: [PATCH 06/21] Fix CMakeLists files, clean dependencies relationships --- src/algorithms/observables/adapters/CMakeLists.txt | 2 +- .../observables/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/observables/libs/CMakeLists.txt | 8 -------- src/algorithms/observables/libs/obs_conf.h | 11 ++++------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index 6454fdd27..749fe7f80 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/CMakeLists.txt @@ -27,8 +27,8 @@ target_link_libraries(obs_adapters PUBLIC obs_gr_blocks algorithms_libs - observables_libs PRIVATE + observables_libs Gflags::gflags Glog::glog ) diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 2a3cd70f3..53e587a4a 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -36,8 +36,8 @@ target_link_libraries(obs_gr_blocks PUBLIC Boost::headers Gnuradio::blocks - PRIVATE observables_libs + PRIVATE algorithms_libs core_system_parameters Gflags::gflags diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index fec53a212..8966cbd0c 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -18,14 +18,6 @@ add_library(observables_libs ${OBSERVABLES_LIB_HEADERS} ) -target_link_libraries(observables_libs - PRIVATE - Gflags::gflags - Glog::glog - algorithms_libs - core_system_parameters -) - if(ENABLE_CLANG_TIDY) if(CLANG_TIDY_EXE) set_target_properties(observables_libs diff --git a/src/algorithms/observables/libs/obs_conf.h b/src/algorithms/observables/libs/obs_conf.h index c523013c6..81ea242e3 100644 --- a/src/algorithms/observables/libs/obs_conf.h +++ b/src/algorithms/observables/libs/obs_conf.h @@ -18,11 +18,9 @@ * ------------------------------------------------------------------------- */ -#ifndef GNSS_SDR_OBS_CONF_H_ -#define GNSS_SDR_OBS_CONF_H_ +#ifndef GNSS_SDR_OBS_CONF_H +#define GNSS_SDR_OBS_CONF_H -#include "configuration_interface.h" -#include #include #include @@ -31,13 +29,12 @@ class Obs_Conf public: bool enable_carrier_smoothing; double smoothing_factor; - unsigned int nchannels_in; - unsigned int nchannels_out; + uint32_t nchannels_in; + uint32_t nchannels_out; bool dump; bool dump_mat; std::string dump_filename; - Obs_Conf(); }; From 2dd993bbf2663b3f05254cfb419e637346e05693 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 10 Feb 2020 12:17:26 +0100 Subject: [PATCH 07/21] Update changelog --- docs/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/changelog b/docs/changelog index 65e80f290..c97fda85a 100644 --- a/docs/changelog +++ b/docs/changelog @@ -81,6 +81,11 @@ SPDX-License-Identifier: GPL-3.0-or-later - All constructors callable with one argument are marked with the keyword explicit. See MISRA C++:2008, 12-1-3 - All constructors that are callable with a single argument of fundamental type shall be declared explicit. +### Improvements in Repeatability: + +- Added the option to apply carrier smoothing of code pseudoranges with new Observables parameter enable_carrier_smoothing. + + ### Improvements in Testability: - Add receiver runtime to position_test report. From d88cd25f030c85c313f242dd49504ceecafc8b86 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 10 Feb 2020 19:51:33 +0100 Subject: [PATCH 08/21] Add new carrier_smoothing_factor flag Fix some public/private dependency issues Add enable_carrier_smoothing flag to position_test --- src/algorithms/libs/gnss_sdr_flags.cc | 1 + src/algorithms/libs/gnss_sdr_flags.h | 4 ++++ src/algorithms/observables/adapters/CMakeLists.txt | 1 + .../observables/adapters/hybrid_observables.cc | 12 +++++++++--- src/algorithms/observables/libs/CMakeLists.txt | 5 +++++ src/algorithms/observables/libs/obs_conf.cc | 3 ++- src/algorithms/tracking/adapters/CMakeLists.txt | 2 +- .../tracking/gnuradio_blocks/CMakeLists.txt | 3 ++- src/algorithms/tracking/libs/CMakeLists.txt | 1 + src/tests/CMakeLists.txt | 8 ++++---- src/tests/system-tests/libs/position_test_flags.h | 2 ++ src/tests/system-tests/position_test.cc | 3 +++ 12 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc index 4983f8776..ad8e0746a 100644 --- a/src/algorithms/libs/gnss_sdr_flags.cc +++ b/src/algorithms/libs/gnss_sdr_flags.cc @@ -71,6 +71,7 @@ DEFINE_double(dll_bw_hz, 0.0, "If defined, bandwidth of the DLL low pass filter, DEFINE_double(pll_bw_hz, 0.0, "If defined, bandwidth of the PLL low pass filter, in Hz (overrides the configuration file)."); +DEFINE_double(carrier_smoothing_factor, DEFAULT_CARRIER_SMOOTHING_FACTOR, "Sets carrier smoothing factor M"); #if GFLAGS_GREATER_2_0 diff --git a/src/algorithms/libs/gnss_sdr_flags.h b/src/algorithms/libs/gnss_sdr_flags.h index 3f4669414..4e3b76ddd 100644 --- a/src/algorithms/libs/gnss_sdr_flags.h +++ b/src/algorithms/libs/gnss_sdr_flags.h @@ -46,6 +46,10 @@ DECLARE_double(carrier_lock_th); //!< Carrier lock threshold (in rad). DECLARE_double(dll_bw_hz); //!< Bandwidth of the DLL low pass filter, in Hz (overrides the configuration file). DECLARE_double(pll_bw_hz); //!< Bandwidth of the PLL low pass filter, in Hz (overrides the configuration file). +// Declare flags for observables block +DECLARE_double(carrier_smoothing_factor); //!< Sets carrier smoothing factor M (overrides the configuration file). +const double DEFAULT_CARRIER_SMOOTHING_FACTOR = 200.0; + // Declare flags for PVT DECLARE_string(RINEX_version); //!< If defined, specifies the RINEX version (2.11 or 3.02). Overrides the configuration file. diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index 749fe7f80..b91c413fe 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/CMakeLists.txt @@ -28,6 +28,7 @@ target_link_libraries(obs_adapters obs_gr_blocks algorithms_libs PRIVATE + gnss_sdr_flags observables_libs Gflags::gflags Glog::glog diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index 85a265a46..4ba708aa5 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -20,11 +20,13 @@ #include "hybrid_observables.h" #include "configuration_interface.h" +#include "gnss_sdr_flags.h" #include "obs_conf.h" #include +#include // for std::fabs +#include // for epsilon() #include // for operator<< - HybridObservables::HybridObservables(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { @@ -41,9 +43,13 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration, conf.dump_filename = dump_filename_; conf.nchannels_in = in_streams_; conf.nchannels_out = out_streams_; + conf.enable_carrier_smoothing = configuration->property(role + ".enable_carrier_smoothing", conf.enable_carrier_smoothing); + + if (std::fabs(FLAGS_carrier_smoothing_factor - DEFAULT_CARRIER_SMOOTHING_FACTOR) <= std::numeric_limits::epsilon()) // compare doubles + { + conf.smoothing_factor = configuration->property(role + ".smoothing_factor", conf.smoothing_factor); + } - conf.enable_carrier_smoothing = configuration->property(role + ".enable_carrier_smoothing", false); - conf.smoothing_factor = configuration->property(role + ".smoothing_factor", 200.0); if (conf.enable_carrier_smoothing == true) { LOG(INFO) << "Observables carrier smoothing enabled with smoothing factor " << conf.smoothing_factor; diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index 8966cbd0c..4f3b8ab50 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -18,6 +18,11 @@ add_library(observables_libs ${OBSERVABLES_LIB_HEADERS} ) +target_link_libraries(observables_libs + PRIVATE + gnss_sdr_flags +) + if(ENABLE_CLANG_TIDY) if(CLANG_TIDY_EXE) set_target_properties(observables_libs diff --git a/src/algorithms/observables/libs/obs_conf.cc b/src/algorithms/observables/libs/obs_conf.cc index be42811df..c2a8ad0f6 100644 --- a/src/algorithms/observables/libs/obs_conf.cc +++ b/src/algorithms/observables/libs/obs_conf.cc @@ -19,11 +19,12 @@ */ #include "obs_conf.h" +#include "gnss_sdr_flags.h" Obs_Conf::Obs_Conf() { enable_carrier_smoothing = false; - smoothing_factor = 200; + smoothing_factor = FLAGS_carrier_smoothing_factor; nchannels_in = 0; nchannels_out = 0; dump = false; diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index 9912e385f..2f74163a7 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -86,9 +86,9 @@ target_link_libraries(tracking_adapters PUBLIC tracking_gr_blocks algorithms_libs - gnss_sdr_flags Gnuradio::runtime PRIVATE + gnss_sdr_flags Volkgnsssdr::volkgnsssdr ) diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index c5163669a..30902355b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -82,9 +82,10 @@ target_link_libraries(tracking_gr_blocks Gnuradio::blocks Matio::matio Volkgnsssdr::volkgnsssdr - gnss_sdr_flags algorithms_libs tracking_libs + PRIVATE + gnss_sdr_flags ) if(ENABLE_CUDA AND NOT CMAKE_VERSION VERSION_GREATER 3.11) diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index cfb4b97e6..17ea7d9f6 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -84,6 +84,7 @@ target_link_libraries(tracking_libs algorithms_libs ${OPT_TRACKING_LIBRARIES} PRIVATE + gnss_sdr_flags Gflags::gflags Glog::glog ) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index c31904616..8c71cfaff 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -649,13 +649,13 @@ if(ENABLE_SYSTEM_TESTING) if(ENABLE_SYSTEM_TESTING_EXTRA) #### POSITION_TEST - set(OPT_LIBS_ Boost::thread - Threads::Threads Gflags::gflags Glog::glog + set(OPT_LIBS_ + algorithms_libs core_receiver core_system_parameters gnss_sdr_flags + system_testing_lib signal_processing_testing_lib + Boost::thread Threads::Threads Gflags::gflags Glog::glog GTest::GTest GTest::Main Gnuradio::runtime Gnuradio::blocks Gnuradio::filter Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr - algorithms_libs core_receiver core_system_parameters - system_testing_lib signal_processing_testing_lib ) add_system_test(position_test) if(NOT GNSSSIMULATOR_FOUND OR ENABLE_GNSS_SIM_INSTALL) diff --git a/src/tests/system-tests/libs/position_test_flags.h b/src/tests/system-tests/libs/position_test_flags.h index 646719c26..3a847f346 100644 --- a/src/tests/system-tests/libs/position_test_flags.h +++ b/src/tests/system-tests/libs/position_test_flags.h @@ -37,4 +37,6 @@ DEFINE_double(accuracy_CEP, 2.0, "Static scenario 2D (East, North) accuracy Circ DEFINE_double(precision_SEP, 10.0, "Static scenario 3D (East, North, Up) precision Spherical Error Position (SEP) threshold [meters]"); DEFINE_double(dynamic_3D_position_RMSE, 10.0, "Dynamic scenario 3D (ECEF) accuracy RMSE threshold [meters]"); DEFINE_double(dynamic_3D_velocity_RMSE, 5.0, "Dynamic scenario 3D (ECEF) velocity accuracy RMSE threshold [meters/second]"); +DEFINE_bool(enable_carrier_smoothing, false, "Activates carrier smoothing of pseudoranges"); + #endif diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc index 9ad8a1409..27b149823 100644 --- a/src/tests/system-tests/position_test.cc +++ b/src/tests/system-tests/position_test.cc @@ -28,6 +28,7 @@ #include "control_thread.h" #include "file_configuration.h" #include "geofunctions.h" +#include "gnss_sdr_flags.h" #include "gnuplot_i.h" #include "in_memory_configuration.h" #include "position_test_flags.h" @@ -302,6 +303,8 @@ int PositionSystemTest::configure_receiver() // Set Observables config->set_property("Observables.implementation", "Hybrid_Observables"); + config->set_property("Observables.enable_carrier_smoothing", FLAGS_enable_carrier_smoothing ? "true" : "false"); + config->set_property("Observables.smoothing_factor", std::to_string(FLAGS_carrier_smoothing_factor)); config->set_property("Observables.dump", "false"); config->set_property("Observables.dump_filename", "./observables.dat"); From 8c16ceca1478d6c64226a79de02cee7a323efc82 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 12:19:48 +0100 Subject: [PATCH 09/21] Move gnss_sdr_flags dependency to private --- src/algorithms/acquisition/adapters/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 7368e05de..92260311f 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -85,7 +85,6 @@ add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS}) target_link_libraries(acquisition_adapters PUBLIC algorithms_libs - gnss_sdr_flags acquisition_gr_blocks acquisition_libs channel_libs @@ -93,6 +92,7 @@ target_link_libraries(acquisition_adapters Gnuradio::blocks Volk::volk PRIVATE + gnss_sdr_flags Boost::headers Gflags::gflags Glog::glog From 39f4adb0582074596a80a4a1c3b6a49c48655ab6 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 12:56:33 +0100 Subject: [PATCH 10/21] Remove unused dependencies --- src/algorithms/acquisition/adapters/CMakeLists.txt | 10 ++++++++-- .../acquisition/adapters/beidou_b1i_pcps_acquisition.h | 1 - .../acquisition/adapters/beidou_b3i_pcps_acquisition.h | 1 - .../adapters/galileo_e1_pcps_ambiguous_acquisition.h | 1 - .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h | 1 - .../acquisition/adapters/gps_l2_m_pcps_acquisition.h | 1 - .../adapters/gps_l2_m_pcps_acquisition_fpga.h | 3 +-- .../acquisition/adapters/gps_l5i_pcps_acquisition.h | 1 - src/algorithms/acquisition/libs/CMakeLists.txt | 2 -- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 92260311f..221bd088f 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -90,16 +90,22 @@ target_link_libraries(acquisition_adapters channel_libs core_system_parameters Gnuradio::blocks - Volk::volk PRIVATE gnss_sdr_flags Boost::headers Gflags::gflags Glog::glog Gnuradio::fft - Volkgnsssdr::volkgnsssdr ) +if(ENABLE_FPGA) + target_link_libraries(acquisition_adapters + PRIVATE + Volk::volk + Volkgnsssdr::volkgnsssdr + ) +endif() + target_include_directories(acquisition_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/core/interfaces diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index b9f278266..13ed28e62 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -29,7 +29,6 @@ #include "pcps_acquisition.h" #include #include -#include #include #include #include diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h index a3c74bd96..a21589291 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h @@ -28,7 +28,6 @@ #include "pcps_acquisition.h" #include #include -#include #include #include #include diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 9cf81ec23..4f729d44e 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -27,7 +27,6 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include -#include #include #include #include diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index 5cd490fb6..22e945573 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -31,7 +31,6 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include -#include #include #include #include diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index 49fe97f7f..50de93b3a 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -28,7 +28,6 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include -#include #include #include #include diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index c7b4405f8..8b53a85a4 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h @@ -26,7 +26,6 @@ #include "channel_fsm.h" #include "pcps_acquisition_fpga.h" #include // for basic_block_sptr, top_block_sptr -#include // for lv_16sc_t #include // for size_t #include // for weak_ptr #include // for string @@ -64,7 +63,7 @@ public: inline size_t item_size() override { - return sizeof(lv_16sc_t); + return sizeof(float); } void connect(gr::top_block_sptr top_block) override; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 2eff5e4fe..f4d7d8937 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -28,7 +28,6 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include -#include #include #include #include diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt index 50c400c86..ceed9f0f8 100644 --- a/src/algorithms/acquisition/libs/CMakeLists.txt +++ b/src/algorithms/acquisition/libs/CMakeLists.txt @@ -24,8 +24,6 @@ add_library(acquisition_libs ) target_link_libraries(acquisition_libs - PUBLIC - Volk::volk PRIVATE Gflags::gflags Glog::glog From 68388bd6c58746d1da63be821fb8f105e4ff4afa Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 13:20:03 +0100 Subject: [PATCH 11/21] Sort out dependencies --- src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt | 2 +- .../resampler/adapters/direct_resampler_conditioner.cc | 2 +- src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt | 3 ++- .../gnuradio_blocks/direct_resampler_conditioner_cb.cc | 3 ++- .../gnuradio_blocks/direct_resampler_conditioner_cb.h | 3 ++- .../gnuradio_blocks/direct_resampler_conditioner_cc.cc | 3 ++- .../gnuradio_blocks/direct_resampler_conditioner_cc.h | 3 ++- .../gnuradio_blocks/direct_resampler_conditioner_cs.cc | 3 ++- .../gnuradio_blocks/direct_resampler_conditioner_cs.h | 3 ++- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt index 702e24a03..98783da49 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt @@ -33,8 +33,8 @@ target_link_libraries(input_filter_gr_blocks PUBLIC Gnuradio::blocks Gnuradio::filter - Volkgnsssdr::volkgnsssdr PRIVATE + Volk::volk Log4cpp::log4cpp ) diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index e4fa94e94..58db31c33 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -25,7 +25,7 @@ #include "direct_resampler_conditioner_cs.h" #include #include -#include +#include // for lv_8sc_t #include #include #include diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt index 530c3ea04..bed980f13 100644 --- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt @@ -31,8 +31,9 @@ add_library(resampler_gr_blocks target_link_libraries(resampler_gr_blocks PUBLIC Gnuradio::runtime - Volk::volk Boost::headers # Fix for homebrew + PRIVATE + Volk::volk ) if(ENABLE_CLANG_TIDY) diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc index 4cb51d6dd..f10526f95 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc @@ -23,7 +23,8 @@ #include "direct_resampler_conditioner_cb.h" #include -#include // for min +#include // for lv_8sc_t +#include // for min direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb( diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h index 73be01658..fe18bcdea 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h @@ -21,8 +21,9 @@ #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H +#include #include -#include +#include class direct_resampler_conditioner_cb; using direct_resampler_conditioner_cb_sptr = boost::shared_ptr; diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc index 4555111f6..d3caf1ef9 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc @@ -23,7 +23,8 @@ #include "direct_resampler_conditioner_cc.h" #include -#include // for min +#include // for gr_complex +#include // for min direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc( double sample_freq_in, double sample_freq_out) diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h index 0905b285d..ec975a907 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h @@ -28,8 +28,9 @@ #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H +#include #include -#include +#include class direct_resampler_conditioner_cc; diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc index a16b4b18c..170fd44e5 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc @@ -23,7 +23,8 @@ #include "direct_resampler_conditioner_cs.h" #include -#include // for min +#include // for lv_16sc_t +#include // for min direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs( diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h index 0c40d7424..e7a557de7 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h @@ -21,8 +21,9 @@ #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H +#include #include -#include +#include class direct_resampler_conditioner_cs; using direct_resampler_conditioner_cs_sptr = boost::shared_ptr; From 17e27ace254df391117b5b4a501b8ada8f8d1a33 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 15:36:57 +0100 Subject: [PATCH 12/21] Move Matio dependency to private --- src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index 30902355b..81d11bc0b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -80,11 +80,11 @@ target_link_libraries(tracking_gr_blocks Boost::headers Armadillo::armadillo Gnuradio::blocks - Matio::matio Volkgnsssdr::volkgnsssdr algorithms_libs tracking_libs PRIVATE + Matio::matio gnss_sdr_flags ) From 349cb431d6fea76f8d82a4f42da5cd93f065a2c9 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 16:28:58 +0100 Subject: [PATCH 13/21] Remove unused includes and dependencies --- src/algorithms/data_type_adapter/adapters/CMakeLists.txt | 1 - src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h | 1 - src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt | 1 - .../gnuradio_blocks/interleaved_byte_to_complex_byte.h | 1 - 4 files changed, 4 deletions(-) diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index 87059af66..2c38d8aca 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -39,7 +39,6 @@ target_link_libraries(data_type_adapters Gnuradio::blocks data_type_gr_blocks algorithms_libs - core_system_parameters PRIVATE Gflags::gflags Glog::glog diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h index 8246a7022..2c596b065 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h @@ -22,7 +22,6 @@ #include "conjugate_cc.h" #include "gnss_block_interface.h" -#include "gnss_synchro.h" #include #include #include diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index 5a136f0bf..044158bbe 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(data_type_gr_blocks PUBLIC Gnuradio::runtime Boost::headers - algorithms_libs PRIVATE Volk::volk ) diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h index 07e3e6df3..f4f9b51e4 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h @@ -20,7 +20,6 @@ #ifndef GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H #define GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H - #include #include From 0545369941d952954b45fa9430839f354248cc2d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 16:48:35 +0100 Subject: [PATCH 14/21] Remove unused dependency --- src/algorithms/input_filter/adapters/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index acdeb6fe3..44b3db143 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -38,7 +38,6 @@ target_link_libraries(input_filter_adapters Gnuradio::blocks Gnuradio::filter input_filter_gr_blocks - algorithms_libs PRIVATE Gflags::gflags Glog::glog From dfc02b2e5cfe5312d82906259a10fe82cb6d46fc Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 17:27:54 +0100 Subject: [PATCH 15/21] Sort dependencies, remove unused ones --- src/algorithms/PVT/adapters/CMakeLists.txt | 1 - src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt | 1 - src/algorithms/PVT/libs/CMakeLists.txt | 2 +- src/algorithms/data_type_adapter/adapters/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index d135313dd..a5ccd387f 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/src/algorithms/PVT/adapters/CMakeLists.txt @@ -22,7 +22,6 @@ target_link_libraries(pvt_adapters PUBLIC pvt_gr_blocks algorithms_libs_rtklib - core_system_parameters PRIVATE gnss_sdr_flags pvt_libs diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index 0f3f38c30..fc5463b15 100644 --- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt @@ -36,7 +36,6 @@ target_link_libraries(pvt_gr_blocks Gnuradio::runtime PRIVATE pvt_libs - algorithms_libs Gflags::gflags Glog::glog Boost::serialization diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 1d33bdfec..6fc18650f 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -65,10 +65,10 @@ target_link_libraries(pvt_libs Armadillo::armadillo Boost::date_time protobuf::libprotobuf - algorithms_libs_rtklib core_system_parameters PRIVATE algorithms_libs + algorithms_libs_rtklib Gflags::gflags Glog::glog Matio::matio diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index 2c38d8aca..ee237efff 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -38,7 +38,6 @@ target_link_libraries(data_type_adapters PUBLIC Gnuradio::blocks data_type_gr_blocks - algorithms_libs PRIVATE Gflags::gflags Glog::glog From 207b01a6c0cab65252f5dc17ffe28a968b266ba8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 19:34:21 +0100 Subject: [PATCH 16/21] Make the carrier smoothing parameter an integer --- src/algorithms/libs/gnss_sdr_flags.cc | 18 +++++++++++++++--- src/algorithms/libs/gnss_sdr_flags.h | 5 +++-- .../observables/adapters/hybrid_observables.cc | 4 +--- .../gnuradio_blocks/hybrid_observables_gs.cc | 2 +- src/algorithms/observables/libs/obs_conf.h | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc index ad8e0746a..97eacb24b 100644 --- a/src/algorithms/libs/gnss_sdr_flags.cc +++ b/src/algorithms/libs/gnss_sdr_flags.cc @@ -19,7 +19,6 @@ #include "gnss_sdr_flags.h" -#include #include #include @@ -71,7 +70,7 @@ DEFINE_double(dll_bw_hz, 0.0, "If defined, bandwidth of the DLL low pass filter, DEFINE_double(pll_bw_hz, 0.0, "If defined, bandwidth of the PLL low pass filter, in Hz (overrides the configuration file)."); -DEFINE_double(carrier_smoothing_factor, DEFAULT_CARRIER_SMOOTHING_FACTOR, "Sets carrier smoothing factor M"); +DEFINE_int32(carrier_smoothing_factor, DEFAULT_CARRIER_SMOOTHING_FACTOR, "Sets carrier smoothing factor M (overrides the configuration file)"); #if GFLAGS_GREATER_2_0 @@ -215,6 +214,19 @@ static bool ValidatePllBw(const char* flagname, double value) return false; } +static bool ValidateCarrierSmoothingFactor(const char* flagname, int32_t value) +{ + const int32_t min_value = 1; + if (value >= min_value) + { // value is ok + return true; + } + std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 1 <= " << flagname << "." << std::endl; + std::cout << "GNSS-SDR program ended." << std::endl; + return false; +} + + DEFINE_validator(c, &ValidateC); DEFINE_validator(config_file, &ValidateConfigFile); DEFINE_validator(s, &ValidateS); @@ -227,6 +239,6 @@ DEFINE_validator(max_lock_fail, &ValidateMaxLockFail); DEFINE_validator(carrier_lock_th, &ValidateCarrierLockTh); DEFINE_validator(dll_bw_hz, &ValidateDllBw); DEFINE_validator(pll_bw_hz, &ValidatePllBw); - +DEFINE_validator(carrier_smoothing_factor, &ValidateCarrierSmoothingFactor); #endif diff --git a/src/algorithms/libs/gnss_sdr_flags.h b/src/algorithms/libs/gnss_sdr_flags.h index 4e3b76ddd..6b22e5cbc 100644 --- a/src/algorithms/libs/gnss_sdr_flags.h +++ b/src/algorithms/libs/gnss_sdr_flags.h @@ -22,6 +22,7 @@ #include +#include DECLARE_string(c); //!< Path to the configuration file. DECLARE_string(config_file); //!< Path to the configuration file. @@ -47,8 +48,8 @@ DECLARE_double(dll_bw_hz); //!< Bandwidth of the DLL low pass filter DECLARE_double(pll_bw_hz); //!< Bandwidth of the PLL low pass filter, in Hz (overrides the configuration file). // Declare flags for observables block -DECLARE_double(carrier_smoothing_factor); //!< Sets carrier smoothing factor M (overrides the configuration file). -const double DEFAULT_CARRIER_SMOOTHING_FACTOR = 200.0; +DECLARE_int32(carrier_smoothing_factor); //!< Sets carrier smoothing factor M (overrides the configuration file). +const int32_t DEFAULT_CARRIER_SMOOTHING_FACTOR = 200; // Declare flags for PVT DECLARE_string(RINEX_version); //!< If defined, specifies the RINEX version (2.11 or 3.02). Overrides the configuration file. diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index 4ba708aa5..25b6b37c0 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -23,8 +23,6 @@ #include "gnss_sdr_flags.h" #include "obs_conf.h" #include -#include // for std::fabs -#include // for epsilon() #include // for operator<< HybridObservables::HybridObservables(ConfigurationInterface* configuration, @@ -45,7 +43,7 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration, conf.nchannels_out = out_streams_; conf.enable_carrier_smoothing = configuration->property(role + ".enable_carrier_smoothing", conf.enable_carrier_smoothing); - if (std::fabs(FLAGS_carrier_smoothing_factor - DEFAULT_CARRIER_SMOOTHING_FACTOR) <= std::numeric_limits::epsilon()) // compare doubles + if (FLAGS_carrier_smoothing_factor == DEFAULT_CARRIER_SMOOTHING_FACTOR) { conf.smoothing_factor = configuration->property(role + ".smoothing_factor", conf.smoothing_factor); } diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 9e32585b6..ef4969828 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -135,7 +135,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block( d_channel_last_pseudorange_smooth = std::vector(d_nchannels_out, 0.0); d_channel_last_carrier_phase_rads = std::vector(d_nchannels_out, 0.0); - d_smooth_filter_M = conf_.smoothing_factor; + d_smooth_filter_M = static_cast(conf_.smoothing_factor); } diff --git a/src/algorithms/observables/libs/obs_conf.h b/src/algorithms/observables/libs/obs_conf.h index 81ea242e3..e7d98030f 100644 --- a/src/algorithms/observables/libs/obs_conf.h +++ b/src/algorithms/observables/libs/obs_conf.h @@ -28,7 +28,7 @@ class Obs_Conf { public: bool enable_carrier_smoothing; - double smoothing_factor; + int32_t smoothing_factor; uint32_t nchannels_in; uint32_t nchannels_out; bool dump; From d65daac9710551cba03c02855d92fd0594ffe70e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 21:47:13 +0100 Subject: [PATCH 17/21] Code formatting (cpplint.py --filter=-,+whitespace/tab,+whitespace/comments) --- .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 16 ++++++++------- .../gnuradio_blocks/pcps_acquisition.cc | 10 +++++----- .../gnuradio_blocks/hybrid_observables_gs.cc | 17 ++++++++-------- .../signal_source/libs/ad9361_manager.cc | 8 ++++---- .../glonass_l1_ca_dll_pll_tracking_cc.cc | 1 - ...cps_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 2 +- ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 2 +- ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc | 12 ++--------- ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 10 +--------- .../observables/hybrid_observables_test.cc | 16 ++++++++------- .../hybrid_observables_test_fpga.cc | 13 +++++------- .../tracking/tracking_pull-in_test_fpga.cc | 20 +++++++++---------- 13 files changed, 56 insertions(+), 73 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 07fcd7f59..e633559a6 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -1895,14 +1895,15 @@ std::map rtklib_pvt_gs::interpolate_observables(std::map::iterator observables_iter; for (observables_iter = gnss_observables_map.begin(); observables_iter != gnss_observables_map.end(); observables_iter++) { - //check if an initialization is required (new satellite or loss of lock) - //it is set to false by the work function if the gnss_synchro is not valid + // check if an initialization is required (new satellite or loss of lock) + // it is set to false by the work function if the gnss_synchro is not valid if (channel_initialized.at(observables_iter->second.Channel_ID) == false) { double wavelength_m = 0; @@ -1948,11 +1949,12 @@ void rtklib_pvt_gs::initialize_and_apply_carrier_phase_offset() channel_initialized.at(observables_iter->second.Channel_ID) = true; DLOG(INFO) << "initialized carrier phase at channel " << observables_iter->second.Channel_ID; } - //apply the carrier phase offset to this satellite + // apply the carrier phase offset to this satellite observables_iter->second.Carrier_phase_rads = observables_iter->second.Carrier_phase_rads + initial_carrier_phase_offset_estimation_rads.at(observables_iter->second.Channel_ID); } } + int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items __attribute__((unused))) { @@ -2075,7 +2077,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item } else { - channel_initialized.at(i) = false; //the current channel is not reporting valid observable + channel_initialized.at(i) = false; // the current channel is not reporting valid observable } } @@ -2159,8 +2161,8 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item if (flag_pvt_valid == true) { - //initialize (if needed) the accumulated phase offset and apply it to the active channels - //required to report accumulated phase cycles comparable to pseudoranges + // initialize (if needed) the accumulated phase offset and apply it to the active channels + // required to report accumulated phase cycles comparable to pseudoranges initialize_and_apply_carrier_phase_offset(); double Rx_clock_offset_s = d_user_pvt_solver->get_time_offset_s(); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index 530886907..80fb00959 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -119,11 +119,11 @@ pcps_acquisition::pcps_acquisition(const Acq_Conf& conf_) : gr::block("pcps_acqu // // We can avoid this by doing linear correlation, effectively doubling the // size of the input buffer and padding the code with zeros. - //if (acq_parameters.bit_transition_flag) - //{ - //d_fft_size = d_consumed_samples * 2; - //acq_parameters.max_dwells = 1; // Activation of acq_parameters.bit_transition_flag invalidates the value of acq_parameters.max_dwells - //} + // if (acq_parameters.bit_transition_flag) + // { + // d_fft_size = d_consumed_samples * 2; + // acq_parameters.max_dwells = 1; // Activation of acq_parameters.bit_transition_flag invalidates the value of acq_parameters.max_dwells + // } d_tmp_buffer = volk_gnsssdr::vector(d_fft_size); d_fft_codes = volk_gnsssdr::vector>(d_fft_size); diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index ef4969828..5113fb592 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -186,7 +186,7 @@ void hybrid_observables_gs::msg_handler_pvt_to_observables(const pmt::pmt_t &msg double new_rx_clock_offset_s; new_rx_clock_offset_s = boost::any_cast(pmt::any_ref(msg)); T_rx_TOW_ms = T_rx_TOW_ms - static_cast(round(new_rx_clock_offset_s * 1000.0)); - //align the receiver clock to integer multiple of 20 ms + // align the receiver clock to integer multiple of 20 ms if (T_rx_TOW_ms % 20) { T_rx_TOW_ms += 20 - T_rx_TOW_ms % 20; @@ -479,7 +479,7 @@ void hybrid_observables_gs::update_TOW(const std::vector &data) } } T_rx_TOW_ms = TOW_ref; - //align the receiver clock to integer multiple of 20 ms + // align the receiver clock to integer multiple of 20 ms if (T_rx_TOW_ms % 20) { T_rx_TOW_ms += 20 - T_rx_TOW_ms % 20; @@ -527,6 +527,7 @@ void hybrid_observables_gs::compute_pranges(std::vector &data) } } + void hybrid_observables_gs::smooth_pseudoranges(std::vector &data) { std::vector::iterator it; @@ -534,7 +535,7 @@ void hybrid_observables_gs::smooth_pseudoranges(std::vector &data) { if (it->Flag_valid_pseudorange) { - //0. get wavelength for the current signal + // 0. get wavelength for the current signal double wavelength_m = 0; switch (mapStringValues_[it->Signal]) { @@ -575,11 +576,11 @@ void hybrid_observables_gs::smooth_pseudoranges(std::vector &data) break; } - //todo: propagate the PLL lock status in Gnss_Synchro - //1. check if last PLL lock status was false and initialize last d_channel_last_pseudorange_smooth + // todo: propagate the PLL lock status in Gnss_Synchro + // 1. check if last PLL lock status was false and initialize last d_channel_last_pseudorange_smooth if (d_channel_last_pll_lock.at(it->Channel_ID) == true) { - //2. Compute the smoothed pseudorange for this channel + // 2. Compute the smoothed pseudorange for this channel // Hatch filter algorithm (https://insidegnss.com/can-you-list-all-the-properties-of-the-carrier-smoothing-filter/) double r_sm = d_channel_last_pseudorange_smooth.at(it->Channel_ID); double factor = ((d_smooth_filter_M - 1.0) / d_smooth_filter_M); @@ -678,12 +679,12 @@ int hybrid_observables_gs::general_work(int noutput_items __attribute__((unused) compute_pranges(epoch_data); } - //Carrier smoothing (optional) + // Carrier smoothing (optional) if (d_conf.enable_carrier_smoothing == true) { smooth_pseudoranges(epoch_data); } - //output the observables set to the PVT block + // output the observables set to the PVT block for (uint32_t n = 0; n < d_nchannels_out; n++) { out[n][0] = epoch_data[n]; diff --git a/src/algorithms/signal_source/libs/ad9361_manager.cc b/src/algorithms/signal_source/libs/ad9361_manager.cc index d013dd8cf..acd51536f 100644 --- a/src/algorithms/signal_source/libs/ad9361_manager.cc +++ b/src/algorithms/signal_source/libs/ad9361_manager.cc @@ -265,9 +265,9 @@ bool config_ad9361_rx_local(uint64_t bandwidth_, { throw std::runtime_error("Unable to set BB rate"); // set bw - //params.push_back("in_voltage_rf_bandwidth=" + boost::to_string(bandwidth)); + // params.push_back("in_voltage_rf_bandwidth=" + boost::to_string(bandwidth)); } - //wr_ch_str(rx_chan1, "rf_port_select", rf_port_select_.c_str()); + // wr_ch_str(rx_chan1, "rf_port_select", rf_port_select_.c_str()); ret = iio_device_attr_write(ad9361_phy, "in_voltage0_rf_port_select", rf_port_select_.c_str()); if (ret) { @@ -514,9 +514,9 @@ bool config_ad9361_rx_remote(const std::string &remote_host, { throw std::runtime_error("Unable to set BB rate"); // set bw - //params.push_back("in_voltage_rf_bandwidth=" + boost::to_string(bandwidth)); + // params.push_back("in_voltage_rf_bandwidth=" + boost::to_string(bandwidth)); } - //wr_ch_str(rx_chan1, "rf_port_select", rf_port_select_.c_str()); + // wr_ch_str(rx_chan1, "rf_port_select", rf_port_select_.c_str()); ret = iio_device_attr_write(ad9361_phy, "in_voltage0_rf_port_select", rf_port_select_.c_str()); if (ret) { diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc index f96c25b26..bfb89dcfa 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc @@ -213,7 +213,6 @@ void Glonass_L1_Ca_Dll_Pll_Tracking_cc::start_tracking() d_code_loop_filter.initialize(); // initialize the code filter // generate local reference ALWAYS starting at chip 1 (1 sample per chip) - //glonass_l1_ca_code_gen_complex(gsl::span(d_ca_code.data(), GLONASS_L1_CA_CODE_LENGTH_CHIPS), 0); glonass_l1_ca_code_gen_complex(d_ca_code, 0); multicorrelator_cpu.set_local_code_and_taps(static_cast(GLONASS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code.data(), d_local_code_shift_chips.data()); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index e486006ca..3cc669f24 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -238,7 +238,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::config_1() std::to_string(integration_time_ms)); config->set_property("Acquisition_1B.max_dwells", "1"); config->set_property("Acquisition_1B.bit_transition_flag", "false"); - //config->set_property("Acquisition_1B.threshold", "0.1"); + // config->set_property("Acquisition_1B.threshold", "2.5"); config->set_property("Acquisition_1B.pfa", "0.0001"); config->set_property("Acquisition_1B.doppler_max", "10000"); config->set_property("Acquisition_1B.doppler_step", "250"); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index 1e5898848..6f4803509 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -155,7 +155,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::init() config->set_property("Acquisition_1B.item_type", "gr_complex"); config->set_property("Acquisition_1B.coherent_integration_time_ms", "4"); config->set_property("Acquisition_1B.dump", "false"); - //config->set_property("Acquisition_1B.threshold", "0.1"); + // config->set_property("Acquisition_1B.threshold", "2.5"); config->set_property("Acquisition_1B.pfa", "0.001"); config->set_property("Acquisition_1B.doppler_max", "10000"); config->set_property("Acquisition_1B.doppler_step", "125"); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index 648d5fc49..8851beb76 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -166,7 +166,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::init() config->set_property("Acquisition_1B.dump", "false"); } config->set_property("Acquisition_1B.dump_filename", "./tmp-acq-gal1/acquisition"); - //config->set_property("Acquisition_1B.threshold", "0.0001"); + // config->set_property("Acquisition_1B.threshold", "2.5"); config->set_property("Acquisition_1B.pfa", "0.001"); config->set_property("Acquisition_1B.doppler_max", std::to_string(doppler_max)); config->set_property("Acquisition_1B.doppler_step", std::to_string(doppler_step)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc index d5ba2c29c..88cd527f3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc @@ -66,7 +66,7 @@ private: public: int rx_message; - ~GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(); //!< Default destructor + ~GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(); // Default destructor }; @@ -243,7 +243,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::config_1() std::to_string(integration_time_ms)); config->set_property("Acquisition.max_dwells", "1"); config->set_property("Acquisition.implementation", "GLONASS_L1_CA_PCPS_Acquisition"); - //config->set_property("Acquisition.threshold", "0.8"); + // config->set_property("Acquisition.threshold", "2.5"); config->set_property("Acquisition.pfa", "0.001"); config->set_property("Acquisition.doppler_max", "10000"); config->set_property("Acquisition.doppler_step", "250"); @@ -487,10 +487,6 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResults) acquisition->set_doppler_step(500); }) << "Failure setting doppler_step."; - //ASSERT_NO_THROW({ - //acquisition->set_threshold(0.05); - //}) << "Failure setting threshold."; - ASSERT_NO_THROW({ acquisition->connect(top_block); top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); @@ -575,10 +571,6 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResultsProbabilities) acquisition->set_doppler_step(config->property("Acquisition.doppler_step", 500)); }) << "Failure setting doppler_step."; - //ASSERT_NO_THROW({ - //acquisition->set_threshold(config->property("Acquisition.threshold", 0.0)); - //}) << "Failure setting threshold."; - ASSERT_NO_THROW({ acquisition->connect(top_block); top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index c503b47c8..fb6d1c7f2 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -241,7 +241,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test::config_1() config->set_property("Acquisition_1C.coherent_integration_time_ms", std::to_string(integration_time_ms)); config->set_property("Acquisition_1C.max_dwells", "1"); - //config->set_property("Acquisition_1C.threshold", "0.8"); + // config->set_property("Acquisition_1C.threshold", "2.5"); config->set_property("Acquisition_1C.pfa", "0.001"); config->set_property("Acquisition_1C.doppler_max", "10000"); config->set_property("Acquisition_1C.doppler_step", "250"); @@ -480,10 +480,6 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_doppler_step(500); }) << "Failure setting doppler_step."; - //ASSERT_NO_THROW({ - //acquisition->set_threshold(0.5); - //}) << "Failure setting threshold."; - ASSERT_NO_THROW({ acquisition->connect(top_block); top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); @@ -569,10 +565,6 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) acquisition->set_doppler_step(config->property("Acquisition_1C.doppler_step", 500)); }) << "Failure setting doppler_step."; - //ASSERT_NO_THROW({ - //acquisition->set_threshold(config->property("Acquisition_1C.threshold", 0.0)); - //}) << "Failure setting threshold."; - ASSERT_NO_THROW({ acquisition->connect(top_block); top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index ac85e3aa5..be03c4f54 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -129,7 +129,6 @@ HybridObservablesTest_msg_rx::~HybridObservablesTest_msg_rx() = default; // ########################################################### - // ######## GNURADIO BLOCK MESSAGE RECEVER FOR TLM MESSAGES ######### class HybridObservablesTest_tlm_msg_rx; @@ -149,11 +148,13 @@ public: ~HybridObservablesTest_tlm_msg_rx(); //!< Default destructor }; + HybridObservablesTest_tlm_msg_rx_sptr HybridObservablesTest_tlm_msg_rx_make() { return HybridObservablesTest_tlm_msg_rx_sptr(new HybridObservablesTest_tlm_msg_rx()); } + void HybridObservablesTest_tlm_msg_rx::msg_handler_events(pmt::pmt_t msg) { try @@ -168,6 +169,7 @@ void HybridObservablesTest_tlm_msg_rx::msg_handler_events(pmt::pmt_t msg) } } + HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block("HybridObservablesTest_tlm_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) { this->message_port_register_in(pmt::mp("events")); @@ -175,6 +177,7 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block rx_message = 0; } + HybridObservablesTest_tlm_msg_rx::~HybridObservablesTest_tlm_msg_rx() = default; @@ -289,6 +292,7 @@ public: size_t item_size; }; + int HybridObservablesTest::configure_generator() { // Configure signal generator @@ -538,7 +542,6 @@ bool HybridObservablesTest::acquire_signal() // top_block->connect(head_samples, 0, acquisition->get_left_block(), 0); } - boost::shared_ptr msg_rx; try { @@ -734,8 +737,8 @@ void HybridObservablesTest::configure_receiver( } config->set_property("Tracking.early_late_space_chips", "0.5"); config->set_property("Tracking.track_pilot", "true"); - //config->set_property("Tracking.pll_filter_order", "2"); - //config->set_property("Tracking.dll_filter_order", "2"); + // config->set_property("Tracking.pll_filter_order", "2"); + // config->set_property("Tracking.dll_filter_order", "2"); config->set_property("TelemetryDecoder.implementation", "Galileo_E5a_Telemetry_Decoder"); } @@ -749,8 +752,8 @@ void HybridObservablesTest::configure_receiver( config->set_property("Tracking.early_late_space_chips", "0.5"); config->set_property("Tracking.track_pilot", "true"); - //config->set_property("Tracking.pll_filter_order", "2"); - //config->set_property("Tracking.dll_filter_order", "2"); + // config->set_property("Tracking.pll_filter_order", "2"); + // config->set_property("Tracking.dll_filter_order", "2"); config->set_property("TelemetryDecoder.implementation", "GPS_L5_Telemetry_Decoder"); } @@ -2016,7 +2019,6 @@ TEST_F(HybridObservablesTest, ValidationOfResults) if (sat1_ch_id != -1 and sat2_ch_id != -1) { // compute single differences for the duplicated satellite - check_results_duplicated_satellite( measured_obs_vec.at(sat1_ch_id), measured_obs_vec.at(sat2_ch_id), diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc index d52f5ee52..62910b295 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc @@ -441,7 +441,7 @@ void* handler_DMA_obs_test(void* arguments) dma_index += 4; } - //std::cout << "DMA: sending nsamples_block_size = " << nsamples_block_size << " samples" << std::endl; + // std::cout << "DMA: sending nsamples_block_size = " << nsamples_block_size << " samples" << std::endl; if (write(tx_fd, input_samples_dma.data(), (int)(nsamples_block_size * 4)) != (int)(nsamples_block_size * 4)) { std::cerr << "Error: DMA could not send all the required samples " << std::endl; @@ -527,6 +527,7 @@ private: bool acquisition_successful; }; + bool HybridObservablesTestFpga::acquire_signal() { pthread_t thread_DMA, thread_acquisition; @@ -542,7 +543,7 @@ bool HybridObservablesTestFpga::acquire_signal() // Satellite signal definition Gnss_Synchro tmp_gnss_synchro; tmp_gnss_synchro.Channel_ID = 0; - //config = std::make_shared(); + config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(baseband_sampling_freq)); std::shared_ptr acquisition; @@ -1228,6 +1229,7 @@ void HybridObservablesTestFpga::check_results_carrier_doppler( ASSERT_LT(rmse_ch0, 30); } + void HybridObservablesTestFpga::check_results_duplicated_satellite( arma::mat& measured_sat1, arma::mat& measured_sat2, @@ -1724,7 +1726,6 @@ bool HybridObservablesTestFpga::ReadRinexObs(std::vector* obs_vec, Gn } // End of 'try' block - catch (const gpstk::FFStreamError& e) { std::cout << e; @@ -1845,7 +1846,7 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults) std::cout << "Estimated Initial Doppler " << n.Acq_doppler_hz << " [Hz], estimated Initial code delay " << n.Acq_delay_samples << " [Samples]" << " Acquisition SampleStamp is " << n.Acq_samplestamp_samples << std::endl; - //n.Acq_samplestamp_samples = 0; + // n.Acq_samplestamp_samples = 0; } } @@ -1896,7 +1897,6 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults) gnss_synchro_vec.at(n).Channel_ID = n; // create the tracking channels and create the telemetry decoders - std::shared_ptr trk_ = factory->GetBlock(config, "Tracking", config->property("Tracking.implementation", std::string("undefined")), 1, 1); tracking_ch_vec.push_back(std::dynamic_pointer_cast(trk_)); std::shared_ptr tlm_ = factory->GetBlock(config, "TelemetryDecoder", config->property("TelemetryDecoder.implementation", std::string("undefined")), 1, 1); @@ -1973,7 +1973,6 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults) top_block->connect(ch_out_fpga_sample_counter, 0, observables->get_left_block(), tracking_ch_vec.size()); // extra port for the sample counter pulse }) << "Failure connecting the blocks."; - top_block->start(); usleep(1000000); // give time for the system to start before receiving the start tracking command. @@ -2015,7 +2014,6 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults) acquisition->stop_acquisition(); - EXPECT_NO_THROW({ end = std::chrono::system_clock::now(); elapsed_seconds = end - start; @@ -2343,6 +2341,5 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults) } } - std::cout << "Test completed in " << elapsed_seconds.count() << " [s]" << std::endl; } diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index ae371c139..e44c71536 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -142,6 +142,7 @@ struct acquisition_handler_args_trk_pull_in_test std::shared_ptr acquisition; }; + void* handler_acquisition_trk_pull_in_test(void* arguments) { // the acquisition is a blocking function so we have to @@ -151,6 +152,7 @@ void* handler_acquisition_trk_pull_in_test(void* arguments) return nullptr; } + void* handler_DMA_trk_pull_in_test(void* arguments) { const int MAX_INPUT_SAMPLES_TOTAL = 16384; @@ -196,7 +198,6 @@ void* handler_DMA_trk_pull_in_test(void* arguments) //************************************************************************** // Open input file //************************************************************************** - uint32_t skip_samples = static_cast(FLAGS_skip_samples); if (skip_samples + skip_used_samples > 0) @@ -299,6 +300,7 @@ void* handler_DMA_trk_pull_in_test(void* arguments) return nullptr; } + class TrackingPullInTestFpga : public ::testing::Test { public: @@ -377,10 +379,11 @@ public: std::shared_ptr> queue; - static const int32_t TEST_TRK_PULL_IN_TEST_SKIP_SAMPLES = 1024; //48 + static const int32_t TEST_TRK_PULL_IN_TEST_SKIP_SAMPLES = 1024; // 48 static constexpr float DMA_SIGNAL_SCALING_FACTOR = 8.0; }; + int TrackingPullInTestFpga::configure_generator(double CN0_dBHz, int file_idx) { // Configure signal generator @@ -402,6 +405,7 @@ int TrackingPullInTestFpga::configure_generator(double CN0_dBHz, int file_idx) return 0; } + int TrackingPullInTestFpga::generate_signal() { int child_status; @@ -473,6 +477,7 @@ private: bool acquisition_successful; }; + void TrackingPullInTestFpga::configure_receiver( double PLL_wide_bw_hz, double DLL_wide_bw_hz, @@ -572,7 +577,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID) // Satellite signal definition Gnss_Synchro tmp_gnss_synchro; tmp_gnss_synchro.Channel_ID = 0; - //config = std::make_shared(); + // config = std::make_shared(); config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(baseband_sampling_freq)); std::shared_ptr acquisition; @@ -924,7 +929,7 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) << " Acquisition SampleStamp is " << acq_samplestamp_map.find(FLAGS_test_satellite_PRN)->second << std::endl; } - long long int acq_to_trk_delay_samples = ceil(static_cast(FLAGS_fs_gen_sps) * FLAGS_acq_to_trk_delay_s); + int64_t acq_to_trk_delay_samples = ceil(static_cast(FLAGS_fs_gen_sps) * FLAGS_acq_to_trk_delay_s); // set the scaling factor args.scaling_factor = DMA_SIGNAL_SCALING_FACTOR; @@ -945,13 +950,11 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) // simulate Code Delay error in acquisition gnss_synchro.Acq_delay_samples = true_acq_delay_samples + (acq_delay_error_chips_values.at(current_acq_doppler_error_idx).at(current_acq_code_error_idx) / GPS_L1_CA_CODE_RATE_CPS) * static_cast(baseband_sampling_freq); - // We need to reset the HW again in order to reset the sample counter. // The HW is reset by sending a command to the acquisition HW accelerator // In order to send the reset command to the HW we instantiate the acquisition module. std::shared_ptr acquisition; - // reset the HW to clear the sample counters: the acquisition constructor generates a reset if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga") { @@ -981,7 +984,6 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) acquisition->stop_acquisition(); // reset the whole system including the sample counters - // create flowgraph top_block = gr::make_top_block("Tracking test"); std::shared_ptr trk_ = factory->GetBlock(config, "Tracking", config->property("Tracking.implementation", std::string("undefined")), 1, 1); @@ -1016,7 +1018,6 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) top_block->msg_connect(tracking->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); }) << "Failure connecting the blocks of tracking test."; - // initialize the internal status of the LPF in the FPGA in the L1/E1 frequency band // ******************************************************************** @@ -1025,10 +1026,8 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) std::cout << "--- START TRACKING WITH PULL-IN ERROR: " << acq_doppler_error_hz_values.at(current_acq_doppler_error_idx) << " [Hz] and " << acq_delay_error_chips_values.at(current_acq_doppler_error_idx).at(current_acq_code_error_idx) << " [Chips] ---" << std::endl; std::chrono::time_point start, end; - top_block->start(); - usleep(1000000); // give time for the system to start before receiving the start tracking command. if (acq_to_trk_delay_samples > 0) @@ -1046,7 +1045,6 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) } } - std::cout << " Starting tracking...\n"; tracking->start_tracking(); From cb95c65d19af170e725f8cded789e9a9592ab8cb Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 11 Feb 2020 22:02:22 +0100 Subject: [PATCH 18/21] Remove Gflags as a public dependency of algorithms_libs --- src/algorithms/libs/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 79bb7b761..f452c17bd 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -92,13 +92,13 @@ target_link_libraries(algorithms_libs PUBLIC Armadillo::armadillo Boost::headers - Gflags::gflags Gnuradio::runtime Gnuradio::blocks PRIVATE core_system_parameters Volk::volk ${ORC_LIBRARIES} Volkgnsssdr::volkgnsssdr + Gflags::gflags Glog::glog ) From 2ded19342f3222dc1143b6b83dc3640babc91a2d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 12 Feb 2020 00:04:29 +0100 Subject: [PATCH 19/21] Improve headers --- CMakeLists.txt | 2 ++ cmake/Modules/AvoidAccelerate.cmake | 4 +++- cmake/Modules/DetectLinuxDistro.cmake | 2 ++ cmake/Modules/DetectMacOSVersion.cmake | 2 ++ cmake/Modules/FindFILESYSTEM.cmake | 2 ++ cmake/Modules/FindGFLAGS.cmake | 4 +++- cmake/Modules/FindGFORTRAN.cmake | 4 +++- cmake/Modules/FindGLOG.cmake | 4 +++- cmake/Modules/FindGNSSSIMULATOR.cmake | 4 +++- cmake/Modules/FindGNURADIO.cmake | 4 +++- cmake/Modules/FindGOOGLETEST.cmake | 4 +++- cmake/Modules/FindGPERFTOOLS.cmake | 4 +++- cmake/Modules/FindGPSTK.cmake | 4 +++- cmake/Modules/FindGRDBFCTTC.cmake | 4 +++- cmake/Modules/FindGRGN3S.cmake | 4 +++- cmake/Modules/FindGRIIO.cmake | 4 +++- cmake/Modules/FindGROSMOSDR.cmake | 4 +++- cmake/Modules/FindLIBAD9361.cmake | 4 +++- cmake/Modules/FindLIBIIO.cmake | 4 +++- cmake/Modules/FindLOG4CPP.cmake | 4 +++- cmake/Modules/FindMATIO.cmake | 4 +++- cmake/Modules/FindOPENCL.cmake | 4 +++- cmake/Modules/FindORC.cmake | 4 +++- cmake/Modules/FindPUGIXML.cmake | 4 +++- cmake/Modules/FindTELEORBIT.cmake | 4 +++- cmake/Modules/FindUHD.cmake | 4 +++- cmake/Modules/FindVOLK.cmake | 4 +++- cmake/Modules/FindVOLKGNSSSDR.cmake | 4 +++- cmake/Modules/GnsssdrBuildTypes.cmake | 4 +++- cmake/Modules/SetupPython.cmake | 4 +++- cmake/Modules/TestForARM.cmake | 4 +++- cmake/Toolchains/aarch64-linux-gnu.cmake | 4 +++- cmake/Toolchains/arm-linux-gnueabihf.cmake | 4 +++- cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake | 4 +++- cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake | 4 +++- cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake | 4 +++- cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake | 4 +++- cmake/Toolchains/arm_cortex_a8_softfp_native.cmake | 4 +++- cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake | 4 +++- cmake/Toolchains/oe-sdk_cross.cmake | 4 +++- cmake/Toolchains/raspi3.cmake | 4 +++- cmake/Toolchains/raspi4.cmake | 4 +++- cmake/Toolchains/zynq-7000.cmake | 4 +++- cmake/cmake_uninstall.cmake.in | 4 +++- docs/doxygen/other/main_page.dox | 2 ++ docs/doxygen/other/reference_docs.dox | 2 ++ docs/doxygen/other/signal_model.dox | 2 ++ src/CMakeLists.txt | 4 +++- src/algorithms/CMakeLists.txt | 4 +++- src/algorithms/PVT/CMakeLists.txt | 4 +++- src/algorithms/PVT/adapters/CMakeLists.txt | 4 +++- src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/PVT/libs/CMakeLists.txt | 2 ++ src/algorithms/acquisition/CMakeLists.txt | 4 +++- src/algorithms/acquisition/adapters/CMakeLists.txt | 4 +++- src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/acquisition/libs/CMakeLists.txt | 4 +++- src/algorithms/channel/CMakeLists.txt | 4 +++- src/algorithms/channel/adapters/CMakeLists.txt | 4 +++- src/algorithms/channel/libs/CMakeLists.txt | 4 +++- src/algorithms/conditioner/CMakeLists.txt | 4 +++- src/algorithms/conditioner/adapters/CMakeLists.txt | 4 +++- src/algorithms/data_type_adapter/CMakeLists.txt | 4 +++- src/algorithms/data_type_adapter/adapters/CMakeLists.txt | 4 +++- .../data_type_adapter/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/input_filter/CMakeLists.txt | 4 +++- src/algorithms/input_filter/adapters/CMakeLists.txt | 4 +++- src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/libs/CMakeLists.txt | 4 +++- src/algorithms/libs/rtklib/CMakeLists.txt | 4 +++- .../libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt | 4 +++- .../volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt | 4 +++- .../volk_gnsssdr/apps/plot_best_vs_generic.py | 6 ++++-- .../volk_gnsssdr/apps/volk_gnsssdr-config-info.cc | 2 ++ .../volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc | 2 ++ .../volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h | 2 ++ .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc | 2 ++ .../volk_gnsssdr/apps/volk_gnsssdr_profile.h | 3 +-- .../volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake | 2 ++ .../volk_gnsssdr/cmake/Modules/FindORC.cmake | 4 +++- .../volk_gnsssdr/cmake/Modules/VolkAddTest.cmake | 4 +++- .../volk_gnsssdr/cmake/Modules/VolkBoost.cmake | 4 +++- .../volk_gnsssdr/cmake/Modules/VolkBuildTypes.cmake | 4 +++- .../volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in | 4 +++- .../cmake/Modules/VolkGnsssdrConfigVersion.cmake.in | 2 ++ .../volk_gnsssdr/cmake/Modules/VolkPython.cmake | 4 +++- .../volk_gnsssdr/cmake/Modules/VolkVersion.cmake | 4 +++- .../volk_gnsssdr/cmake/Toolchains/aarch64-linux-gnu.cmake | 4 +++- .../volk_gnsssdr/cmake/Toolchains/arm-linux-gnueabihf.cmake | 4 +++- .../cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake | 4 +++- .../cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake | 4 +++- .../cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake | 4 +++- .../cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake | 4 +++- .../cmake/Toolchains/arm_cortex_a8_softfp_native.cmake | 4 +++- .../cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake | 4 +++- .../volk_gnsssdr/cmake/Toolchains/oe-sdk_cross.cmake | 4 +++- .../volk_gnsssdr/cmake/cmake_uninstall.cmake.in | 4 +++- .../volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h | 2 ++ .../volk_gnsssdr/docs/extending_volk.dox | 2 ++ .../libs/volk_gnsssdr_module/volk_gnsssdr/docs/kernels.dox | 2 ++ .../volk_gnsssdr_module/volk_gnsssdr/docs/main_page.dox | 2 ++ .../volk_gnsssdr/docs/terms_and_techniques.dox | 2 ++ .../volk_gnsssdr/docs/using_volk_gnsssdr.dox | 2 ++ .../volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py | 4 +++- .../volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py | 4 +++- .../volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py | 4 +++- .../volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py | 4 +++- .../volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py | 4 +++- .../volk_gnsssdr/include/volk_gnsssdr/constants.h | 2 ++ .../include/volk_gnsssdr/saturation_arithmetic.h | 2 ++ .../volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_alloc.h | 2 ++ .../include/volk_gnsssdr/volk_gnsssdr_avx_intrinsics.h | 2 ++ .../volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h | 2 ++ .../include/volk_gnsssdr/volk_gnsssdr_complex.h | 2 ++ .../volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h | 2 ++ .../include/volk_gnsssdr/volk_gnsssdr_neon_intrinsics.h | 2 ++ .../volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h | 2 ++ .../include/volk_gnsssdr/volk_gnsssdr_sine_table.h | 2 ++ .../include/volk_gnsssdr/volk_gnsssdr_sse3_intrinsics.h | 2 ++ .../include/volk_gnsssdr/volk_gnsssdr_sse_intrinsics.h | 2 ++ .../volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc | 4 +++- .../volk_gnsssdr/asm/orc/volk_gnsssdr_32f_x2_add_32f.orc | 4 +++- .../asm/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc | 4 +++- .../asm/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc | 4 +++- .../asm/orc/volk_gnsssdr_8i_accumulator_s8i.orc | 5 ++--- .../volk_gnsssdr/asm/orc/volk_gnsssdr_8i_x2_add_8i.orc | 5 ++--- .../volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_conjugate_8ic.orc | 5 ++--- .../asm/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc | 5 ++--- .../asm/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc | 5 ++--- .../asm/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc | 5 ++--- .../asm/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc | 5 ++--- .../asm/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc | 5 ++--- .../volk_gnsssdr/asm/orc/volk_gnsssdr_8u_x2_multiply_8u.orc | 5 ++--- .../volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt | 4 +++- .../volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in | 2 ++ .../libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc | 2 ++ .../libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h | 2 ++ .../libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc | 2 ++ .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c | 2 ++ .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c | 2 ++ .../volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c | 2 ++ .../volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h | 2 ++ .../volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt | 4 +++- .../volk_gnsssdr/python/volk_gnsssdr_modtool/README | 2 ++ .../volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py | 4 +++- .../volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py | 4 +++- .../python/volk_gnsssdr_modtool/volk_gnsssdr_modtool | 4 +++- .../volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py | 4 +++- .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h | 2 ++ .../volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h | 2 ++ src/algorithms/observables/CMakeLists.txt | 4 +++- src/algorithms/observables/adapters/CMakeLists.txt | 6 +++--- src/algorithms/observables/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/observables/libs/CMakeLists.txt | 4 +++- src/algorithms/resampler/CMakeLists.txt | 4 +++- src/algorithms/resampler/adapters/CMakeLists.txt | 4 +++- src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/signal_generator/CMakeLists.txt | 4 +++- src/algorithms/signal_generator/adapters/CMakeLists.txt | 4 +++- .../signal_generator/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/signal_source/CMakeLists.txt | 4 +++- src/algorithms/signal_source/adapters/CMakeLists.txt | 4 +++- src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt | 2 ++ src/algorithms/signal_source/libs/CMakeLists.txt | 4 +++- src/algorithms/telemetry_decoder/CMakeLists.txt | 4 +++- src/algorithms/telemetry_decoder/adapters/CMakeLists.txt | 4 +++- .../telemetry_decoder/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/telemetry_decoder/libs/CMakeLists.txt | 4 +++- .../telemetry_decoder/libs/libswiftcnav/CMakeLists.txt | 4 +++- src/algorithms/tracking/CMakeLists.txt | 4 +++- src/algorithms/tracking/adapters/CMakeLists.txt | 4 +++- src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt | 4 +++- src/algorithms/tracking/libs/CMakeLists.txt | 2 ++ src/core/CMakeLists.txt | 4 +++- src/core/libs/CMakeLists.txt | 4 +++- src/core/libs/supl/CMakeLists.txt | 4 +++- src/core/monitor/CMakeLists.txt | 5 ++++- src/core/receiver/CMakeLists.txt | 4 +++- src/core/system_parameters/CMakeLists.txt | 6 ++++-- src/main/CMakeLists.txt | 2 ++ src/tests/CMakeLists.txt | 4 +++- src/tests/system-tests/libs/CMakeLists.txt | 4 +++- .../unit-tests/signal-processing-blocks/libs/CMakeLists.txt | 4 +++- src/utils/CMakeLists.txt | 4 +++- src/utils/front-end-cal/CMakeLists.txt | 4 +++- src/utils/rinex2assist/CMakeLists.txt | 4 +++- 193 files changed, 518 insertions(+), 163 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe1b4c147..d55b97cfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/cmake/Modules/AvoidAccelerate.cmake b/cmake/Modules/AvoidAccelerate.cmake index fcb4aeb34..8a692df66 100644 --- a/cmake/Modules/AvoidAccelerate.cmake +++ b/cmake/Modules/AvoidAccelerate.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/DetectLinuxDistro.cmake b/cmake/Modules/DetectLinuxDistro.cmake index d7718fce2..2169b6c2b 100644 --- a/cmake/Modules/DetectLinuxDistro.cmake +++ b/cmake/Modules/DetectLinuxDistro.cmake @@ -1,5 +1,7 @@ # Copyright (C) 2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/cmake/Modules/DetectMacOSVersion.cmake b/cmake/Modules/DetectMacOSVersion.cmake index 1126fc472..d9c195999 100644 --- a/cmake/Modules/DetectMacOSVersion.cmake +++ b/cmake/Modules/DetectMacOSVersion.cmake @@ -1,5 +1,7 @@ # Copyright (C) 2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/cmake/Modules/FindFILESYSTEM.cmake b/cmake/Modules/FindFILESYSTEM.cmake index 69f43db67..3cd0e6436 100644 --- a/cmake/Modules/FindFILESYSTEM.cmake +++ b/cmake/Modules/FindFILESYSTEM.cmake @@ -1,5 +1,7 @@ # Copyright (C) 2019 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake index 422a3da43..233a725bf 100644 --- a/cmake/Modules/FindGFLAGS.cmake +++ b/cmake/Modules/FindGFLAGS.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGFORTRAN.cmake b/cmake/Modules/FindGFORTRAN.cmake index 98855ba22..a3cb98ce7 100644 --- a/cmake/Modules/FindGFORTRAN.cmake +++ b/cmake/Modules/FindGFORTRAN.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index ae115b4b5..396430aff 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGNSSSIMULATOR.cmake b/cmake/Modules/FindGNSSSIMULATOR.cmake index 2c3d3e977..1aee704b8 100644 --- a/cmake/Modules/FindGNSSSIMULATOR.cmake +++ b/cmake/Modules/FindGNSSSIMULATOR.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake index b27295275..c2f96b313 100644 --- a/cmake/Modules/FindGNURADIO.cmake +++ b/cmake/Modules/FindGNURADIO.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGOOGLETEST.cmake b/cmake/Modules/FindGOOGLETEST.cmake index f3d8f818b..9f5b9c65d 100644 --- a/cmake/Modules/FindGOOGLETEST.cmake +++ b/cmake/Modules/FindGOOGLETEST.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGPERFTOOLS.cmake b/cmake/Modules/FindGPERFTOOLS.cmake index 4d3aee82f..93041ade1 100644 --- a/cmake/Modules/FindGPERFTOOLS.cmake +++ b/cmake/Modules/FindGPERFTOOLS.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake index 634f05c77..7a53b055b 100644 --- a/cmake/Modules/FindGPSTK.cmake +++ b/cmake/Modules/FindGPSTK.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGRDBFCTTC.cmake b/cmake/Modules/FindGRDBFCTTC.cmake index d310fb90e..2ded49a1c 100644 --- a/cmake/Modules/FindGRDBFCTTC.cmake +++ b/cmake/Modules/FindGRDBFCTTC.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGRGN3S.cmake b/cmake/Modules/FindGRGN3S.cmake index be65c09e9..3b0b83f9e 100644 --- a/cmake/Modules/FindGRGN3S.cmake +++ b/cmake/Modules/FindGRGN3S.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGRIIO.cmake b/cmake/Modules/FindGRIIO.cmake index 540c3d881..8e3bcd6ea 100644 --- a/cmake/Modules/FindGRIIO.cmake +++ b/cmake/Modules/FindGRIIO.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindGROSMOSDR.cmake b/cmake/Modules/FindGROSMOSDR.cmake index 959d8f003..aa495e1fb 100644 --- a/cmake/Modules/FindGROSMOSDR.cmake +++ b/cmake/Modules/FindGROSMOSDR.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindLIBAD9361.cmake b/cmake/Modules/FindLIBAD9361.cmake index 0f898eae2..cde0a4dd5 100644 --- a/cmake/Modules/FindLIBAD9361.cmake +++ b/cmake/Modules/FindLIBAD9361.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindLIBIIO.cmake b/cmake/Modules/FindLIBIIO.cmake index 1dcbd2b2a..07888bcb1 100644 --- a/cmake/Modules/FindLIBIIO.cmake +++ b/cmake/Modules/FindLIBIIO.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindLOG4CPP.cmake b/cmake/Modules/FindLOG4CPP.cmake index 7ba0a2004..ef0d86e4e 100644 --- a/cmake/Modules/FindLOG4CPP.cmake +++ b/cmake/Modules/FindLOG4CPP.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake index 9365428ab..f984e1476 100644 --- a/cmake/Modules/FindMATIO.cmake +++ b/cmake/Modules/FindMATIO.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindOPENCL.cmake b/cmake/Modules/FindOPENCL.cmake index ab822daef..8c567fbbd 100644 --- a/cmake/Modules/FindOPENCL.cmake +++ b/cmake/Modules/FindOPENCL.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindORC.cmake b/cmake/Modules/FindORC.cmake index 9f73980a5..60c958c02 100644 --- a/cmake/Modules/FindORC.cmake +++ b/cmake/Modules/FindORC.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake index a47a4f711..d2b5c279d 100644 --- a/cmake/Modules/FindPUGIXML.cmake +++ b/cmake/Modules/FindPUGIXML.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake index 7a1f4941d..5989fefe6 100644 --- a/cmake/Modules/FindTELEORBIT.cmake +++ b/cmake/Modules/FindTELEORBIT.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index f6242b7bd..396629a54 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake index b3e58f71f..3ffd3972e 100644 --- a/cmake/Modules/FindVOLK.cmake +++ b/cmake/Modules/FindVOLK.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/FindVOLKGNSSSDR.cmake b/cmake/Modules/FindVOLKGNSSSDR.cmake index 46c3505a0..0a7d833ed 100644 --- a/cmake/Modules/FindVOLKGNSSSDR.cmake +++ b/cmake/Modules/FindVOLKGNSSSDR.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/GnsssdrBuildTypes.cmake b/cmake/Modules/GnsssdrBuildTypes.cmake index d2108bcbf..f948c65c6 100644 --- a/cmake/Modules/GnsssdrBuildTypes.cmake +++ b/cmake/Modules/GnsssdrBuildTypes.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/SetupPython.cmake b/cmake/Modules/SetupPython.cmake index cf0f1ccdb..742efa492 100644 --- a/cmake/Modules/SetupPython.cmake +++ b/cmake/Modules/SetupPython.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Modules/TestForARM.cmake b/cmake/Modules/TestForARM.cmake index 510fed7e9..8642718b4 100644 --- a/cmake/Modules/TestForARM.cmake +++ b/cmake/Modules/TestForARM.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/aarch64-linux-gnu.cmake b/cmake/Toolchains/aarch64-linux-gnu.cmake index d877f0cad..b2553b76d 100644 --- a/cmake/Toolchains/aarch64-linux-gnu.cmake +++ b/cmake/Toolchains/aarch64-linux-gnu.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm-linux-gnueabihf.cmake b/cmake/Toolchains/arm-linux-gnueabihf.cmake index 3148c5bb1..2a2cc79c3 100644 --- a/cmake/Toolchains/arm-linux-gnueabihf.cmake +++ b/cmake/Toolchains/arm-linux-gnueabihf.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake index 28a6785f4..5419681d3 100644 --- a/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake index 855e4bdbe..053704eac 100644 --- a/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake index 53d47f27a..0b5f02650 100644 --- a/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake index 97054e228..9c5d52892 100644 --- a/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake b/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake index 4d203ac0f..4c856167c 100644 --- a/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake index 9a16c2c6c..c3e1e9293 100644 --- a/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/oe-sdk_cross.cmake b/cmake/Toolchains/oe-sdk_cross.cmake index 4e281cff8..34f09f140 100644 --- a/cmake/Toolchains/oe-sdk_cross.cmake +++ b/cmake/Toolchains/oe-sdk_cross.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/raspi3.cmake b/cmake/Toolchains/raspi3.cmake index 855e4bdbe..053704eac 100644 --- a/cmake/Toolchains/raspi3.cmake +++ b/cmake/Toolchains/raspi3.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/raspi4.cmake b/cmake/Toolchains/raspi4.cmake index 53d47f27a..0b5f02650 100644 --- a/cmake/Toolchains/raspi4.cmake +++ b/cmake/Toolchains/raspi4.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/Toolchains/zynq-7000.cmake b/cmake/Toolchains/zynq-7000.cmake index 5b619fa8b..17e3d8ca1 100644 --- a/cmake/Toolchains/zynq-7000.cmake +++ b/cmake/Toolchains/zynq-7000.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 90450e546..60eb0b59f 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox index 6120cfdd9..dd0826e8c 100644 --- a/docs/doxygen/other/main_page.dox +++ b/docs/doxygen/other/main_page.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/docs/doxygen/other/reference_docs.dox b/docs/doxygen/other/reference_docs.dox index 06d7ad2be..0f0b1591e 100644 --- a/docs/doxygen/other/reference_docs.dox +++ b/docs/doxygen/other/reference_docs.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/docs/doxygen/other/signal_model.dox b/docs/doxygen/other/signal_model.dox index 3c1ee7fac..bae95980f 100644 --- a/docs/doxygen/other/signal_model.dox +++ b/docs/doxygen/other/signal_model.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3535d5cdf..5bc1e1812 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/CMakeLists.txt b/src/algorithms/CMakeLists.txt index 09ed5bb7b..71d555761 100644 --- a/src/algorithms/CMakeLists.txt +++ b/src/algorithms/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/PVT/CMakeLists.txt b/src/algorithms/PVT/CMakeLists.txt index 58d3af135..79a937fb4 100644 --- a/src/algorithms/PVT/CMakeLists.txt +++ b/src/algorithms/PVT/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index a5ccd387f..93d4be759 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/src/algorithms/PVT/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index fc5463b15..833b44910 100644 --- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 6fc18650f..aacfe2da5 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/acquisition/CMakeLists.txt b/src/algorithms/acquisition/CMakeLists.txt index 58d3af135..79a937fb4 100644 --- a/src/algorithms/acquisition/CMakeLists.txt +++ b/src/algorithms/acquisition/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 221bd088f..c90d96130 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt index 9bd7dc737..a6ab99a14 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt index ceed9f0f8..19b84cc65 100644 --- a/src/algorithms/acquisition/libs/CMakeLists.txt +++ b/src/algorithms/acquisition/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/channel/CMakeLists.txt b/src/algorithms/channel/CMakeLists.txt index 4a1994414..c81e01c99 100644 --- a/src/algorithms/channel/CMakeLists.txt +++ b/src/algorithms/channel/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt index 2edc741c3..f69e36136 100644 --- a/src/algorithms/channel/adapters/CMakeLists.txt +++ b/src/algorithms/channel/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 1b2dbb0ac..6c90ef6de 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/conditioner/CMakeLists.txt b/src/algorithms/conditioner/CMakeLists.txt index ffd5d6116..200acdbd6 100644 --- a/src/algorithms/conditioner/CMakeLists.txt +++ b/src/algorithms/conditioner/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt index e0a2b84bd..839a138b3 100644 --- a/src/algorithms/conditioner/adapters/CMakeLists.txt +++ b/src/algorithms/conditioner/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/data_type_adapter/CMakeLists.txt b/src/algorithms/data_type_adapter/CMakeLists.txt index f3d9df710..5b45a6340 100644 --- a/src/algorithms/data_type_adapter/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/CMakeLists.txt @@ -1,5 +1,7 @@ # -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index ee237efff..5a04a1e8c 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index 044158bbe..4ae1bf59c 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/input_filter/CMakeLists.txt b/src/algorithms/input_filter/CMakeLists.txt index f17f1f9c7..37ea002b3 100644 --- a/src/algorithms/input_filter/CMakeLists.txt +++ b/src/algorithms/input_filter/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index 44b3db143..d64c964cc 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt index 98783da49..3ce415072 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index f452c17bd..8da1f82d3 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt index 6462cc6f4..184335d02 100644 --- a/src/algorithms/libs/rtklib/CMakeLists.txt +++ b/src/algorithms/libs/rtklib/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt index f2db96080..2082d35d6 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt @@ -1,5 +1,7 @@ # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt index cec6fac03..24c64f98b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt @@ -1,5 +1,7 @@ # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/plot_best_vs_generic.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/plot_best_vs_generic.py index 1129cc44c..47e81abae 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/plot_best_vs_generic.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/plot_best_vs_generic.py @@ -1,7 +1,9 @@ #!/usr/bin/env python -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # -# This file is part of GNSS-SDR. +# This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc index 16163cff6..6cab4c2c5 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc index a19c469a4..0564618b3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h index eaf31cbaa..fb3c77060 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc index 348424d49..5efe66f74 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h index 690dcd1c8..d7b1c2e20 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h @@ -6,8 +6,7 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake index 4a7f40404..23d6e19af 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake @@ -1,5 +1,7 @@ # Copyright (C) 2019 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindORC.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindORC.cmake index c45399e21..bd0c5dd32 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindORC.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindORC.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2015-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkAddTest.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkAddTest.cmake index 786cc27d6..37ee2e2c7 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkAddTest.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkAddTest.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2015-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake index d2fa0f4a2..f727db6b4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBuildTypes.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBuildTypes.cmake index eeec21e68..8dc25a0c5 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBuildTypes.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBuildTypes.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2014-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2014-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in index 3d6cd0f1e..5c7c25573 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in @@ -1,4 +1,6 @@ -# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in index b7096e285..a464503ab 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in @@ -1,5 +1,7 @@ # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake index c46b54285..2da630715 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkVersion.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkVersion.cmake index 8923abcdb..662fb052f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkVersion.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkVersion.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2014-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2014-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/aarch64-linux-gnu.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/aarch64-linux-gnu.cmake index d877f0cad..b2553b76d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/aarch64-linux-gnu.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/aarch64-linux-gnu.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm-linux-gnueabihf.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm-linux-gnueabihf.cmake index 3148c5bb1..2a2cc79c3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm-linux-gnueabihf.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm-linux-gnueabihf.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake index 28a6785f4..5419681d3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake index 855e4bdbe..053704eac 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake index 53d47f27a..0b5f02650 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake index 97054e228..9c5d52892 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake index 4d203ac0f..4c856167c 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake index 9a16c2c6c..c3e1e9293 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/oe-sdk_cross.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/oe-sdk_cross.cmake index ebfa17a0b..9be00cd07 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/oe-sdk_cross.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Toolchains/oe-sdk_cross.cmake @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/cmake_uninstall.cmake.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/cmake_uninstall.cmake.in index 90450e546..60eb0b59f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/cmake_uninstall.cmake.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/cmake_uninstall.cmake.in @@ -1,4 +1,6 @@ -# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h index 952c36030..b796fc7dc 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/config.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/extending_volk.dox b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/extending_volk.dox index 3bdecc587..0f6a766c0 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/extending_volk.dox +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/extending_volk.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/kernels.dox b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/kernels.dox index d2b15b52d..ddfe60c1b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/kernels.dox +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/kernels.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/main_page.dox b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/main_page.dox index 7e2414c7d..6879fe382 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/main_page.dox +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/main_page.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/terms_and_techniques.dox b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/terms_and_techniques.dox index 160ab902e..17dcb98cc 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/terms_and_techniques.dox +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/terms_and_techniques.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/using_volk_gnsssdr.dox b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/using_volk_gnsssdr.dox index 93a629063..904028217 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/using_volk_gnsssdr.dox +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/using_volk_gnsssdr.dox @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py index 99792314c..cedacb7a9 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py index a19dd46c2..bf1e2ed3f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py index 53d51c372..2b15678b1 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py index 7eeda0d21..564ece842 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py index 5d5d2dbe6..7d4e03d5a 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h index 07537c0c6..f0abe231e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h @@ -5,6 +5,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/saturation_arithmetic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/saturation_arithmetic.h index 1718c9df2..9b7b113be 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/saturation_arithmetic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/saturation_arithmetic.h @@ -5,6 +5,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_alloc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_alloc.h index 0c698eb77..88a146638 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_alloc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_alloc.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_avx_intrinsics.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_avx_intrinsics.h index 2b11fa81e..9209f12c3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_avx_intrinsics.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_avx_intrinsics.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h index 3cb25b574..5a46b12bf 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h @@ -5,6 +5,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h index 200ce28bb..a40a7dedc 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h @@ -5,6 +5,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h index a53f500b2..34b551f3a 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_neon_intrinsics.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_neon_intrinsics.h index 47576c1f9..4e21e8760 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_neon_intrinsics.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_neon_intrinsics.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h index e62c8dd01..1e2dbea64 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h index 9e89a5b1c..7e4daeb32 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h @@ -5,6 +5,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse3_intrinsics.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse3_intrinsics.h index f6ee5c9c8..9144e5790 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse3_intrinsics.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse3_intrinsics.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse_intrinsics.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse_intrinsics.h index e71ffb3bd..d32b246b3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse_intrinsics.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sse_intrinsics.h @@ -6,6 +6,8 @@ * * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc index 8e2ec7368..921c6e762 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32f_x2_add_32f.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32f_x2_add_32f.orc index 6288d0570..d9ad812cf 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32f_x2_add_32f.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32f_x2_add_32f.orc @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc index 0cec9c60c..e3d63a764 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc index 701ad0510..71064fcf4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_accumulator_s8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_accumulator_s8i.orc index a93f1b00c..ab279bf9f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_accumulator_s8i.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_accumulator_s8i.orc @@ -7,10 +7,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_x2_add_8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_x2_add_8i.orc index 59281be57..c31ab368e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_x2_add_8i.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8i_x2_add_8i.orc @@ -6,10 +6,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_conjugate_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_conjugate_8ic.orc index 893913a23..698123a65 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_conjugate_8ic.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_conjugate_8ic.orc @@ -10,10 +10,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc index 18f1eb072..4c785d17e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_magnitude_squared_8i.orc @@ -10,10 +10,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc index b0145c7b7..7d4e20adb 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_s8ic_multiply_8ic.orc @@ -9,10 +9,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc index 23d560f36..6538b37f0 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_dot_prod_8ic.orc @@ -10,10 +10,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc index b4d5efb9d..549949f4d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x2_multiply_8ic.orc @@ -10,10 +10,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc index 6b6fda69f..6bf244da9 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3.orc @@ -19,10 +19,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8u_x2_multiply_8u.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8u_x2_multiply_8u.orc index dd17310ab..279456211 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8u_x2_multiply_8u.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/asm/orc/volk_gnsssdr_8u_x2_multiply_8u.orc @@ -8,10 +8,9 @@ # # ------------------------------------------------------------------------- # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # -# GNSS-SDR is a software defined Global Navigation -# Satellite Systems receiver +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt index a3f74d81d..ed927cef5 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt @@ -1,5 +1,7 @@ # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in index 9b89e3331..d68c973d1 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in @@ -1,5 +1,7 @@ /* -*- c++ -*- */ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc index de211a766..682dc3e4c 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h index 5c23f25bf..5a01d64e0 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc index 5d8ab3fd0..f340da6a4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc @@ -1,6 +1,8 @@ /* * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c index 4b471bd1f..0b58fcd9d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c @@ -1,6 +1,8 @@ /* * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c index 67b18d439..e76f72edc 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c index e5c761c8b..db5b931d1 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h index d21229464..140731d36 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt index 0b6b31ae1..2345a6d66 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/README b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/README index 65605e520..3a90d9200 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/README +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/README @@ -1,5 +1,7 @@ # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py index c6f03b6cb..edcde5c59 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/__init__.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py index 0ee1fe28e..d871b325f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool index d94de57b5..9bd4f7e00 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py index 2e18c9ee2..2e86f2538 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py @@ -1,5 +1,7 @@ # -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c index 13295e20e..e6f48691e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h index 66cfe0852..60106e84f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h index 5237d9edb..2bfce5c57 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c index b4f553900..65af6b623 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h index e7e1fcc43..07b10ab55 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c index 76d0f3362..4ad4551c8 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machine_xxx.tmpl.c @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c index 6b7e3c3c7..09d44f300 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h index 96398df14..3865a9cbe 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver + * * This file is part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h index 1b0c17fd3..81051a242 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h @@ -1,4 +1,6 @@ /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver * * This file is part of GNSS-SDR. * diff --git a/src/algorithms/observables/CMakeLists.txt b/src/algorithms/observables/CMakeLists.txt index 87e9bf982..fbca8d8aa 100644 --- a/src/algorithms/observables/CMakeLists.txt +++ b/src/algorithms/observables/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index b91c413fe..55545df6e 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # @@ -19,14 +21,12 @@ add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS}) target_include_directories(obs_adapters PUBLIC - ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/core/interfaces ) target_link_libraries(obs_adapters PUBLIC obs_gr_blocks - algorithms_libs PRIVATE gnss_sdr_flags observables_libs diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 53e587a4a..5108fb879 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index 4f3b8ab50..d71715109 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/resampler/CMakeLists.txt b/src/algorithms/resampler/CMakeLists.txt index f17f1f9c7..37ea002b3 100644 --- a/src/algorithms/resampler/CMakeLists.txt +++ b/src/algorithms/resampler/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt index 7c3a73051..0e35da746 100644 --- a/src/algorithms/resampler/adapters/CMakeLists.txt +++ b/src/algorithms/resampler/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt index bed980f13..4eabb0e27 100644 --- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/signal_generator/CMakeLists.txt b/src/algorithms/signal_generator/CMakeLists.txt index f17f1f9c7..37ea002b3 100644 --- a/src/algorithms/signal_generator/CMakeLists.txt +++ b/src/algorithms/signal_generator/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt index 04ab358e6..9f3dd111c 100644 --- a/src/algorithms/signal_generator/adapters/CMakeLists.txt +++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt index be1de0880..95f594abe 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/signal_source/CMakeLists.txt b/src/algorithms/signal_source/CMakeLists.txt index 87e9bf982..fbca8d8aa 100644 --- a/src/algorithms/signal_source/CMakeLists.txt +++ b/src/algorithms/signal_source/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index df8fed8ae..68023a535 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index 7ef30b083..bbdd0b362 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt index 6443b1d0f..3d6f090e5 100644 --- a/src/algorithms/signal_source/libs/CMakeLists.txt +++ b/src/algorithms/signal_source/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/telemetry_decoder/CMakeLists.txt b/src/algorithms/telemetry_decoder/CMakeLists.txt index 58d3af135..79a937fb4 100644 --- a/src/algorithms/telemetry_decoder/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt index 3e3d06ed2..c228e09a2 100644 --- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt index b09ec979b..2931b9c10 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt index 03db29b43..6b45c8761 100644 --- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt index ab06235ee..ef75dea25 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/tracking/CMakeLists.txt b/src/algorithms/tracking/CMakeLists.txt index 58d3af135..79a937fb4 100644 --- a/src/algorithms/tracking/CMakeLists.txt +++ b/src/algorithms/tracking/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index 2f74163a7..bbda00e25 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index 81d11bc0b..d99f72faa 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index 17ea7d9f6..679523593 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 775d08ea7..ffeb70575 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index 537743b82..92fe5cf2e 100644 --- a/src/core/libs/CMakeLists.txt +++ b/src/core/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt index 8780b766b..a238d37ce 100644 --- a/src/core/libs/supl/CMakeLists.txt +++ b/src/core/libs/supl/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index 8c198eedd..380e35e90 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later @@ -32,12 +34,13 @@ add_library(core_monitor target_link_libraries(core_monitor PUBLIC - Boost::serialization + Boost::headers Boost::system Gnuradio::runtime protobuf::libprotobuf core_system_parameters PRIVATE + Boost::serialization Gnuradio::pmt ) diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 795218920..e9a72c180 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later @@ -123,9 +125,9 @@ endif() target_link_libraries(core_receiver PUBLIC core_libs - core_monitor Gnuradio::runtime PRIVATE + core_monitor signal_source_adapters data_type_adapters input_filter_adapters diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt index a2fc6a308..aaec009e3 100644 --- a/src/core/system_parameters/CMakeLists.txt +++ b/src/core/system_parameters/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # @@ -103,9 +105,9 @@ target_link_libraries(core_system_parameters PUBLIC Boost::date_time Boost::serialization - Glog::glog PRIVATE Gflags::gflags + Glog::glog ) if(ENABLE_CLANG_TIDY) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 2bd6a767b..3f08704fb 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver +# # This file is part of GNSS-SDR. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 8c71cfaff..8e6d39f96 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt index e53002518..c7720d4bf 100644 --- a/src/tests/system-tests/libs/CMakeLists.txt +++ b/src/tests/system-tests/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt index db28da09d..230d7101a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 547033750..aeef9ad1c 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 72b5e585c..3cf634cd5 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt index 9916d80cd..c045bc44a 100644 --- a/src/utils/rinex2assist/CMakeLists.txt +++ b/src/utils/rinex2assist/CMakeLists.txt @@ -1,4 +1,6 @@ -# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) +# +# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # # This file is part of GNSS-SDR. # From c155a5074dd07968e1ea4a7d4c02a2497d8638e3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 12 Feb 2020 07:58:32 +0100 Subject: [PATCH 20/21] Add missing dependency --- src/algorithms/tracking/adapters/CMakeLists.txt | 1 + src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index bbda00e25..18a4c3468 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -91,6 +91,7 @@ target_link_libraries(tracking_adapters Gnuradio::runtime PRIVATE gnss_sdr_flags + Glog::glog Volkgnsssdr::volkgnsssdr ) diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index d99f72faa..b294473b7 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -88,6 +88,7 @@ target_link_libraries(tracking_gr_blocks PRIVATE Matio::matio gnss_sdr_flags + Glog::glog ) if(ENABLE_CUDA AND NOT CMAKE_VERSION VERSION_GREATER 3.11) From 10fc3fc48eaaf683780591d4580555937d670355 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 12 Feb 2020 08:30:25 +0100 Subject: [PATCH 21/21] Add missing dependency --- src/algorithms/PVT/adapters/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index 93d4be759..75661be5b 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/src/algorithms/PVT/adapters/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(pvt_adapters algorithms_libs_rtklib PRIVATE gnss_sdr_flags + Glog::glog pvt_libs )