diff --git a/.clang-tidy b/.clang-tidy index 4c21320be..84d29783c 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -106,8 +106,10 @@ Checks: '-*, readability-identifier-naming, readability-inconsistent-declaration-parameter-name, readability-isolate-declaration, + readability-make-member-function-const, readability-named-parameter, readability-non-const-parameter, + readability-qualified-auto, readability-redundant-control-flow, readability-redundant-member-init, readability-string-compare, @@ -117,12 +119,28 @@ HeaderFilterRegex: '' AnalyzeTemporaryDtors: false FormatStyle: 'file' CheckOptions: + - key: bugprone-argument-comment.CommentBoolLiterals + value: '0' + - key: bugprone-argument-comment.CommentCharacterLiterals + value: '0' + - key: bugprone-argument-comment.CommentFloatLiterals + value: '0' + - key: bugprone-argument-comment.CommentIntegerLiterals + value: '0' + - key: bugprone-argument-comment.CommentNullPtrs + value: '0' + - key: bugprone-argument-comment.CommentStringLiterals + value: '0' + - key: bugprone-argument-comment.CommentUserDefinedLiterals + value: '0' + - key: bugprone-argument-comment.IgnoreSingleArgument + value: '0' - key: bugprone-argument-comment.StrictMode value: '0' - key: bugprone-assert-side-effect.AssertMacros value: assert - key: bugprone-assert-side-effect.CheckFunctionCalls - value: '0' + value: 'false' - key: bugprone-dangling-handle.HandleClasses value: 'std::basic_string_view;std::experimental::basic_string_view' - key: bugprone-exception-escape.FunctionsThatShouldNotThrow @@ -130,21 +148,21 @@ CheckOptions: - key: bugprone-exception-escape.IgnoredExceptions value: '' - key: bugprone-misplaced-widening-cast.CheckImplicitCasts - value: '0' + value: 'false' - key: bugprone-sizeof-expression.WarnOnSizeOfCompareToConstant - value: '1' + value: 'true' - key: bugprone-sizeof-expression.WarnOnSizeOfConstant - value: '1' + value: 'true' - key: bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression - value: '0' + value: 'false' - key: bugprone-sizeof-expression.WarnOnSizeOfThis - value: '1' + value: 'true' - key: bugprone-string-constructor.LargeLengthThreshold value: '8388608' - key: bugprone-string-constructor.WarnOnLargeLength - value: '1' + value: 'true' - key: bugprone-suspicious-enum-usage.StrictMode - value: '0' + value: 'false' - key: bugprone-suspicious-missing-comma.MaxConcatenatedTokens value: '5' - key: bugprone-suspicious-missing-comma.RatioThreshold @@ -154,21 +172,31 @@ CheckOptions: - key: bugprone-suspicious-string-compare.StringCompareLikeFunctions value: '' - key: bugprone-suspicious-string-compare.WarnOnImplicitComparison - value: '1' + value: 'true' - key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison - value: '0' + value: 'false' + - key: bugprone-too-small-loop-variable.MagnitudeBitsUpperLimit + value: '16' - key: bugprone-unused-return-value.CheckedFunctions value: '::std::async;::std::launder;::std::remove;::std::remove_if;::std::unique;::std::unique_ptr::release;::std::basic_string::empty;::std::vector::empty' - key: cert-dcl16-c.NewSuffixes value: 'L;LL;LU;LLU' - key: cert-msc51-cpp.DisallowedSeedTypes value: 'time_t,std::time_t' + - key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField + value: '0' + - key: cert-str34-c.DiagnoseSignedUnsignedCharComparisons + value: '0' + - key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors + value: '1' - key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic value: '1' - key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions - value: '0' + value: 'false' + - key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctionsWhenCopyIsDeleted + value: 'false' - key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor - value: '0' + value: 'false' - key: google-build-namespaces.HeaderFileExtensions value: ',h' - key: google-global-names-in-headers.HeaderFileExtensions @@ -187,8 +215,20 @@ CheckOptions: value: _t - key: google-runtime-int.UnsignedTypePrefix value: uint + - key: llvm-else-after-return.WarnOnConditionVariables + value: '0' + - key: llvm-else-after-return.WarnOnUnfixable + value: '0' + - key: llvm-qualified-auto.AddConstToQualified + value: '0' - key: misc-throw-by-value-catch-by-reference.CheckThrowTemporaries - value: '1' + value: 'true' + - key: misc-throw-by-value-catch-by-reference.MaxSize + value: '-1' + - key: misc-throw-by-value-catch-by-reference.WarnOnLargeObjects + value: 'false' + - key: modernize-avoid-bind.PermissiveParameterList + value: 'false' - key: modernize-loop-convert.MaxCopySize value: '16' - key: modernize-loop-convert.MinConfidence @@ -197,20 +237,26 @@ CheckOptions: value: CamelCase - key: modernize-pass-by-value.IncludeStyle value: llvm + - key: modernize-raw-string-literal.DelimiterStem + value: lit - key: modernize-raw-string-literal.ReplaceShorterLiterals - value: '0' + value: 'false' - key: modernize-replace-auto-ptr.IncludeStyle value: llvm - key: modernize-use-auto.MinTypeNameLength value: '5' - key: modernize-use-auto.RemoveStars - value: '0' + value: 'false' + - key: modernize-use-bool-literals.IgnoreMacros + value: 'true' - key: modernize-use-default-member-init.IgnoreMacros - value: '1' + value: 'true' - key: modernize-use-default-member-init.UseAssignment - value: '0' + value: 'false' - key: modernize-use-emplace.ContainersWithPushBack value: '::std::vector;::std::list;::std::deque' + - key: modernize-use-emplace.IgnoreImplicitConstructors + value: 'false' - key: modernize-use-emplace.SmartPointers value: '::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr' - key: modernize-use-emplace.TupleMakeFunctions @@ -218,27 +264,37 @@ CheckOptions: - key: modernize-use-emplace.TupleTypes value: '::std::pair;::std::tuple' - key: modernize-use-equals-default.IgnoreMacros - value: '1' + value: 'true' - key: modernize-use-equals-delete.IgnoreMacros - value: '1' + value: 'true' - key: modernize-use-noexcept.ReplacementString value: '' - key: modernize-use-noexcept.UseNoexceptFalse - value: '1' + value: 'true' - key: modernize-use-nullptr.NullMacros value: 'NULL' + - key: modernize-use-override.AllowOverrideAndFinal + value: 'false' + - key: modernize-use-override.FinalSpelling + value: final + - key: modernize-use-override.IgnoreDestructors + value: 'false' + - key: modernize-use-override.OverrideSpelling + value: override - key: performance-faster-string-find.StringLikeClasses value: 'std::basic_string' - key: performance-for-range-copy.AllowedTypes value: '' - key: performance-for-range-copy.WarnOnAllAutoCopies - value: '0' + value: 'false' - key: performance-inefficient-string-concatenation.StrictMode - value: '0' + value: 'false' + - key: performance-inefficient-vector-operation.EnableProto + value: 'false' - key: performance-inefficient-vector-operation.VectorLikeClasses value: '::std::vector' - key: performance-move-const-arg.CheckTriviallyCopyableMove - value: '1' + value: 'true' - key: performance-move-constructor-init.IncludeStyle value: llvm - key: performance-type-promotion-in-math-fn.IncludeStyle @@ -257,6 +313,8 @@ CheckOptions: value: '' - key: readability-identifier-naming.AbstractClassSuffix value: '' + - key: readability-identifier-naming.AggressiveDependentMemberLookup + value: 'false' - key: readability-identifier-naming.ClassCase value: Camel_Snake_Case - key: readability-identifier-naming.ClassPrefix @@ -270,7 +328,9 @@ CheckOptions: - key: readability-identifier-naming.GlobalConstantSuffix value: '' - key: readability-identifier-naming.IgnoreFailedSplit - value: '0' + value: 'false' + - key: readability-identifier-naming.IgnoreMainLikeFunctions + value: 'false' - key: readability-identifier-naming.StructCase value: aNy_CasE - key: readability-identifier-naming.StructPrefix @@ -278,11 +338,15 @@ CheckOptions: - key: readability-identifier-naming.StructSuffix value: '' - key: readability-inconsistent-declaration-parameter-name.IgnoreMacros - value: '1' + value: 'true' - key: readability-inconsistent-declaration-parameter-name.Strict - value: '0' + value: 'false' + - key: readability-qualified-auto.AddConstToQualified + value: 'true' + - key: readability-redundant-member-init.IgnoreBaseInCopyConstructors + value: 'false' - key: readability-uppercase-literal-suffix.IgnoreMacros - value: '1' + value: 'true' - key: readability-uppercase-literal-suffix.NewSuffixes value: '' ... diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cdfa8ff1..f16d77bf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,8 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ################################################################################ # Project setup @@ -113,7 +110,8 @@ if(ENABLE_FPGA) endif() option(ENABLE_BENCHMARKS "Build code snippets benchmarks" OFF) -if(CMAKE_VERSION VERSION_LESS 3.5.1) +if(CMAKE_VERSION VERSION_LESS 3.5.1 OR + (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "10.99")) set(ENABLE_BENCHMARKS OFF) endif() @@ -328,8 +326,8 @@ set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.1.x") set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0") -set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.18") -set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11") +set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.19") +set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.2") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.14.0") set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.2") set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7") @@ -2392,7 +2390,7 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI UPDATE_COMMAND ${CMAKE_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/autogen.sh CONFIGURE_COMMAND "${CMAKE_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/configure --prefix=${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION} --host=$ENV{OECORE_TARGET_ARCH} --with-protoc=${PROTOC_EXECUTABLE}" BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} - INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install + INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} DESTDIR= install BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/bin/protoc ) @@ -2479,7 +2477,7 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI UPDATE_COMMAND ${CMAKE_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/autogen.sh CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/configure --prefix=${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION} BUILD_COMMAND ${PROTOBUF_MAKE_PROGRAM} - INSTALL_COMMAND ${PROTOBUF_MAKE_PROGRAM} install + INSTALL_COMMAND ${PROTOBUF_MAKE_PROGRAM} DESTDIR= install ) else() if(CMAKE_MAKE_PROGRAM MATCHES "make") @@ -2498,7 +2496,7 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI UPDATE_COMMAND ${CMAKE_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/autogen.sh CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/configure --prefix=${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION} BUILD_COMMAND ${PROTOBUF_MAKE_PROGRAM} ${PROTOBUF_PARALLEL_BUILD} - INSTALL_COMMAND ${PROTOBUF_MAKE_PROGRAM} install + INSTALL_COMMAND ${PROTOBUF_MAKE_PROGRAM} DESTDIR= install BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/bin/protoc ) diff --git a/README.md b/README.md index 93e30ce6b..767f0b407 100644 --- a/README.md +++ b/README.md @@ -292,9 +292,9 @@ $ sudo apt-get install libblas-dev liblapack-dev # For Debian/Ubuntu/Linux $ sudo yum install lapack-devel blas-devel # For Fedora/CentOS/RHEL $ sudo zypper install lapack-devel blas-devel # For OpenSUSE $ sudo pacman -S blas lapack # For Arch Linux -$ wget http://sourceforge.net/projects/arma/files/armadillo-10.1.0.tar.xz -$ tar xvfz armadillo-10.1.0.tar.xz -$ cd armadillo-10.1.0 +$ wget http://sourceforge.net/projects/arma/files/armadillo-10.1.2.tar.xz +$ tar xvfz armadillo-10.1.2.tar.xz +$ cd armadillo-10.1.2 $ cmake . $ make $ sudo make install @@ -720,10 +720,12 @@ More details can be found in our tutorial about ## macOS GNSS-SDR can be built on macOS (or the former Mac OS X), starting from 10.9 -(Mavericks) and including 10.15 (Catalina). If you still have not installed +(Mavericks) and including 11 (Big Sur). If you still have not installed [Xcode](https://developer.apple.com/xcode/ "Xcode"), do it now from the App -Store (it's free). You will also need the Xcode Command Line Tools. Launch the -Terminal, found in /Applications/Utilities/, and type: +Store (it's free). You will also need the Xcode Command Line Tools, which do not +come by default in macOS versions older than Big Sur. If you are using an older +version, please launch the Terminal, found in /Applications/Utilities/, and +type: ``` $ xcode-select --install diff --git a/cmake/Modules/AvoidAccelerate.cmake b/cmake/Modules/AvoidAccelerate.cmake index a9c4360bd..9eda109f3 100644 --- a/cmake/Modules/AvoidAccelerate.cmake +++ b/cmake/Modules/AvoidAccelerate.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Avoid using the BLAS and LAPACK implementations that comes with the Accelerate # framework, which causes a bug when the BeiDou constellation is enabled diff --git a/cmake/Modules/DetectLinuxDistro.cmake b/cmake/Modules/DetectLinuxDistro.cmake index 2169b6c2b..3fa556ba4 100644 --- a/cmake/Modules/DetectLinuxDistro.cmake +++ b/cmake/Modules/DetectLinuxDistro.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(ARCHITECTURE_STRING "(64 bits)") diff --git a/cmake/Modules/DetectMacOSVersion.cmake b/cmake/Modules/DetectMacOSVersion.cmake index 3ac7ebf80..98ff2e057 100644 --- a/cmake/Modules/DetectMacOSVersion.cmake +++ b/cmake/Modules/DetectMacOSVersion.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause execute_process(COMMAND uname -v OUTPUT_VARIABLE DARWIN_VERSION) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) @@ -12,7 +10,7 @@ string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) if(${DARWIN_VERSION} MATCHES "20") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") - set(MACOS_DISTRIBUTION "macOS Big Sur 11.0") + set(MACOS_DISTRIBUTION "macOS Big Sur 11") endif() if(${DARWIN_VERSION} MATCHES "19") diff --git a/cmake/Modules/FindFILESYSTEM.cmake b/cmake/Modules/FindFILESYSTEM.cmake index acda31f88..ca803cdfb 100644 --- a/cmake/Modules/FindFILESYSTEM.cmake +++ b/cmake/Modules/FindFILESYSTEM.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2019 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Original code from https://github.com/vector-of-bool/CMakeCM and modified # by C. Fernandez. The original code is distributed under the OSI-approved diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake index 21c906fbb..c662faad0 100644 --- a/cmake/Modules/FindGFLAGS.cmake +++ b/cmake/Modules/FindGFLAGS.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # - Try to find GFlags # diff --git a/cmake/Modules/FindGFORTRAN.cmake b/cmake/Modules/FindGFORTRAN.cmake index 9a7eb1141..258d6c1d8 100644 --- a/cmake/Modules/FindGFORTRAN.cmake +++ b/cmake/Modules/FindGFORTRAN.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(NOT COMMAND feature_summary) include(FeatureSummary) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 8ba90f0eb..e0e775539 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # - Try to find the Google Glog library # diff --git a/cmake/Modules/FindGNSSSIMULATOR.cmake b/cmake/Modules/FindGNSSSIMULATOR.cmake index 173382cc5..6754d1716 100644 --- a/cmake/Modules/FindGNSSSIMULATOR.cmake +++ b/cmake/Modules/FindGNSSSIMULATOR.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(GNSSSIMULATOR_ROOT) set(GNSSSIMULATOR_ROOT_USER_DEFINED ${GNSSSIMULATOR_ROOT}) diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake index a23c88c56..8930eee86 100644 --- a/cmake/Modules/FindGNURADIO.cmake +++ b/cmake/Modules/FindGNURADIO.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Find GNU Radio diff --git a/cmake/Modules/FindGOOGLETEST.cmake b/cmake/Modules/FindGOOGLETEST.cmake index 4f8d7ca8b..1d27e5d30 100644 --- a/cmake/Modules/FindGOOGLETEST.cmake +++ b/cmake/Modules/FindGOOGLETEST.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # - Try to find Googletest source code diff --git a/cmake/Modules/FindGPERFTOOLS.cmake b/cmake/Modules/FindGPERFTOOLS.cmake index 38d117c30..4d6dd135b 100644 --- a/cmake/Modules/FindGPERFTOOLS.cmake +++ b/cmake/Modules/FindGPERFTOOLS.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Tries to find Gperftools. # diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake index 102540f21..5e8dddef7 100644 --- a/cmake/Modules/FindGPSTK.cmake +++ b/cmake/Modules/FindGPSTK.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # - Find gpstk library # Find the native gpstk includes and library diff --git a/cmake/Modules/FindGRDBFCTTC.cmake b/cmake/Modules/FindGRDBFCTTC.cmake index 9642e0a03..72bbe8d90 100644 --- a/cmake/Modules/FindGRDBFCTTC.cmake +++ b/cmake/Modules/FindGRDBFCTTC.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Find GR-DBFCTTC Module diff --git a/cmake/Modules/FindGRGN3S.cmake b/cmake/Modules/FindGRGN3S.cmake index 089242f8a..c53f5da6a 100644 --- a/cmake/Modules/FindGRGN3S.cmake +++ b/cmake/Modules/FindGRGN3S.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Find GR-GN3S Module diff --git a/cmake/Modules/FindGRIIO.cmake b/cmake/Modules/FindGRIIO.cmake index 967f070d6..e08290252 100644 --- a/cmake/Modules/FindGRIIO.cmake +++ b/cmake/Modules/FindGRIIO.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/FindGROSMOSDR.cmake b/cmake/Modules/FindGROSMOSDR.cmake index a9de01475..cfaef1494 100644 --- a/cmake/Modules/FindGROSMOSDR.cmake +++ b/cmake/Modules/FindGROSMOSDR.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Tries to find gr-osmosdr. # diff --git a/cmake/Modules/FindLIBAD9361.cmake b/cmake/Modules/FindLIBAD9361.cmake index d73e46776..80df49673 100644 --- a/cmake/Modules/FindLIBAD9361.cmake +++ b/cmake/Modules/FindLIBAD9361.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/FindLIBIIO.cmake b/cmake/Modules/FindLIBIIO.cmake index 6fa12cd4b..31f152b6f 100644 --- a/cmake/Modules/FindLIBIIO.cmake +++ b/cmake/Modules/FindLIBIIO.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/FindLOG4CPP.cmake b/cmake/Modules/FindLOG4CPP.cmake index 94604303a..73876d1da 100644 --- a/cmake/Modules/FindLOG4CPP.cmake +++ b/cmake/Modules/FindLOG4CPP.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # - Find Log4cpp # Find the native LOG4CPP includes and library diff --git a/cmake/Modules/FindMATHJAX2.cmake b/cmake/Modules/FindMATHJAX2.cmake index 0b78175b9..cbd5d0835 100644 --- a/cmake/Modules/FindMATHJAX2.cmake +++ b/cmake/Modules/FindMATHJAX2.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # # Find MathJax package (version 2). diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake index d5502431b..712995d7b 100644 --- a/cmake/Modules/FindMATIO.cmake +++ b/cmake/Modules/FindMATIO.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # FindMATIO # diff --git a/cmake/Modules/FindOPENCL.cmake b/cmake/Modules/FindOPENCL.cmake index 962616c1b..044251c2e 100644 --- a/cmake/Modules/FindOPENCL.cmake +++ b/cmake/Modules/FindOPENCL.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # - Try to find OpenCL diff --git a/cmake/Modules/FindORC.cmake b/cmake/Modules/FindORC.cmake index a924c6fdd..97cd0e4a8 100644 --- a/cmake/Modules/FindORC.cmake +++ b/cmake/Modules/FindORC.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_GNSSSDR_CMAKE_FIND_ORC) return() diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake index 95ab28a4e..b72b5f5d1 100644 --- a/cmake/Modules/FindPCAP.cmake +++ b/cmake/Modules/FindPCAP.cmake @@ -1,13 +1,9 @@ -################################################################### -# -# Copyright (c) 2006 Frederic Heem, -# All rights reserved. -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# SPDX-FileCopyrightText: 2006 Frederic Heem, # SPDX-License-Identifier: BSD-3-Clause -# -################################################################### + # - Find pcap # Find the PCAP includes and library # http://www.tcpdump.org/ diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake index 77473b63f..c5c1ea637 100644 --- a/cmake/Modules/FindPUGIXML.cmake +++ b/cmake/Modules/FindPUGIXML.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Find the pugixml XML parsing library. # diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake index 9030bde02..b0d5e6c20 100644 --- a/cmake/Modules/FindTELEORBIT.cmake +++ b/cmake/Modules/FindTELEORBIT.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index c4082d78b..772cf436a 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake index 81083eb4d..f67efdfbb 100644 --- a/cmake/Modules/FindVOLK.cmake +++ b/cmake/Modules/FindVOLK.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/FindVOLKGNSSSDR.cmake b/cmake/Modules/FindVOLKGNSSSDR.cmake index 4eb3ada65..64ab621d3 100644 --- a/cmake/Modules/FindVOLKGNSSSDR.cmake +++ b/cmake/Modules/FindVOLKGNSSSDR.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # # Provides the following imported target: diff --git a/cmake/Modules/GnsssdrBuildTypes.cmake b/cmake/Modules/GnsssdrBuildTypes.cmake index 01dae1acd..ddb12df6b 100644 --- a/cmake/Modules/GnsssdrBuildTypes.cmake +++ b/cmake/Modules/GnsssdrBuildTypes.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_GNSSSDR_BUILD_TYPES_CMAKE) return() diff --git a/cmake/Modules/SetupPython.cmake b/cmake/Modules/SetupPython.cmake index ff7e7d62c..396849e9c 100644 --- a/cmake/Modules/SetupPython.cmake +++ b/cmake/Modules/SetupPython.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## @@ -78,7 +76,14 @@ if(CMAKE_VERSION VERSION_LESS 3.12 OR CMAKE_CROSSCOMPILING) endif() endif() else() + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(_previous ${CMAKE_FIND_FRAMEWORK}) + set(CMAKE_FIND_FRAMEWORK LAST) + endif() find_package(Python3 COMPONENTS Interpreter) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_FIND_FRAMEWORK ${_previous}) + endif() if(Python3_FOUND) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR}) diff --git a/cmake/Modules/TestForARM.cmake b/cmake/Modules/TestForARM.cmake index 8642718b4..9cd248f34 100644 --- a/cmake/Modules/TestForARM.cmake +++ b/cmake/Modules/TestForARM.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ############################################################################## # check if the compiler defines the architecture as ARM and set the diff --git a/cmake/Toolchains/aarch64-linux-gnu.cmake b/cmake/Toolchains/aarch64-linux-gnu.cmake index 55b0ab9b9..28cf3073d 100644 --- a/cmake/Toolchains/aarch64-linux-gnu.cmake +++ b/cmake/Toolchains/aarch64-linux-gnu.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR aarch64) diff --git a/cmake/Toolchains/arm-linux-gnueabihf.cmake b/cmake/Toolchains/arm-linux-gnueabihf.cmake index 1a674ce98..c91a16b61 100644 --- a/cmake/Toolchains/arm-linux-gnueabihf.cmake +++ b/cmake/Toolchains/arm-linux-gnueabihf.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) diff --git a/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake index 5419681d3..cf0a16a0a 100644 --- a/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON diff --git a/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake index 053704eac..35e4d7f9e 100644 --- a/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A72 w/ NEON diff --git a/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake index 0b5f02650..fd9213450 100644 --- a/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A72 w/ NEON diff --git a/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake index 9c5d52892..b6c3e21b0 100644 --- a/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON diff --git a/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake b/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake index 4c856167c..972051a3f 100644 --- a/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a8_softfp_native.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON diff --git a/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake b/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake index c3e1e9293..466c64205 100644 --- a/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake +++ b/cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON diff --git a/cmake/Toolchains/oe-sdk_cross.cmake b/cmake/Toolchains/oe-sdk_cross.cmake index 34f09f140..708674930 100644 --- a/cmake/Toolchains/oe-sdk_cross.cmake +++ b/cmake/Toolchains/oe-sdk_cross.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ########################################################## # Toolchain file for Open Embedded diff --git a/cmake/Toolchains/raspi3.cmake b/cmake/Toolchains/raspi3.cmake index 053704eac..35e4d7f9e 100644 --- a/cmake/Toolchains/raspi3.cmake +++ b/cmake/Toolchains/raspi3.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A72 w/ NEON diff --git a/cmake/Toolchains/raspi4.cmake b/cmake/Toolchains/raspi4.cmake index 0b5f02650..fd9213450 100644 --- a/cmake/Toolchains/raspi4.cmake +++ b/cmake/Toolchains/raspi4.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A72 w/ NEON diff --git a/cmake/Toolchains/zynq-7000.cmake b/cmake/Toolchains/zynq-7000.cmake index b33e48c7e..e2da5cc33 100644 --- a/cmake/Toolchains/zynq-7000.cmake +++ b/cmake/Toolchains/zynq-7000.cmake @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ########################################################## # Toolchain file for Zynq-7000 devices diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 54d24c68a..fc57491c4 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -1,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") diff --git a/docs/changelog.md b/docs/changelog.md index def020fce..97b5f38a1 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -36,7 +36,7 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades rtcm; diff --git a/src/algorithms/PVT/libs/serdes_monitor_pvt.h b/src/algorithms/PVT/libs/serdes_monitor_pvt.h index 9f5119231..126caa762 100644 --- a/src/algorithms/PVT/libs/serdes_monitor_pvt.h +++ b/src/algorithms/PVT/libs/serdes_monitor_pvt.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/CMakeLists.txt b/src/algorithms/acquisition/CMakeLists.txt index 79a937fb4..75726fbe4 100644 --- a/src/algorithms/acquisition/CMakeLists.txt +++ b/src/algorithms/acquisition/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 5bef43ec6..38bfa860a 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(ACQ_ADAPTER_SOURCES diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index b417bc6db..03224a4d5 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index 68accd67b..60c6d8847 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index f449c49a5..8128b8825 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h index f0440efb2..1434ad88d 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index f2c65ad0c..fa780d2b2 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -238,7 +235,7 @@ void GalileoE1Pcps8msAmbiguousAcquisition::reset() } -float GalileoE1Pcps8msAmbiguousAcquisition::calculate_threshold(float pfa) +float GalileoE1Pcps8msAmbiguousAcquisition::calculate_threshold(float pfa) const { unsigned int frequency_bins = 0; for (int doppler = static_cast(-doppler_max_); doppler <= static_cast(doppler_max_); doppler += static_cast(doppler_step_)) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index 79e327c20..0a0ec747f 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -145,7 +142,7 @@ public: private: - float calculate_threshold(float pfa); + float calculate_threshold(float pfa) const; const ConfigurationInterface* configuration_; galileo_pcps_8ms_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 40c2441ce..984bacd3e 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -190,10 +187,10 @@ void GalileoE1PcpsAmbiguousAcquisition::set_local_code() } } - own::span code__span(code_.data(), vector_length_); + own::span code_span(code_.data(), vector_length_); for (unsigned int i = 0; i < sampled_ms_ / 4; i++) { - std::copy_n(code.data(), code_length_, code__span.subspan(i * code_length_, code_length_).data()); + std::copy_n(code.data(), code_length_, code_span.subspan(i * code_length_, code_length_).data()); } acquisition_->set_local_code(code_.data()); 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 59952f82b..0226e228b 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc index f76e993a2..9d5ee27d7 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index 555599f11..730e496fe 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index 597fda81b..5eabdb135 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index ba9df496c..284b5872a 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index 488fdab93..5a69d845b 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -282,7 +279,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_state(int state) } -float GalileoE1PcpsQuickSyncAmbiguousAcquisition::calculate_threshold(float pfa) +float GalileoE1PcpsQuickSyncAmbiguousAcquisition::calculate_threshold(float pfa) const { unsigned int frequency_bins = 0; for (int doppler = static_cast(-doppler_max_); doppler <= static_cast(doppler_max_); doppler += static_cast(doppler_step_)) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index e9db353d5..996ede12c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -147,7 +144,7 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - float calculate_threshold(float pfa); + float calculate_threshold(float pfa) const; const ConfigurationInterface* configuration_; pcps_quicksync_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index 929e50b51..626f9d91d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -248,7 +245,7 @@ void GalileoE1PcpsTongAmbiguousAcquisition::set_state(int state) } -float GalileoE1PcpsTongAmbiguousAcquisition::calculate_threshold(float pfa) +float GalileoE1PcpsTongAmbiguousAcquisition::calculate_threshold(float pfa) const { unsigned int frequency_bins = 0; for (int doppler = static_cast(-doppler_max_); doppler <= static_cast(doppler_max_); doppler += static_cast(doppler_step_)) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index 85432c60a..d6432a492 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -147,7 +144,7 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - float calculate_threshold(float pfa); + float calculate_threshold(float pfa) const; const ConfigurationInterface* configuration_; pcps_tong_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index 28ef6637f..40a9e948d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -274,7 +271,7 @@ void GalileoE5aNoncoherentIQAcquisitionCaf::reset() } -float GalileoE5aNoncoherentIQAcquisitionCaf::calculate_threshold(float pfa) +float GalileoE5aNoncoherentIQAcquisitionCaf::calculate_threshold(float pfa) const { // Calculate the threshold unsigned int frequency_bins = 0; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index 8e5edff31..2a5fa33a2 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -2,7 +2,7 @@ * \file galileo_e5a_noncoherent_iq_acquisition_caf.h * \brief Adapts a PCPS acquisition block to an AcquisitionInterface for * Galileo E5a data and pilot Signals - * \author Marc Sales, 2014. marcsales92(at)gmail.com + * \author Marc Sales, 2014. marcsales92(at)gmail.com * \based on work from: *
    *
  • Javier Arribas, 2011. jarribas(at)cttc.es @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -150,7 +147,7 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - float calculate_threshold(float pfa); + float calculate_threshold(float pfa) const; const ConfigurationInterface* configuration_; galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc index 7ab22c9b4..5711a8dbf 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc @@ -3,15 +3,13 @@ * \brief Adapts a PCPS acquisition block to an AcquisitionInterface for * Galileo E5a data and pilot Signals * \author Antonio Ramos, 2018. antonio.ramos(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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h index c54f70bf8..a75dc5b49 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h @@ -3,15 +3,13 @@ * \brief Adapts a PCPS acquisition block to an AcquisitionInterface for * Galileo E5a data and pilot Signals * \author Antonio Ramos, 2018. antonio.ramos(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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index bc18b749a..e86c4478c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index 42420a510..40ea03f61 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc index 4ee8d38af..5f515a8ab 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h index 85e8f057b..cc8b26cdd 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc index 29a7f5f68..ecc1df91c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h index 3e5b03505..bdffb5d08 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc index 18867183f..cb892cdc2 100644 --- a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -163,10 +160,10 @@ void GalileoE6PcpsAcquisition::set_local_code() gnss_synchro_->PRN, fs_in_, 0); } - own::span code__span(code_.data(), vector_length_); + own::span code_span(code_.data(), vector_length_); for (unsigned int i = 0; i < sampled_ms_; i++) { - std::copy_n(code.data(), code_length_, code__span.subspan(i * code_length_, code_length_).data()); + std::copy_n(code.data(), code_length_, code_span.subspan(i * code_length_, code_length_).data()); } acquisition_->set_local_code(code_.data()); diff --git a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h index 4fcd77228..fa1e13f57 100644 --- a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc index 4d79ef12b..b0fe5d076 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h index 5c46153cd..9c9df439d 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc index f56483933..62f2a2f4e 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h index 3b66ce398..1fea1db7e 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index 818f72c93..5e4b37428 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 d669a7dd9..8d52ca14e 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc index 5bbc5249c..01fdbb1b8 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h index a3cd9989a..01ef4e245 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc index 57d9481df..2c7ec4a37 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index 0f3aab929..2230c8d72 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc index 8c1ec5e29..8d731a394 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h index 112a844e1..099c38528 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h @@ -4,17 +4,14 @@ * GPS L1 C/A signals * \authors
      *
    • Javier Arribas, 2011. 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc index 84ecd7476..bfb9b4d75 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index 8b37461e4..b235fcbf3 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc index 0af5be7e9..ae3ec0e71 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -264,7 +261,7 @@ void GpsL1CaPcpsQuickSyncAcquisition::set_state(int state) } -float GpsL1CaPcpsQuickSyncAcquisition::calculate_threshold(float pfa) +float GpsL1CaPcpsQuickSyncAcquisition::calculate_threshold(float pfa) const { // Calculate the threshold unsigned int frequency_bins = 0; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index 13c15a1ee..be692b317 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -150,7 +147,7 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - float calculate_threshold(float pfa); + float calculate_threshold(float pfa) const; const ConfigurationInterface* configuration_; pcps_quicksync_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc index 551800746..6886cfe5d 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -226,7 +223,7 @@ void GpsL1CaPcpsTongAcquisition::set_state(int state) } -float GpsL1CaPcpsTongAcquisition::calculate_threshold(float pfa) +float GpsL1CaPcpsTongAcquisition::calculate_threshold(float pfa) const { // Calculate the threshold unsigned int frequency_bins = 0; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index 338d49c01..b7c7a119b 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -148,7 +145,7 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - float calculate_threshold(float pfa); + float calculate_threshold(float pfa) const; const ConfigurationInterface* configuration_; pcps_tong_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index b9a7ad390..0ba3fcb1c 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 75467e905..fbb10a68e 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc index 7a1b63c1f..2b23b58ac 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 8748c0d23..4fb4d3807 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 @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index e3d208b3c..353bfb28e 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index fd7dd3c3a..18a087778 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc index cd4f1cbec..e5a39ca85 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index dde32b02e..25d76d6c2 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt index cdc89e2eb..96fece0e0 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(ACQ_GR_BLOCKS_SOURCES diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index f3ec3ba89..d60e954e9 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h index 1dca05cb4..4297693e1 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 663d3586d..0e520a526 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h index 79633dd70..5fb8360a6 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index c4ec0cadb..8869297aa 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -259,7 +256,7 @@ bool pcps_acquisition::is_fdma() } -void pcps_acquisition::update_local_carrier(own::span carrier_vector, float freq) +void pcps_acquisition::update_local_carrier(own::span carrier_vector, float freq) const { float phase_step_rad; if (d_acq_parameters.use_automatic_resampler) @@ -663,6 +660,7 @@ void pcps_acquisition::acquisition_core(uint64_t samp_count) { lk.unlock(); } + // Doppler frequency grid loop if (!d_step_two) { @@ -878,6 +876,7 @@ void pcps_acquisition::acquisition_core(uint64_t samp_count) send_negative_acquisition(); } } + d_worker_active = false; if ((d_num_noncoherent_integrations_counter == d_acq_parameters.max_dwells) or (d_positive_acq == 1)) { @@ -889,8 +888,6 @@ void pcps_acquisition::acquisition_core(uint64_t samp_count) d_num_noncoherent_integrations_counter = 0U; d_positive_acq = 0; } - - d_worker_active = false; } @@ -937,7 +934,6 @@ int pcps_acquisition::general_work(int noutput_items __attribute__((unused)), * 6. Declare positive or negative acquisition using a message port */ gr::thread::scoped_lock lk(d_setlock); - if (!d_active or d_worker_active) { if (!d_acq_parameters.blocking_on_standby) @@ -1024,8 +1020,7 @@ int pcps_acquisition::general_work(int noutput_items __attribute__((unused)), } else { - d_worker = std::thread([&] { pcps_acquisition::acquisition_core(d_sample_counter); }); - d_worker.detach(); + gr::thread::thread d_worker(&pcps_acquisition::acquisition_core, this, d_sample_counter); d_worker_active = true; } consume_each(0); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h index c161cb063..6ca0156d4 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h @@ -26,13 +26,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -61,8 +58,8 @@ #include #include #include -#include #include + #if HAS_STD_SPAN #include namespace own = std; @@ -221,7 +218,7 @@ private: friend pcps_acquisition_sptr pcps_make_acquisition(const Acq_Conf& conf_); explicit pcps_acquisition(const Acq_Conf& conf_); - void update_local_carrier(own::span carrier_vector, float freq); + void update_local_carrier(own::span carrier_vector, float freq) const; void update_grid_doppler_wipeoffs(); void update_grid_doppler_wipeoffs_step2(); void acquisition_core(uint64_t samp_count); @@ -258,8 +255,8 @@ private: arma::fmat d_grid; arma::fmat d_narrow_grid; + std::queue d_monitor_queue; std::string d_dump_filename; - std::thread d_worker; int64_t d_dump_number; uint64_t d_sample_counter; @@ -291,8 +288,6 @@ private: bool d_step_two; bool d_use_CFAR_algorithm_flag; bool d_dump; - - std::queue d_monitor_queue; }; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc index 715604811..5917df106 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h index 3dfd7ca8a..299858536 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h @@ -23,13 +23,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index a60dd0827..07629d80e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index 267820dcd..aeebc27c9 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 9b85fbb71..a31d41a22 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -286,7 +283,7 @@ float pcps_assisted_acquisition_cc::search_maximum() } -float pcps_assisted_acquisition_cc::estimate_input_power(gr_vector_const_void_star &input_items) +float pcps_assisted_acquisition_cc::estimate_input_power(gr_vector_const_void_star &input_items) const { const auto *in = reinterpret_cast(input_items[0]); // Get the input samples pointer // 1- Compute the input signal power estimation diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h index 00222b58e..275dbf2bf 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -22,13 +22,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -194,7 +191,7 @@ private: int32_t doppler_offset); int32_t compute_and_accumulate_grid(gr_vector_const_void_star& input_items); - float estimate_input_power(gr_vector_const_void_star& input_items); + float estimate_input_power(gr_vector_const_void_star& input_items) const; float search_maximum(); void get_assistance(); void reset_grid(); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index 80de1e4f2..86dbe6dfd 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h index f2afa7517..9c710c4fb 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 4472dad08..c7ff3d8df 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -25,13 +25,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h index 0e053c48b..e1e4569be 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -15,7 +15,7 @@ * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency - * Approach", Birkha user, 2007. pp 81-84 + * Approach", Birkhauser, 2007. pp 81-84 * * \authors
    *
  • Javier Arribas, 2011. jarribas(at)cttc.es @@ -25,13 +25,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index 776c8fe9d..2895cf6a9 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h index 7bd1dc3f6..2163483f4 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -25,13 +25,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index dd8181a18..ffbceecf5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -25,13 +25,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h index c8777b7cf..c58435301 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -25,13 +25,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt index d96efdcd7..4a2e87b53 100644 --- a/src/algorithms/acquisition/libs/CMakeLists.txt +++ b/src/algorithms/acquisition/libs/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(ACQUISITION_LIB_HEADERS acq_conf.h) set(ACQUISITION_LIB_SOURCES acq_conf.cc) diff --git a/src/algorithms/acquisition/libs/acq_conf.cc b/src/algorithms/acquisition/libs/acq_conf.cc index e4a4971fb..58cbf29c7 100644 --- a/src/algorithms/acquisition/libs/acq_conf.cc +++ b/src/algorithms/acquisition/libs/acq_conf.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/libs/acq_conf.h b/src/algorithms/acquisition/libs/acq_conf.h index 7f716667b..b741a4c9e 100644 --- a/src/algorithms/acquisition/libs/acq_conf.h +++ b/src/algorithms/acquisition/libs/acq_conf.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.cc b/src/algorithms/acquisition/libs/fpga_acquisition.cc index d42534040..ab1439567 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.cc +++ b/src/algorithms/acquisition/libs/fpga_acquisition.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.h b/src/algorithms/acquisition/libs/fpga_acquisition.h index 933cc4cf4..7b5453f0c 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.h +++ b/src/algorithms/acquisition/libs/fpga_acquisition.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/channel/CMakeLists.txt b/src/algorithms/channel/CMakeLists.txt index c81e01c99..029cf5cb7 100644 --- a/src/algorithms/channel/CMakeLists.txt +++ b/src/algorithms/channel/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(libs) diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt index 774607f67..d5bbea2af 100644 --- a/src/algorithms/channel/adapters/CMakeLists.txt +++ b/src/algorithms/channel/adapters/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_library(channel_adapters STATIC) diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 7a269fafa..176e2983c 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 16502086c..d43d1df42 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 4e933a3c3..bc9b6f913 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(CHANNEL_FSM_SOURCES channel_fsm.cc diff --git a/src/algorithms/channel/libs/channel_fsm.cc b/src/algorithms/channel/libs/channel_fsm.cc index e34a8fb8d..aa2442630 100644 --- a/src/algorithms/channel/libs/channel_fsm.cc +++ b/src/algorithms/channel/libs/channel_fsm.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/channel/libs/channel_fsm.h b/src/algorithms/channel/libs/channel_fsm.h index 0fa06981e..60e248449 100644 --- a/src/algorithms/channel/libs/channel_fsm.h +++ b/src/algorithms/channel/libs/channel_fsm.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index be3ed06b4..423afa0ca 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h index 59066de82..d5abdf0ae 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/conditioner/CMakeLists.txt b/src/algorithms/conditioner/CMakeLists.txt index 200acdbd6..4edbaeb20 100644 --- a/src/algorithms/conditioner/CMakeLists.txt +++ b/src/algorithms/conditioner/CMakeLists.txt @@ -1,10 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt index f1f3509a6..d8683e4de 100644 --- a/src/algorithms/conditioner/adapters/CMakeLists.txt +++ b/src/algorithms/conditioner/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(COND_ADAPTER_SOURCES diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc index f6b4ae1ef..a22987aaf 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h index 99006df9c..8b5fa1e88 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc index 2ca8137c1..92a0924b0 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index 0079b77b6..e4179df38 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/CMakeLists.txt b/src/algorithms/data_type_adapter/CMakeLists.txt index 37ea002b3..bbc63213f 100644 --- a/src/algorithms/data_type_adapter/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index e1a94d151..aa736ab64 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(DATATYPE_ADAPTER_SOURCES diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc index 33e8293dc..6e1f6cde6 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h index e73e1b905..cd31891e7 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc index 869b3aa87..703a95e8b 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h index afaa60f3f..73d215db2 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc index 432649575..af511b2d1 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 819c9338d..524bf0cb1 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc index 7f15c4970..9ff7652ac 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h index 1dd1a8098..03a2d8441 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc index 3f3574b73..19c619216 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h index e2c49eded..397d2951f 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc index 5144d742c..09e15616e 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h index f719fc958..0d3d256b3 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index aaec99e0d..d7be7b5f5 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(DATA_TYPE_GR_BLOCKS_SOURCES diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc index 05893730e..63e4492e7 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 9ddd632ea..864abb851 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 @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc index e6bcbe651..aed2cc65f 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h index bef515196..c4119b14e 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc index 13a1ef6ad..3baed6b72 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h index d9e5a5d52..80f95ff9b 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/CMakeLists.txt b/src/algorithms/input_filter/CMakeLists.txt index 37ea002b3..bbc63213f 100644 --- a/src/algorithms/input_filter/CMakeLists.txt +++ b/src/algorithms/input_filter/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index 546332144..a4f052ade 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(INPUT_FILTER_ADAPTER_SOURCES fir_filter.cc diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index 76ef76b29..69b7d60a9 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h index 9297c4247..e71b203e9 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.h +++ b/src/algorithms/input_filter/adapters/beamformer_filter.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index 5cc0cb517..7f42d1ce3 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -191,7 +188,7 @@ void FirFilter::init() // those bands, and the weight given to the error in those bands. const std::vector taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); taps_.reserve(taps_d.size()); - for (auto& it : taps_d) + for (const auto& it : taps_d) { taps_.push_back(static_cast(it)); } diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h index 4bc2bce32..1391705ee 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.h +++ b/src/algorithms/input_filter/adapters/fir_filter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index 30d0c80c8..dd504101a 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -94,7 +91,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu const int grid_density = configuration->property(role_ + ".grid_density", default_grid_density); const std::vector taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); taps_.reserve(taps_d.size()); - for (auto& it : taps_d) + for (const auto& it : taps_d) { taps_.push_back(static_cast(it)); } diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h index 18336bdab..d3797277a 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc index eedf62819..1d9f5ea98 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.cc +++ b/src/algorithms/input_filter/adapters/notch_filter.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/notch_filter.h b/src/algorithms/input_filter/adapters/notch_filter.h index f87225bf3..dcda323a5 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.h +++ b/src/algorithms/input_filter/adapters/notch_filter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc index 0292f7823..562bff514 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.h b/src/algorithms/input_filter/adapters/notch_filter_lite.h index ca04f47ad..56b8864e3 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.h +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index 164cd8243..3c82314d8 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h index b1b146a0d..bd5411a6b 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt index b83972f05..1701528a1 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(INPUT_FILTER_GR_BLOCKS_SOURCES diff --git a/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc b/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc index 5bb115056..257861f9f 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc @@ -5,13 +5,10 @@ * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/gnuradio_blocks/beamformer.h b/src/algorithms/input_filter/gnuradio_blocks/beamformer.h index c5db6c916..7765b4138 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/beamformer.h +++ b/src/algorithms/input_filter/gnuradio_blocks/beamformer.h @@ -3,15 +3,13 @@ * * \brief Simple spatial filter using RAW array input and beamforming coefficients * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc index cc3ee0cbf..455a5a986 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h index bc23762dc..3cc5764b8 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h @@ -5,16 +5,14 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- + * */ #ifndef GNSS_SDR_NOTCH_CC_H diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc index 3b88c26c6..a3b69dcd0 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc @@ -5,16 +5,14 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- + * */ #include "notch_lite_cc.h" diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h index 4d2b83c7e..066fb78e4 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h @@ -5,16 +5,14 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- + * */ #ifndef GNSS_SDR_NOTCH_LITE_CC_H diff --git a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc index 9b5ad0ea7..a8d06ed3f 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc @@ -3,18 +3,17 @@ * \brief Implements a pulse blanking algorithm * \author Javier Arribas (jarribas(at)cttc.es) * Antonio Ramos (antonio.ramosdet(at)gmail.com) + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- + * */ #include "pulse_blanking_cc.h" diff --git a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h index be2f6d54d..0f3b19de7 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h +++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h @@ -3,18 +3,17 @@ * \brief Implements a pulse blanking algorithm * \author Javier Arribas (jarribas(at)cttc.es) * Antonio Ramos (antonio.ramosdet(at)gmail.com) + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- + * */ #ifndef GNSS_SDR_PULSE_BLANKING_CC_H diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 7305b7804..9f5db4897 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + add_subdirectory(rtklib) diff --git a/src/algorithms/libs/beidou_b1i_signal_replica.cc b/src/algorithms/libs/beidou_b1i_signal_replica.cc index 469bd4465..661ac3ef0 100644 --- a/src/algorithms/libs/beidou_b1i_signal_replica.cc +++ b/src/algorithms/libs/beidou_b1i_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -26,17 +23,17 @@ const auto AUX_CEIL = [](float x) { return static_cast(static_cast((x) + 1)); }; -void beidou_b1i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_shift) +void beidou_b1i_code_gen_int(own::span dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 2046; + constexpr uint32_t code_length = 2046; const std::array delays = {712 /*PRN1*/, 1581, 1414, 1550, 581, 771, 1311, 1043, 1549, 359, 710, 1579, 1548, 1103, 579, 769, 358, 709, 1411, 1547, 1102, 578, 357, 1577, 1410, 1546, 1101, 707, 1576, 1409, 1545, 354 /*PRN32*/, 705}; const std::array phase1 = {1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 8, 8, 8, 9, 9, 10}; const std::array phase2 = {3, 4, 5, 6, 8, 9, 10, 11, 7, 4, 5, 6, 8, 9, 10, 11, 5, 6, 8, 9, 10, 11, 6, 8, 9, 10, 11, 8, 9, 10, 11, 9, 10, 11, 10, 11, 11}; - std::bitset<_code_length> G1{}; - std::bitset<_code_length> G2{}; + std::bitset G1{}; + std::bitset G2{}; std::bitset<11> G1_register(std::string("01010101010")); std::bitset<11> G2_register(std::string("01010101010")); @@ -50,7 +47,7 @@ void beidou_b1i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _c int32_t prn_idx; // compute delay array index for given PRN number - prn_idx = _prn - 1; + prn_idx = prn - 1; // A simple error check if ((prn_idx < 0) || (prn_idx > 32)) @@ -59,7 +56,7 @@ void beidou_b1i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _c } // Generate G1 & G2 Register - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { G1[lcv] = G1_register[0]; G2[lcv] = G2_register[-(phase1[prn_idx] - 11)] xor G2_register[-(phase2[prn_idx] - 11)]; @@ -78,53 +75,53 @@ void beidou_b1i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _c } // Set the delay - delay = _code_length - delays[prn_idx] * 0; //********************************** - delay += _chip_shift; - delay %= _code_length; + delay = code_length - delays[prn_idx] * 0; //********************************** + delay += chip_shift; + delay %= code_length; // Generate PRN from G1 and G2 Registers - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { - aux = G1[(lcv + _chip_shift) % _code_length] xor G2[delay]; + aux = G1[(lcv + chip_shift) % code_length] xor G2[delay]; if (aux == true) { - _dest[lcv] = 1; + dest[lcv] = 1; } else { - _dest[lcv] = -1; + dest[lcv] = -1; } delay++; - delay %= _code_length; + delay %= code_length; } } -void beidou_b1i_code_gen_float(own::span _dest, int32_t _prn, uint32_t _chip_shift) +void beidou_b1i_code_gen_float(own::span dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 2046; - std::array b1i_code_int{}; + constexpr uint32_t code_length = 2046; + std::array b1i_code_int{}; - beidou_b1i_code_gen_int(own::span(b1i_code_int.data(), _code_length), _prn, _chip_shift); + beidou_b1i_code_gen_int(own::span(b1i_code_int.data(), code_length), prn, chip_shift); - for (uint32_t ii = 0; ii < _code_length; ++ii) + for (uint32_t ii = 0; ii < code_length; ++ii) { - _dest[ii] = static_cast(b1i_code_int[ii]); + dest[ii] = static_cast(b1i_code_int[ii]); } } -void beidou_b1i_code_gen_complex(own::span> _dest, int32_t _prn, uint32_t _chip_shift) +void beidou_b1i_code_gen_complex(own::span> dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 2046; - std::array b1i_code_int{}; + constexpr uint32_t code_length = 2046; + std::array b1i_code_int{}; - beidou_b1i_code_gen_int(own::span(b1i_code_int.data(), _code_length), _prn, _chip_shift); + beidou_b1i_code_gen_int(own::span(b1i_code_int.data(), code_length), prn, chip_shift); - for (uint32_t ii = 0; ii < _code_length; ++ii) + for (uint32_t ii = 0; ii < code_length; ++ii) { - _dest[ii] = std::complex(static_cast(b1i_code_int[ii]), 0.0F); + dest[ii] = std::complex(static_cast(b1i_code_int[ii]), 0.0F); } } @@ -132,22 +129,22 @@ void beidou_b1i_code_gen_complex(own::span> _dest, int32_t _ /* * Generates complex BeiDou B1I code for the desired SV ID and sampled to specific sampling frequency */ -void beidou_b1i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift) +void beidou_b1i_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift) { - constexpr int32_t _codeFreqBasis = 2046000; // Hz - constexpr int32_t _codeLength = 2046; - constexpr float _tc = 1.0 / static_cast(_codeFreqBasis); // B1I chip period in sec + constexpr int32_t codeFreqBasis = 2046000; // chips per second + constexpr int32_t codeLength = 2046; + constexpr float tc = 1.0 / static_cast(codeFreqBasis); // B1I chip period in sec - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec - std::array, 2046> _code{}; - int32_t _codeValueIndex; + std::array, 2046> code_aux{}; + int32_t codeValueIndex; float aux; - beidou_b1i_code_gen_complex(_code, _prn, _chip_shift); // generate B1I code 1 sample per chip + beidou_b1i_code_gen_complex(code_aux, prn, chip_shift); // generate B1I code 1 sample per chip - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== @@ -156,20 +153,20 @@ void beidou_b1i_code_gen_complex_sampled(own::span> _dest, u // number of samples per millisecond (because one B1I code period is // one millisecond). - aux = (_ts * (static_cast(i) + 1)) / _tc; - _codeValueIndex = AUX_CEIL(aux) - 1; + aux = (ts * (static_cast(i) + 1)) / tc; + codeValueIndex = AUX_CEIL(aux) - 1; // --- Make the digitized version of the B1I code ------------------ - // The "upsampled" code is made by selecting values form the B1I code - // chip array (caCode) for the time instances of each sample. - if (i == _samplesPerCode - 1) + // The upsampled code is made by selecting values from the B1I code + // chip array for the time instances of each sample. + if (i == samplesPerCode - 1) { - // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = _code[_codeLength - 1]; + // Correct the last index (due to number rounding issues) + dest[i] = code_aux[codeLength - 1]; } else { - _dest[i] = _code[_codeValueIndex]; // repeat the chip -> upsample + dest[i] = code_aux[codeValueIndex]; // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/beidou_b1i_signal_replica.h b/src/algorithms/libs/beidou_b1i_signal_replica.h index d76f8d7e1..b5be0a8c3 100644 --- a/src/algorithms/libs/beidou_b1i_signal_replica.h +++ b/src/algorithms/libs/beidou_b1i_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -41,19 +38,16 @@ namespace own = gsl; //! Generates int32_t GPS L1 C/A code for the desired SV ID and code shift -void beidou_b1i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_shift); +void beidou_b1i_code_gen_int(own::span dest, int32_t prn, uint32_t chip_shift); //! Generates float GPS L1 C/A code for the desired SV ID and code shift -void beidou_b1i_code_gen_float(own::span _dest, int32_t _prn, uint32_t _chip_shift); - -//! Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency -void beidou_b1i_code_gen_complex(own::span> _dest, int32_t _prn, uint32_t _chip_shift); - -//! Generates N complex GPS L1 C/A codes for the desired SV ID and code shift -void beidou_b1i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, uint32_t _ncodes); +void beidou_b1i_code_gen_float(own::span dest, int32_t prn, uint32_t chip_shift); //! Generates complex GPS L1 C/A code for the desired SV ID and code shift -void beidou_b1i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift); +void beidou_b1i_code_gen_complex(own::span> dest, int32_t prn, uint32_t chip_shift); + +//! Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency +void beidou_b1i_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/beidou_b3i_signal_replica.cc b/src/algorithms/libs/beidou_b3i_signal_replica.cc index 7071a2e22..84787e5ef 100644 --- a/src/algorithms/libs/beidou_b3i_signal_replica.cc +++ b/src/algorithms/libs/beidou_b3i_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -26,11 +23,11 @@ const auto AUX_CEIL = [](float x) { return static_cast(static_cast((x) + 1)); }; -void beidou_b3i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_shift) +void beidou_b3i_code_gen_int(own::span dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 10230; - std::bitset<_code_length> G1{}; - std::bitset<_code_length> G2{}; + constexpr uint32_t code_length = 10230; + std::bitset G1{}; + std::bitset G2{}; auto G1_register = std::bitset<13>{}.set(); // All true auto G2_register = std::bitset<13>{}.set(); // All true auto G1_register_reset = std::bitset<13>{}.set(); @@ -43,7 +40,7 @@ void beidou_b3i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_ uint32_t lcv; uint32_t lcv2; uint32_t delay; - int32_t prn_idx = _prn - 1; + int32_t prn_idx = prn - 1; const std::array, 63> G2_register_shifted = {std::bitset<13>(std::string("1010111111111")), @@ -120,7 +117,7 @@ void beidou_b3i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_ G2_register = G2_register_shifted[prn_idx]; // Generate G1 and G2 Register - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { G1[lcv] = G1_register[0]; G2[lcv] = G2_register[0]; @@ -145,74 +142,74 @@ void beidou_b3i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_ } } - delay = _code_length; - delay += _chip_shift; - delay %= _code_length; + delay = code_length; + delay += chip_shift; + delay %= code_length; // Generate PRN from G1 and G2 Registers - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { - aux = G1[(lcv + _chip_shift) % _code_length] xor G2[delay]; + aux = G1[(lcv + chip_shift) % code_length] xor G2[delay]; if (aux == true) { - _dest[lcv] = 1; + dest[lcv] = 1; } else { - _dest[lcv] = -1; + dest[lcv] = -1; } delay++; - delay %= _code_length; + delay %= code_length; } } -void beidou_b3i_code_gen_float(own::span _dest, int32_t _prn, uint32_t _chip_shift) +void beidou_b3i_code_gen_float(own::span dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 10230; - std::array b3i_code_int{}; + constexpr uint32_t code_length = 10230; + std::array b3i_code_int{}; - beidou_b3i_code_gen_int(b3i_code_int, _prn, _chip_shift); + beidou_b3i_code_gen_int(b3i_code_int, prn, chip_shift); - for (uint32_t ii = 0; ii < _code_length; ++ii) + for (uint32_t ii = 0; ii < code_length; ++ii) { - _dest[ii] = static_cast(b3i_code_int[ii]); + dest[ii] = static_cast(b3i_code_int[ii]); } } -void beidou_b3i_code_gen_complex(own::span> _dest, int32_t _prn, uint32_t _chip_shift) +void beidou_b3i_code_gen_complex(own::span> dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 10230; - std::array b3i_code_int{}; + constexpr uint32_t code_length = 10230; + std::array b3i_code_int{}; - beidou_b3i_code_gen_int(b3i_code_int, _prn, _chip_shift); + beidou_b3i_code_gen_int(b3i_code_int, prn, chip_shift); - for (uint32_t ii = 0; ii < _code_length; ++ii) + for (uint32_t ii = 0; ii < code_length; ++ii) { - _dest[ii] = std::complex(static_cast(b3i_code_int[ii]), 0.0F); + dest[ii] = std::complex(static_cast(b3i_code_int[ii]), 0.0F); } } -void beidou_b3i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int _fs, uint32_t _chip_shift) +void beidou_b3i_code_gen_complex_sampled(own::span> dest, uint32_t prn, int sampling_freq, uint32_t chip_shift) { - constexpr int32_t _codeFreqBasis = 10230000; // Hz - constexpr int32_t _codeLength = 10230; - constexpr float _tc = 1.0 / static_cast(_codeFreqBasis); // B3I chip period in sec + constexpr int32_t codeFreqBasis = 10230000; // chips per second + constexpr int32_t codeLength = 10230; + constexpr float tc = 1.0 / static_cast(codeFreqBasis); // B3I chip period in sec - const float _ts = 1.0F / static_cast(_fs); // Sampling period in secs - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in secs + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); - std::array, 10230> _code{}; + std::array, 10230> code_aux{}; - int32_t _codeValueIndex; + int32_t codeValueIndex; float aux; - beidou_b3i_code_gen_complex(_code, _prn, _chip_shift); // generate B3I code 1 sample per chip + beidou_b3i_code_gen_complex(code_aux, prn, chip_shift); // generate B3I code 1 sample per chip - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== @@ -221,20 +218,20 @@ void beidou_b3i_code_gen_complex_sampled(own::span> _dest, u // number of samples per millisecond (because one B3I code period is // one millisecond). - aux = (_ts * (static_cast(i) + 1)) / _tc; - _codeValueIndex = AUX_CEIL(aux) - 1; + aux = (ts * (static_cast(i) + 1)) / tc; + codeValueIndex = AUX_CEIL(aux) - 1; // --- Make the digitized version of the B3I code ------------------ - // The "upsampled" code is made by selecting values form the B3I code - // chip array (caCode) for the time instances of each sample. - if (i == _samplesPerCode - 1) + // The upsampled code is made by selecting values from the B3I code + // chip array for the time instances of each sample. + if (i == samplesPerCode - 1) { - // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = _code[_codeLength - 1]; + // Correct the last index (due to number rounding issues) + dest[i] = code_aux[codeLength - 1]; } else { - _dest[i] = _code[_codeValueIndex]; // repeat the chip -> upsample + dest[i] = code_aux[codeValueIndex]; // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/beidou_b3i_signal_replica.h b/src/algorithms/libs/beidou_b3i_signal_replica.h index 663b6780d..ad3dd017f 100644 --- a/src/algorithms/libs/beidou_b3i_signal_replica.h +++ b/src/algorithms/libs/beidou_b3i_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -39,19 +36,16 @@ namespace own = gsl; //! Generates int BeiDou B3I code for the desired SV ID and code shift -void beidou_b3i_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_shift); +void beidou_b3i_code_gen_int(own::span dest, int32_t prn, uint32_t chip_shift); //! Generates float BeiDou B3I code for the desired SV ID and code shift -void beidou_b3i_code_gen_float(own::span _dest, int32_t _prn, uint32_t _chip_shift); - -//! Generates complex BeiDou B3I code for the desired SV ID and code shift, and sampled to specific sampling frequency -void beidou_b3i_code_gen_complex(own::span> _dest, int32_t _prn, uint32_t _chip_shift); - -//! Generates N complex BeiDou B3I codes for the desired SV ID and code shift -void beidou_b3i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int _fs, uint32_t _chip_shift, uint32_t _ncodes); +void beidou_b3i_code_gen_float(own::span dest, int32_t prn, uint32_t chip_shift); //! Generates complex BeiDou B3I code for the desired SV ID and code shift -void beidou_b3i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int _fs, uint32_t _chip_shift); +void beidou_b3i_code_gen_complex(own::span> dest, int32_t prn, uint32_t chip_shift); + +//! Generates complex BeiDou B3I code for the desired SV ID and code shift, and sampled to specific sampling frequency +void beidou_b3i_code_gen_complex_sampled(own::span> dest, uint32_t prn, int sampling_freq, uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/byte_x2_to_complex_byte.cc b/src/algorithms/libs/byte_x2_to_complex_byte.cc index 32abfa1b1..9adfc79ef 100644 --- a/src/algorithms/libs/byte_x2_to_complex_byte.cc +++ b/src/algorithms/libs/byte_x2_to_complex_byte.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/byte_x2_to_complex_byte.h b/src/algorithms/libs/byte_x2_to_complex_byte.h index 2967ec678..c6b7311c3 100644 --- a/src/algorithms/libs/byte_x2_to_complex_byte.h +++ b/src/algorithms/libs/byte_x2_to_complex_byte.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/complex_byte_to_float_x2.cc b/src/algorithms/libs/complex_byte_to_float_x2.cc index 10b82bb74..9fe0522c5 100644 --- a/src/algorithms/libs/complex_byte_to_float_x2.cc +++ b/src/algorithms/libs/complex_byte_to_float_x2.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/complex_byte_to_float_x2.h b/src/algorithms/libs/complex_byte_to_float_x2.h index 6ad8eb343..04b80563b 100644 --- a/src/algorithms/libs/complex_byte_to_float_x2.h +++ b/src/algorithms/libs/complex_byte_to_float_x2.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/complex_float_to_complex_byte.cc b/src/algorithms/libs/complex_float_to_complex_byte.cc index 0ceb941be..d26c416bc 100644 --- a/src/algorithms/libs/complex_float_to_complex_byte.cc +++ b/src/algorithms/libs/complex_float_to_complex_byte.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/complex_float_to_complex_byte.h b/src/algorithms/libs/complex_float_to_complex_byte.h index 0e3da99a6..4ee607112 100644 --- a/src/algorithms/libs/complex_float_to_complex_byte.h +++ b/src/algorithms/libs/complex_float_to_complex_byte.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/conjugate_cc.cc b/src/algorithms/libs/conjugate_cc.cc index 60d0732b1..adfa101cf 100644 --- a/src/algorithms/libs/conjugate_cc.cc +++ b/src/algorithms/libs/conjugate_cc.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/conjugate_cc.h b/src/algorithms/libs/conjugate_cc.h index 113b42034..2012ed17d 100644 --- a/src/algorithms/libs/conjugate_cc.h +++ b/src/algorithms/libs/conjugate_cc.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/conjugate_ic.cc b/src/algorithms/libs/conjugate_ic.cc index d46ad3c65..d1a2c675b 100644 --- a/src/algorithms/libs/conjugate_ic.cc +++ b/src/algorithms/libs/conjugate_ic.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/conjugate_ic.h b/src/algorithms/libs/conjugate_ic.h index 589a77e2e..170f9a419 100644 --- a/src/algorithms/libs/conjugate_ic.h +++ b/src/algorithms/libs/conjugate_ic.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/conjugate_sc.cc b/src/algorithms/libs/conjugate_sc.cc index 54ec1c1fd..54e0d10d9 100644 --- a/src/algorithms/libs/conjugate_sc.cc +++ b/src/algorithms/libs/conjugate_sc.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/conjugate_sc.h b/src/algorithms/libs/conjugate_sc.h index 5933de263..8cbdfed10 100644 --- a/src/algorithms/libs/conjugate_sc.h +++ b/src/algorithms/libs/conjugate_sc.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/cshort_to_float_x2.cc b/src/algorithms/libs/cshort_to_float_x2.cc index f1f45cf94..19528a924 100644 --- a/src/algorithms/libs/cshort_to_float_x2.cc +++ b/src/algorithms/libs/cshort_to_float_x2.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/cshort_to_float_x2.h b/src/algorithms/libs/cshort_to_float_x2.h index b084bb135..91a385349 100644 --- a/src/algorithms/libs/cshort_to_float_x2.h +++ b/src/algorithms/libs/cshort_to_float_x2.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/galileo_e1_signal_replica.cc b/src/algorithms/libs/galileo_e1_signal_replica.cc index aa3750ced..cc212cd22 100644 --- a/src/algorithms/libs/galileo_e1_signal_replica.cc +++ b/src/algorithms/libs/galileo_e1_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -30,216 +27,216 @@ #include -void galileo_e1_code_gen_int(own::span _dest, const std::array& _Signal, int32_t _prn) +void galileo_e1_code_gen_int(own::span dest, const std::array& signal_id, int32_t prn) { - const std::string _galileo_signal = _Signal.data(); - const int32_t prn = _prn - 1; + const std::string galileo_signal = signal_id.data(); + const int32_t prn_ = prn - 1; int32_t index = 0; // A simple error check - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } - if (_galileo_signal.rfind("1B") != std::string::npos && _galileo_signal.length() >= 2) + if (galileo_signal.rfind("1B") != std::string::npos && galileo_signal.length() >= 2) { for (size_t i = 0; i < GALILEO_E1_B_PRIMARY_CODE_STR_LENGTH; i++) { - hex_to_binary_converter(_dest.subspan(index, 4), GALILEO_E1_B_PRIMARY_CODE[prn][i]); + hex_to_binary_converter(dest.subspan(index, 4), GALILEO_E1_B_PRIMARY_CODE[prn_][i]); index += 4; } } - else if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2) + else if (galileo_signal.rfind("1C") != std::string::npos && galileo_signal.length() >= 2) { for (size_t i = 0; i < GALILEO_E1_C_PRIMARY_CODE_STR_LENGTH; i++) { - hex_to_binary_converter(_dest.subspan(index, 4), GALILEO_E1_C_PRIMARY_CODE[prn][i]); + hex_to_binary_converter(dest.subspan(index, 4), GALILEO_E1_C_PRIMARY_CODE[prn_][i]); index += 4; } } } -void galileo_e1_sinboc_11_gen_int(own::span _dest, own::span _prn) +void galileo_e1_sinboc_11_gen_int(own::span dest, own::span prn) { - constexpr uint32_t _length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS; - const auto _period = static_cast(_dest.size() / _length_in); - for (uint32_t i = 0; i < _length_in; i++) + constexpr uint32_t length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS; + const auto period = static_cast(dest.size() / length_in); + for (uint32_t i = 0; i < length_in; i++) { - for (uint32_t j = 0; j < (_period / 2); j++) + for (uint32_t j = 0; j < (period / 2); j++) { - _dest[i * _period + j] = _prn[i]; + dest[i * period + j] = prn[i]; } - for (uint32_t j = (_period / 2); j < _period; j++) + for (uint32_t j = (period / 2); j < period; j++) { - _dest[i * _period + j] = -_prn[i]; + dest[i * period + j] = -prn[i]; } } } -void galileo_e1_sinboc_61_gen_int(own::span _dest, own::span _prn) +void galileo_e1_sinboc_61_gen_int(own::span dest, own::span prn) { - constexpr uint32_t _length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS; - const auto _period = static_cast(_dest.size() / _length_in); + constexpr uint32_t length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS; + const auto period = static_cast(dest.size() / length_in); - for (uint32_t i = 0; i < _length_in; i++) + for (uint32_t i = 0; i < length_in; i++) { - for (uint32_t j = 0; j < _period; j += 2) + for (uint32_t j = 0; j < period; j += 2) { - _dest[i * _period + j] = _prn[i]; + dest[i * period + j] = prn[i]; } - for (uint32_t j = 1; j < _period; j += 2) + for (uint32_t j = 1; j < period; j += 2) { - _dest[i * _period + j] = -_prn[i]; + dest[i * period + j] = -prn[i]; } } } -void galileo_e1_code_gen_sinboc11_float(own::span _dest, const std::array& _Signal, uint32_t _prn) +void galileo_e1_code_gen_sinboc11_float(own::span dest, const std::array& signal_id, uint32_t prn) { - const auto _codeLength = static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS); + const auto codeLength = static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS); std::array primary_code_E1_chips{}; - galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn); // generate Galileo E1 code, 1 sample per chip - for (uint32_t i = 0; i < _codeLength; i++) + galileo_e1_code_gen_int(primary_code_E1_chips, signal_id, prn); // generate Galileo E1 code, 1 sample per chip + for (uint32_t i = 0; i < codeLength; i++) { - _dest[2 * i] = static_cast(primary_code_E1_chips[i]); - _dest[2 * i + 1] = -_dest[2 * i]; + dest[2 * i] = static_cast(primary_code_E1_chips[i]); + dest[2 * i + 1] = -dest[2 * i]; } } -void galileo_e1_gen_float(own::span _dest, own::span _prn, const std::array& _Signal) +void galileo_e1_gen_float(own::span dest, own::span prn, const std::array& signal_id) { - const auto _codeLength = _dest.size(); + const auto codeLength = dest.size(); const float alpha = std::sqrt(10.0F / 11.0F); const float beta = std::sqrt(1.0F / 11.0F); - const std::string _galileo_signal = _Signal.data(); + const std::string galileo_signal = signal_id.data(); - std::vector sinboc_11(_codeLength); - std::vector sinboc_61(_codeLength); + std::vector sinboc_11(codeLength); + std::vector sinboc_61(codeLength); - galileo_e1_sinboc_11_gen_int(sinboc_11, _prn); // generate sinboc(1,1) 12 samples per chip - galileo_e1_sinboc_61_gen_int(sinboc_61, _prn); // generate sinboc(6,1) 12 samples per chip + galileo_e1_sinboc_11_gen_int(sinboc_11, prn); // generate sinboc(1,1) 12 samples per chip + galileo_e1_sinboc_61_gen_int(sinboc_61, prn); // generate sinboc(6,1) 12 samples per chip - if (_galileo_signal.rfind("1B") != std::string::npos && _galileo_signal.length() >= 2) + if (galileo_signal.rfind("1B") != std::string::npos && galileo_signal.length() >= 2) { - for (size_t i = 0; i < _codeLength; i++) + for (size_t i = 0; i < codeLength; i++) { - _dest[i] = alpha * static_cast(sinboc_11[i]) + - beta * static_cast(sinboc_61[i]); + dest[i] = alpha * static_cast(sinboc_11[i]) + + beta * static_cast(sinboc_61[i]); } } - else if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2) + else if (galileo_signal.rfind("1C") != std::string::npos && galileo_signal.length() >= 2) { - for (size_t i = 0; i < _codeLength; i++) + for (size_t i = 0; i < codeLength; i++) { - _dest[i] = alpha * static_cast(sinboc_11[i]) - - beta * static_cast(sinboc_61[i]); + dest[i] = alpha * static_cast(sinboc_11[i]) - + beta * static_cast(sinboc_61[i]); } } } -void galileo_e1_code_gen_float_sampled(own::span _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, - bool _secondary_flag) +void galileo_e1_code_gen_float_sampled(own::span dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift, + bool secondary_flag) { - constexpr int32_t _codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_CPS; // Hz - const int32_t _samplesPerChip = (_cboc == true) ? 12 : 2; - const uint32_t _codeLength = _samplesPerChip * GALILEO_E1_B_CODE_LENGTH_CHIPS; - const std::string _galileo_signal = _Signal.data(); - auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / GALILEO_E1_B_CODE_LENGTH_CHIPS)); - const uint32_t delay = ((static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS) - _chip_shift) % static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * _samplesPerCode / GALILEO_E1_B_CODE_LENGTH_CHIPS; + constexpr int32_t codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_CPS; // chips per second + const int32_t samplesPerChip = (cboc == true) ? 12 : 2; + const uint32_t codeLength = samplesPerChip * GALILEO_E1_B_CODE_LENGTH_CHIPS; + const std::string galileo_signal = signal_id.data(); + auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / GALILEO_E1_B_CODE_LENGTH_CHIPS)); + const uint32_t delay = ((static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS) - chip_shift) % static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * samplesPerCode / GALILEO_E1_B_CODE_LENGTH_CHIPS; std::vector primary_code_E1_chips(static_cast(GALILEO_E1_B_CODE_LENGTH_CHIPS)); - galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn); // generate Galileo E1 code, 1 sample per chip + galileo_e1_code_gen_int(primary_code_E1_chips, signal_id, prn); // generate Galileo E1 code, 1 sample per chip - std::vector _signal_E1(_codeLength); + std::vector signal_E1(codeLength); - if (_cboc == true) + if (cboc == true) { - galileo_e1_gen_float(_signal_E1, primary_code_E1_chips, _Signal); // generate cboc 12 samples per chip + galileo_e1_gen_float(signal_E1, primary_code_E1_chips, signal_id); // generate cboc 12 samples per chip } else { - std::vector _signal_E1_int(static_cast(_codeLength)); - galileo_e1_sinboc_11_gen_int(_signal_E1_int, primary_code_E1_chips); // generate sinboc(1,1) 2 samples per chip + std::vector signal_E1_int(static_cast(codeLength)); + galileo_e1_sinboc_11_gen_int(signal_E1_int, primary_code_E1_chips); // generate sinboc(1,1) 2 samples per chip - for (uint32_t ii = 0; ii < _codeLength; ++ii) + for (uint32_t ii = 0; ii < codeLength; ++ii) { - _signal_E1[ii] = static_cast(_signal_E1_int[ii]); + signal_E1[ii] = static_cast(signal_E1_int[ii]); } } - if (_fs != _samplesPerChip * _codeFreqBasis) + if (sampling_freq != samplesPerChip * codeFreqBasis) { - std::vector _resampled_signal(_samplesPerCode); + std::vector resampled_signal(samplesPerCode); - resampler(_signal_E1, _resampled_signal, static_cast(_samplesPerChip * _codeFreqBasis), _fs); // resamples code to fs + resampler(signal_E1, resampled_signal, static_cast(samplesPerChip * codeFreqBasis), sampling_freq); // resamples code to fs - _signal_E1 = std::move(_resampled_signal); + signal_E1 = std::move(resampled_signal); } - if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2 && _secondary_flag) + if (galileo_signal.rfind("1C") != std::string::npos && galileo_signal.length() >= 2 && secondary_flag) { - std::vector _signal_E1C_secondary(static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH) * _samplesPerCode); + std::vector signal_E1C_secondary(static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH) * samplesPerCode); for (uint32_t i = 0; i < static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH); i++) { - for (uint32_t k = 0; k < _samplesPerCode; k++) + for (uint32_t k = 0; k < samplesPerCode; k++) { - _signal_E1C_secondary[i * _samplesPerCode + k] = _signal_E1[k] * (GALILEO_E1_C_SECONDARY_CODE[i] == '0' ? 1.0F : -1.0F); + signal_E1C_secondary[i * samplesPerCode + k] = signal_E1[k] * (GALILEO_E1_C_SECONDARY_CODE[i] == '0' ? 1.0F : -1.0F); } } - _samplesPerCode *= static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH); + samplesPerCode *= static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH); - _signal_E1 = std::move(_signal_E1C_secondary); + signal_E1 = std::move(signal_E1C_secondary); } - for (uint32_t i = 0; i < _samplesPerCode; i++) + for (uint32_t i = 0; i < samplesPerCode; i++) { - _dest[(i + delay) % _samplesPerCode] = _signal_E1[i]; + dest[(i + delay) % samplesPerCode] = signal_E1[i]; } } -void galileo_e1_code_gen_complex_sampled(own::span> _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, - bool _secondary_flag) +void galileo_e1_code_gen_complex_sampled(own::span> dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift, + bool secondary_flag) { - constexpr int32_t _codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_CPS; // Hz - const std::string _galileo_signal = _Signal.data(); - auto _samplesPerCode = static_cast(static_cast(_fs) / - (static_cast(_codeFreqBasis) / GALILEO_E1_B_CODE_LENGTH_CHIPS)); + constexpr int32_t codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_CPS; // Hz + const std::string galileo_signal = signal_id.data(); + auto samplesPerCode = static_cast(static_cast(sampling_freq) / + (static_cast(codeFreqBasis) / GALILEO_E1_B_CODE_LENGTH_CHIPS)); - if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2 && _secondary_flag) + if (galileo_signal.rfind("1C") != std::string::npos && galileo_signal.length() >= 2 && secondary_flag) { - _samplesPerCode *= static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH); + samplesPerCode *= static_cast(GALILEO_E1_C_SECONDARY_CODE_LENGTH); } - std::vector real_code(_samplesPerCode); - galileo_e1_code_gen_float_sampled(real_code, _Signal, _cboc, _prn, _fs, _chip_shift, _secondary_flag); + std::vector real_code(samplesPerCode); + galileo_e1_code_gen_float_sampled(real_code, signal_id, cboc, prn, sampling_freq, chip_shift, secondary_flag); - for (uint32_t ii = 0; ii < _samplesPerCode; ++ii) + for (uint32_t ii = 0; ii < samplesPerCode; ++ii) { - _dest[ii] = std::complex(real_code[ii], 0.0F); + dest[ii] = std::complex(real_code[ii], 0.0F); } } -void galileo_e1_code_gen_float_sampled(own::span _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift) +void galileo_e1_code_gen_float_sampled(own::span dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift) { - galileo_e1_code_gen_float_sampled(_dest, _Signal, _cboc, _prn, _fs, _chip_shift, false); + galileo_e1_code_gen_float_sampled(dest, signal_id, cboc, prn, sampling_freq, chip_shift, false); } -void galileo_e1_code_gen_complex_sampled(own::span> _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift) +void galileo_e1_code_gen_complex_sampled(own::span> dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift) { - galileo_e1_code_gen_complex_sampled(_dest, _Signal, _cboc, _prn, _fs, _chip_shift, false); + galileo_e1_code_gen_complex_sampled(dest, signal_id, cboc, prn, sampling_freq, chip_shift, false); } diff --git a/src/algorithms/libs/galileo_e1_signal_replica.h b/src/algorithms/libs/galileo_e1_signal_replica.h index 3769bba6a..29c64e54c 100644 --- a/src/algorithms/libs/galileo_e1_signal_replica.h +++ b/src/algorithms/libs/galileo_e1_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -43,39 +40,39 @@ namespace own = gsl; * \brief This function generates Galileo E1 code (can select E1B or E1C sinboc). * */ -void galileo_e1_code_gen_sinboc11_float(own::span _dest, const std::array& _Signal, uint32_t _prn); +void galileo_e1_code_gen_sinboc11_float(own::span dest, const std::array& signal_id, uint32_t prn); /*! * \brief This function generates Galileo E1 code (can select E1B or E1C, cboc or sinboc - * and the sample frequency _fs). + * and the sample frequency sampling_freq). * */ -void galileo_e1_code_gen_float_sampled(own::span _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, - bool _secondary_flag); +void galileo_e1_code_gen_float_sampled(own::span dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift, + bool secondary_flag); /*! * \brief This function generates Galileo E1 code (can select E1B or E1C, cboc or sinboc - * and the sample frequency _fs). + * and the sample frequency sampling_freq). * */ -void galileo_e1_code_gen_float_sampled(own::span _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift); +void galileo_e1_code_gen_float_sampled(own::span dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift); /*! * \brief This function generates Galileo E1 code (can select E1B or E1C, cboc or sinboc - * and the sample frequency _fs). + * and the sample frequency sampling_freq). * */ -void galileo_e1_code_gen_complex_sampled(own::span> _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, - bool _secondary_flag); +void galileo_e1_code_gen_complex_sampled(own::span> dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift, + bool secondary_flag); /*! - * \brief galileo_e1_code_gen_complex_sampled without _secondary_flag for backward compatibility. + * \brief galileo_e1_code_gen_complex_sampled without secondary_flag for backward compatibility. */ -void galileo_e1_code_gen_complex_sampled(own::span> _dest, const std::array& _Signal, - bool _cboc, uint32_t _prn, int32_t _fs, uint32_t _chip_shift); +void galileo_e1_code_gen_complex_sampled(own::span> dest, const std::array& signal_id, + bool cboc, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/galileo_e5_signal_replica.cc b/src/algorithms/libs/galileo_e5_signal_replica.cc index 45c622fe9..ccbadb295 100644 --- a/src/algorithms/libs/galileo_e5_signal_replica.cc +++ b/src/algorithms/libs/galileo_e5_signal_replica.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -31,189 +28,189 @@ #include -void galileo_e5_a_code_gen_complex_primary(own::span> _dest, - int32_t _prn, - const std::array& _Signal) +void galileo_e5_a_code_gen_complex_primary(own::span> dest, + int32_t prn, + const std::array& signal_id) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } - if (_Signal[0] == '5' && _Signal[1] == 'Q') + if (signal_id[0] == '5' && signal_id[1] == 'Q') { for (size_t i = 0; i < GALILEO_E5A_Q_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } // last 2 bits are filled up zeros - hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn][GALILEO_E5A_Q_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn_][GALILEO_E5A_Q_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); } - else if (_Signal[0] == '5' && _Signal[1] == 'I') + else if (signal_id[0] == '5' && signal_id[1] == 'I') { for (size_t i = 0; i < GALILEO_E5A_I_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } // last 2 bits are filled up zeros - hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn][GALILEO_E5A_I_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn_][GALILEO_E5A_I_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); } - else if (_Signal[0] == '5' && _Signal[1] == 'X') + else if (signal_id[0] == '5' && signal_id[1] == 'X') { std::array b{}; for (size_t i = 0; i < GALILEO_E5A_I_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn][i]); - hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); - _dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); - _dest[index + 2] = std::complex(static_cast(a[2]), static_cast(b[2])); - _dest[index + 3] = std::complex(static_cast(a[3]), static_cast(b[3])); + hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn_][i]); + hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); + dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); + dest[index + 2] = std::complex(static_cast(a[2]), static_cast(b[2])); + dest[index + 3] = std::complex(static_cast(a[3]), static_cast(b[3])); index = index + 4; } // last 2 bits are filled up zeros - hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn][GALILEO_E5A_I_PRIMARY_CODE_STR_LENGTH - 1]); - hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn][GALILEO_E5A_Q_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); - _dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); + hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn_][GALILEO_E5A_I_PRIMARY_CODE_STR_LENGTH - 1]); + hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn_][GALILEO_E5A_Q_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); + dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); } } -void galileo_e5_a_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - const std::array& _Signal, - int32_t _fs, - uint32_t _chip_shift) +void galileo_e5_a_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + const std::array& signal_id, + int32_t sampling_freq, + uint32_t chip_shift) { - constexpr uint32_t _codeLength = GALILEO_E5A_CODE_LENGTH_CHIPS; - constexpr int32_t _codeFreqBasis = GALILEO_E5A_CODE_CHIP_RATE_CPS; + constexpr uint32_t codeLength = GALILEO_E5A_CODE_LENGTH_CHIPS; + constexpr int32_t codeFreqBasis = GALILEO_E5A_CODE_CHIP_RATE_CPS; - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const uint32_t delay = ((_codeLength - _chip_shift) % _codeLength) * _samplesPerCode / _codeLength; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const uint32_t delay = ((codeLength - chip_shift) % codeLength) * samplesPerCode / codeLength; - std::vector> _code(_codeLength); - galileo_e5_a_code_gen_complex_primary(_code, _prn, _Signal); + std::vector> code_aux(codeLength); + galileo_e5_a_code_gen_complex_primary(code_aux, prn, signal_id); - if (_fs != _codeFreqBasis) + if (sampling_freq != codeFreqBasis) { - std::vector> _resampled_signal(_samplesPerCode); - resampler(_code, _resampled_signal, _codeFreqBasis, _fs); // resamples code to fs - _code = std::move(_resampled_signal); + std::vector> resampled_signal_aux(samplesPerCode); + resampler(code_aux, resampled_signal_aux, codeFreqBasis, sampling_freq); // resamples code to sampling_freq + code_aux = std::move(resampled_signal_aux); } - for (uint32_t i = 0; i < _samplesPerCode; i++) + for (uint32_t i = 0; i < samplesPerCode; i++) { - _dest[(i + delay) % _samplesPerCode] = _code[i]; + dest[(i + delay) % samplesPerCode] = code_aux[i]; } } -void galileo_e5_b_code_gen_complex_primary(own::span> _dest, - int32_t _prn, - const std::array& _Signal) +void galileo_e5_b_code_gen_complex_primary(own::span> dest, + int32_t prn, + const std::array& signal_id) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } - if (_Signal[0] == '7' && _Signal[1] == 'Q') + if (signal_id[0] == '7' && signal_id[1] == 'Q') { for (size_t i = 0; i < GALILEO_E5B_Q_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E5B_Q_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E5B_Q_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } // last 2 bits are filled up zeros - hex_to_binary_converter(a, GALILEO_E5B_Q_PRIMARY_CODE[prn][GALILEO_E5B_Q_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + hex_to_binary_converter(a, GALILEO_E5B_Q_PRIMARY_CODE[prn_][GALILEO_E5B_Q_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); } - else if (_Signal[0] == '7' && _Signal[1] == 'I') + else if (signal_id[0] == '7' && signal_id[1] == 'I') { for (size_t i = 0; i < GALILEO_E5B_I_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } // last 2 bits are filled up zeros - hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn][GALILEO_E5B_I_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn_][GALILEO_E5B_I_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); } - else if (_Signal[0] == '7' && _Signal[1] == 'X') + else if (signal_id[0] == '7' && signal_id[1] == 'X') { std::array b{}; for (size_t i = 0; i < GALILEO_E5B_I_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn][i]); - hex_to_binary_converter(b, GALILEO_E5B_Q_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); - _dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); - _dest[index + 2] = std::complex(static_cast(a[2]), static_cast(b[2])); - _dest[index + 3] = std::complex(static_cast(a[3]), static_cast(b[3])); + hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn_][i]); + hex_to_binary_converter(b, GALILEO_E5B_Q_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); + dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); + dest[index + 2] = std::complex(static_cast(a[2]), static_cast(b[2])); + dest[index + 3] = std::complex(static_cast(a[3]), static_cast(b[3])); index = index + 4; } // last 2 bits are filled up zeros - hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn][GALILEO_E5B_I_PRIMARY_CODE_STR_LENGTH - 1]); - hex_to_binary_converter(b, GALILEO_E5B_Q_PRIMARY_CODE[prn][GALILEO_E5B_Q_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); - _dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); + hex_to_binary_converter(a, GALILEO_E5B_I_PRIMARY_CODE[prn_][GALILEO_E5B_I_PRIMARY_CODE_STR_LENGTH - 1]); + hex_to_binary_converter(b, GALILEO_E5B_Q_PRIMARY_CODE[prn_][GALILEO_E5B_Q_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), static_cast(b[0])); + dest[index + 1] = std::complex(static_cast(a[1]), static_cast(b[1])); } } -void galileo_e5_b_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - const std::array& _Signal, - int32_t _fs, - uint32_t _chip_shift) +void galileo_e5_b_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + const std::array& signal_id, + int32_t sampling_freq, + uint32_t chip_shift) { - constexpr uint32_t _codeLength = GALILEO_E5B_CODE_LENGTH_CHIPS; - constexpr int32_t _codeFreqBasis = GALILEO_E5B_CODE_CHIP_RATE_CPS; + constexpr uint32_t codeLength = GALILEO_E5B_CODE_LENGTH_CHIPS; + constexpr int32_t codeFreqBasis = GALILEO_E5B_CODE_CHIP_RATE_CPS; - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const uint32_t delay = ((_codeLength - _chip_shift) % _codeLength) * _samplesPerCode / _codeLength; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const uint32_t delay = ((codeLength - chip_shift) % codeLength) * samplesPerCode / codeLength; - std::vector> _code(_codeLength); - galileo_e5_b_code_gen_complex_primary(_code, _prn, _Signal); + std::vector> code_aux(codeLength); + galileo_e5_b_code_gen_complex_primary(code_aux, prn, signal_id); - if (_fs != _codeFreqBasis) + if (sampling_freq != codeFreqBasis) { - std::vector> _resampled_signal(_samplesPerCode); - resampler(_code, _resampled_signal, _codeFreqBasis, _fs); // resamples code to fs - _code = std::move(_resampled_signal); + std::vector> resampled_signal_aux(samplesPerCode); + resampler(code_aux, resampled_signal_aux, codeFreqBasis, sampling_freq); // resamples code to sampling_freq + code_aux = std::move(resampled_signal_aux); } - for (uint32_t i = 0; i < _samplesPerCode; i++) + for (uint32_t i = 0; i < samplesPerCode; i++) { - _dest[(i + delay) % _samplesPerCode] = _code[i]; + dest[(i + delay) % samplesPerCode] = code_aux[i]; } } diff --git a/src/algorithms/libs/galileo_e5_signal_replica.h b/src/algorithms/libs/galileo_e5_signal_replica.h index 5594e5524..8c7c0f7df 100644 --- a/src/algorithms/libs/galileo_e5_signal_replica.h +++ b/src/algorithms/libs/galileo_e5_signal_replica.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -44,39 +41,39 @@ namespace own = gsl; /*! * \brief Generates Galileo E5a code at 1 sample/chip */ -void galileo_e5_a_code_gen_complex_primary(own::span> _dest, - int32_t _prn, - const std::array& _Signal); +void galileo_e5_a_code_gen_complex_primary(own::span> dest, + int32_t prn, + const std::array& signal_id); /*! * \brief Generates Galileo E5a complex code, shifted to the desired chip and - * sampled at a frequency fs + * sampled at a frequency sampling_freq */ -void galileo_e5_a_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - const std::array& _Signal, - int32_t _fs, - uint32_t _chip_shift); +void galileo_e5_a_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + const std::array& signal_id, + int32_t sampling_freq, + uint32_t chip_shift); /*! * \brief Generates Galileo E5b code at 1 sample/chip */ -void galileo_e5_b_code_gen_complex_primary(own::span> _dest, - int32_t _prn, - const std::array& _Signal); +void galileo_e5_b_code_gen_complex_primary(own::span> dest, + int32_t prn, + const std::array& signal_id); /*! * \brief Generates Galileo E5b complex code, shifted to the desired chip and - * sampled at a frequency fs + * sampled at a frequency sampling_freq */ -void galileo_e5_b_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - const std::array& _Signal, - int32_t _fs, - uint32_t _chip_shift); +void galileo_e5_b_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + const std::array& signal_id, + int32_t sampling_freq, + uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/galileo_e6_signal_replica.cc b/src/algorithms/libs/galileo_e6_signal_replica.cc index a8b8423a6..d0e93fda7 100644 --- a/src/algorithms/libs/galileo_e6_signal_replica.cc +++ b/src/algorithms/libs/galileo_e6_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -26,222 +23,222 @@ #include #include -void galileo_e6_b_code_gen_complex_primary(own::span> _dest, - int32_t _prn) +void galileo_e6_b_code_gen_complex_primary(own::span> dest, + int32_t prn) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } for (size_t i = 0; i < GALILEO_E6_B_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } // last bit is filled up with a zero - hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn][GALILEO_E6_B_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn_][GALILEO_E6_B_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); } -void galileo_e6_b_code_gen_float_primary(own::span _dest, int32_t _prn) +void galileo_e6_b_code_gen_float_primary(own::span dest, int32_t prn) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } for (size_t i = 0; i < GALILEO_E6_B_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn][i]); - _dest[index] = static_cast(a[0]); - _dest[index + 1] = static_cast(a[1]); - _dest[index + 2] = static_cast(a[2]); - _dest[index + 3] = static_cast(a[3]); + hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn_][i]); + dest[index] = static_cast(a[0]); + dest[index + 1] = static_cast(a[1]); + dest[index + 2] = static_cast(a[2]); + dest[index + 3] = static_cast(a[3]); index = index + 4; } // last bit is filled up with a zero - hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn][GALILEO_E6_B_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = static_cast(a[0]); - _dest[index + 1] = static_cast(a[1]); - _dest[index + 2] = static_cast(a[2]); + hex_to_binary_converter(a, GALILEO_E6_B_PRIMARY_CODE[prn_][GALILEO_E6_B_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = static_cast(a[0]); + dest[index + 1] = static_cast(a[1]); + dest[index + 2] = static_cast(a[2]); } -void galileo_e6_b_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - int32_t _fs, - uint32_t _chip_shift) +void galileo_e6_b_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + int32_t sampling_freq, + uint32_t chip_shift) { - constexpr uint32_t _codeLength = GALILEO_E6_B_CODE_LENGTH_CHIPS; - constexpr int32_t _codeFreqBasis = GALILEO_E6_B_CODE_CHIP_RATE_CPS; + constexpr uint32_t codeLength = GALILEO_E6_B_CODE_LENGTH_CHIPS; + constexpr int32_t codeFreqBasis = GALILEO_E6_B_CODE_CHIP_RATE_CPS; - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const uint32_t delay = ((_codeLength - _chip_shift) % _codeLength) * _samplesPerCode / _codeLength; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const uint32_t delay = ((codeLength - chip_shift) % codeLength) * samplesPerCode / codeLength; - std::vector> _code(_codeLength); - galileo_e6_b_code_gen_complex_primary(_code, _prn); + std::vector> code_aux(codeLength); + galileo_e6_b_code_gen_complex_primary(code_aux, prn); - if (_fs != _codeFreqBasis) + if (sampling_freq != codeFreqBasis) { - std::vector> _resampled_signal(_samplesPerCode); - resampler(_code, _resampled_signal, _codeFreqBasis, _fs); // resamples code to fs - _code = std::move(_resampled_signal); + std::vector> resampled_signal_aux(samplesPerCode); + resampler(code_aux, resampled_signal_aux, codeFreqBasis, sampling_freq); // resamples code to sampling_freq + code_aux = std::move(resampled_signal_aux); } - for (uint32_t i = 0; i < _samplesPerCode; i++) + for (uint32_t i = 0; i < samplesPerCode; i++) { - _dest[(i + delay) % _samplesPerCode] = _code[i]; + dest[(i + delay) % samplesPerCode] = code_aux[i]; } } -void galileo_e6_c_code_gen_complex_primary(own::span> _dest, - int32_t _prn) +void galileo_e6_c_code_gen_complex_primary(own::span> dest, + int32_t prn) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } for (size_t i = 0; i < GALILEO_E6_C_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } // last bit is filled up with a zero - hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn][GALILEO_E6_C_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn_][GALILEO_E6_C_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); } -void galileo_e6_c_code_gen_float_primary(own::span _dest, int32_t _prn) +void galileo_e6_c_code_gen_float_primary(own::span dest, int32_t prn) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } for (size_t i = 0; i < GALILEO_E6_C_PRIMARY_CODE_STR_LENGTH - 1; i++) { - hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn][i]); - _dest[index] = static_cast(a[0]); - _dest[index + 1] = static_cast(a[1]); - _dest[index + 2] = static_cast(a[2]); - _dest[index + 3] = static_cast(a[3]); + hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn_][i]); + dest[index] = static_cast(a[0]); + dest[index + 1] = static_cast(a[1]); + dest[index + 2] = static_cast(a[2]); + dest[index + 3] = static_cast(a[3]); index = index + 4; } // last bit is filled up with a zero - hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn][GALILEO_E6_C_PRIMARY_CODE_STR_LENGTH - 1]); - _dest[index] = static_cast(a[0]); - _dest[index + 1] = static_cast(a[1]); - _dest[index + 2] = static_cast(a[2]); + hex_to_binary_converter(a, GALILEO_E6_C_PRIMARY_CODE[prn_][GALILEO_E6_C_PRIMARY_CODE_STR_LENGTH - 1]); + dest[index] = static_cast(a[0]); + dest[index + 1] = static_cast(a[1]); + dest[index + 2] = static_cast(a[2]); } -void galileo_e6_c_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - int32_t _fs, - uint32_t _chip_shift) +void galileo_e6_c_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + int32_t sampling_freq, + uint32_t chip_shift) { - constexpr uint32_t _codeLength = GALILEO_E6_C_CODE_LENGTH_CHIPS; - constexpr int32_t _codeFreqBasis = GALILEO_E6_C_CODE_CHIP_RATE_CPS; + constexpr uint32_t codeLength = GALILEO_E6_C_CODE_LENGTH_CHIPS; + constexpr int32_t codeFreqBasis = GALILEO_E6_C_CODE_CHIP_RATE_CPS; - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const uint32_t delay = ((_codeLength - _chip_shift) % _codeLength) * _samplesPerCode / _codeLength; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const uint32_t delay = ((codeLength - chip_shift) % codeLength) * samplesPerCode / codeLength; - std::vector> _code(_codeLength); - galileo_e6_c_code_gen_complex_primary(_code, _prn); + std::vector> code_aux(codeLength); + galileo_e6_c_code_gen_complex_primary(code_aux, prn); - if (_fs != _codeFreqBasis) + if (sampling_freq != codeFreqBasis) { - std::vector> _resampled_signal(_samplesPerCode); - resampler(_code, _resampled_signal, _codeFreqBasis, _fs); // resamples code to fs - _code = std::move(_resampled_signal); + std::vector> resampled_signal_aux(samplesPerCode); + resampler(code_aux, resampled_signal_aux, codeFreqBasis, sampling_freq); // resamples code to sampling_freq + code_aux = std::move(resampled_signal_aux); } - for (uint32_t i = 0; i < _samplesPerCode; i++) + for (uint32_t i = 0; i < samplesPerCode; i++) { - _dest[(i + delay) % _samplesPerCode] = _code[i]; + dest[(i + delay) % samplesPerCode] = code_aux[i]; } } -void galileo_e6_c_secondary_code_gen_complex(own::span> _dest, - int32_t _prn) +void galileo_e6_c_secondary_code_gen_complex(own::span> dest, + int32_t prn) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } for (size_t i = 0; i < GALILEO_E6_C_SECONDARY_CODE_STR_LENGTH; i++) { - hex_to_binary_converter(a, GALILEO_E6_C_SECONDARY_CODE[prn][i]); - _dest[index] = std::complex(static_cast(a[0]), 0.0); - _dest[index + 1] = std::complex(static_cast(a[1]), 0.0); - _dest[index + 2] = std::complex(static_cast(a[2]), 0.0); - _dest[index + 3] = std::complex(static_cast(a[3]), 0.0); + hex_to_binary_converter(a, GALILEO_E6_C_SECONDARY_CODE[prn_][i]); + dest[index] = std::complex(static_cast(a[0]), 0.0); + dest[index + 1] = std::complex(static_cast(a[1]), 0.0); + dest[index + 2] = std::complex(static_cast(a[2]), 0.0); + dest[index + 3] = std::complex(static_cast(a[3]), 0.0); index = index + 4; } } -void galileo_e6_c_secondary_code_gen_float(own::span _dest, - int32_t _prn) +void galileo_e6_c_secondary_code_gen_float(own::span dest, + int32_t prn) { - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; std::array a{}; - if ((_prn < 1) || (_prn > 50)) + if ((prn < 1) || (prn > 50)) { return; } for (size_t i = 0; i < GALILEO_E6_C_SECONDARY_CODE_STR_LENGTH; i++) { - hex_to_binary_converter(a, GALILEO_E6_C_SECONDARY_CODE[prn][i]); - _dest[index] = static_cast(a[0]); - _dest[index + 1] = static_cast(a[1]); - _dest[index + 2] = static_cast(a[2]); - _dest[index + 3] = static_cast(a[3]); + hex_to_binary_converter(a, GALILEO_E6_C_SECONDARY_CODE[prn_][i]); + dest[index] = static_cast(a[0]); + dest[index + 1] = static_cast(a[1]); + dest[index + 2] = static_cast(a[2]); + dest[index + 3] = static_cast(a[3]); index = index + 4; } } -std::string galileo_e6_c_secondary_code(int32_t _prn) +std::string galileo_e6_c_secondary_code(int32_t prn) { std::string dest(static_cast(GALILEO_E6_C_SECONDARY_CODE_LENGTH_CHIPS), '0'); - const uint32_t prn = _prn - 1; + const uint32_t prn_ = prn - 1; uint32_t index = 0; for (size_t i = 0; i < GALILEO_E6_C_SECONDARY_CODE_STR_LENGTH; i++) { - std::string aux = hex_to_binary_string(GALILEO_E6_C_SECONDARY_CODE[prn][i]); + std::string aux = hex_to_binary_string(GALILEO_E6_C_SECONDARY_CODE[prn_][i]); dest[index] = aux[0]; dest[index + 1] = aux[1]; dest[index + 2] = aux[2]; diff --git a/src/algorithms/libs/galileo_e6_signal_replica.h b/src/algorithms/libs/galileo_e6_signal_replica.h index f40275c70..dd927e932 100644 --- a/src/algorithms/libs/galileo_e6_signal_replica.h +++ b/src/algorithms/libs/galileo_e6_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -43,67 +40,67 @@ namespace own = gsl; /*! * \brief Generates Galileo E6B code at 1 sample/chip */ -void galileo_e6_b_code_gen_complex_primary(own::span> _dest, - int32_t _prn); +void galileo_e6_b_code_gen_complex_primary(own::span> dest, + int32_t prn); /*! * \brief Generates Galileo E6B code at 1 sample/chip */ -void galileo_e6_b_code_gen_float_primary(own::span _dest, int32_t _prn); +void galileo_e6_b_code_gen_float_primary(own::span dest, int32_t prn); /*! * \brief Generates Galileo E6B complex code, shifted to the desired chip and - * sampled at a frequency fs + * sampled at a frequency sampling_freq */ -void galileo_e6_b_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - int32_t _fs, - uint32_t _chip_shift); +void galileo_e6_b_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + int32_t sampling_freq, + uint32_t chip_shift); /*! * \brief Generates Galileo E6C codes at 1 sample/chip */ -void galileo_e6_c_code_gen_complex_primary(own::span> _dest, - int32_t _prn); +void galileo_e6_c_code_gen_complex_primary(own::span> dest, + int32_t prn); /*! * \brief Generates Galileo E6C codes at 1 sample/chip */ -void galileo_e6_c_code_gen_float_primary(own::span _dest, int32_t _prn); +void galileo_e6_c_code_gen_float_primary(own::span dest, int32_t prn); /*! * \brief Generates Galileo E6C complex codes, shifted to the desired chip and - * sampled at a frequency fs + * sampled at a frequency sampling_freq */ -void galileo_e6_c_code_gen_complex_sampled(own::span> _dest, - uint32_t _prn, - int32_t _fs, - uint32_t _chip_shift); +void galileo_e6_c_code_gen_complex_sampled(own::span> dest, + uint32_t prn, + int32_t sampling_freq, + uint32_t chip_shift); /*! * \brief Generates Galileo E6C secondary codes at 1 sample/chip */ -void galileo_e6_c_secondary_code_gen_complex(own::span> _dest, - int32_t _prn); +void galileo_e6_c_secondary_code_gen_complex(own::span> dest, + int32_t prn); /*! * \brief Generates Galileo E6C secondary codes at 1 sample/chip */ -void galileo_e6_c_secondary_code_gen_float(own::span _dest, - int32_t _prn); +void galileo_e6_c_secondary_code_gen_float(own::span dest, + int32_t prn); /*! * \brief Generates a string with Galileo E6C secondary codes at 1 sample/chip */ -std::string galileo_e6_c_secondary_code(int32_t _prn); +std::string galileo_e6_c_secondary_code(int32_t prn); /** \} */ diff --git a/src/algorithms/libs/geofunctions.cc b/src/algorithms/libs/geofunctions.cc index 30e1ddb37..2c566d746 100644 --- a/src/algorithms/libs/geofunctions.cc +++ b/src/algorithms/libs/geofunctions.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/geofunctions.h b/src/algorithms/libs/geofunctions.h index 0334cc845..c61df85da 100644 --- a/src/algorithms/libs/geofunctions.h +++ b/src/algorithms/libs/geofunctions.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/glonass_l1_signal_replica.cc b/src/algorithms/libs/glonass_l1_signal_replica.cc index 47feb5851..48efc82e6 100644 --- a/src/algorithms/libs/glonass_l1_signal_replica.cc +++ b/src/algorithms/libs/glonass_l1_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -25,10 +22,10 @@ const auto AUX_CEIL = [](float x) { return static_cast(static_cast((x) + 1)); }; -void glonass_l1_ca_code_gen_complex(own::span> _dest, uint32_t _chip_shift) +void glonass_l1_ca_code_gen_complex(own::span> dest, uint32_t chip_shift) { - const uint32_t _code_length = 511; - std::bitset<_code_length> G1{}; + const uint32_t code_length = 511; + std::bitset G1{}; auto G1_register = std::bitset<9>{}.set(); // All true bool feedback1; bool aux; @@ -37,7 +34,7 @@ void glonass_l1_ca_code_gen_complex(own::span> _dest, uint32 uint32_t lcv2; /* Generate G1 Register */ - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { G1[lcv] = G1_register[2]; @@ -52,38 +49,38 @@ void glonass_l1_ca_code_gen_complex(own::span> _dest, uint32 } /* Generate PRN from G1 Register */ - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { aux = G1[lcv]; if (aux == true) { - _dest[lcv] = std::complex(1, 0); + dest[lcv] = std::complex(1, 0); } else { - _dest[lcv] = std::complex(-1, 0); + dest[lcv] = std::complex(-1, 0); } } /* Set the delay */ - delay = _code_length; - delay += _chip_shift; - delay %= _code_length; + delay = code_length; + delay += chip_shift; + delay %= code_length; /* Generate PRN from G1 and G2 Registers */ - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { - aux = G1[(lcv + _chip_shift) % _code_length]; + aux = G1[(lcv + chip_shift) % code_length]; if (aux == true) { - _dest[lcv] = std::complex(1, 0); + dest[lcv] = std::complex(1, 0); } else { - _dest[lcv] = std::complex(-1, 0); + dest[lcv] = std::complex(-1, 0); } delay++; - delay %= _code_length; + delay %= code_length; } } @@ -91,44 +88,44 @@ void glonass_l1_ca_code_gen_complex(own::span> _dest, uint32 /* * Generates complex GLONASS L1 C/A code for the desired SV ID and sampled to specific sampling frequency */ -void glonass_l1_ca_code_gen_complex_sampled(own::span> _dest, int32_t _fs, uint32_t _chip_shift) +void glonass_l1_ca_code_gen_complex_sampled(own::span> dest, int32_t sampling_freq, uint32_t chip_shift) { - constexpr int32_t _codeFreqBasis = 511000; // Hz - constexpr int32_t _codeLength = 511; - constexpr float _tc = 1.0 / static_cast(_codeFreqBasis); // C/A chip period in sec + constexpr int32_t codeFreqBasis = 511000; // chips per second + constexpr int32_t codeLength = 511; + constexpr float tc = 1.0 / static_cast(codeFreqBasis); // C/A chip period in sec - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); - std::array, 511> _code{}; - int32_t _codeValueIndex; + std::array, 511> code_aux{}; + int32_t codeValueIndex; float aux; - glonass_l1_ca_code_gen_complex(_code, _chip_shift); // generate C/A code 1 sample per chip + glonass_l1_ca_code_gen_complex(code_aux, chip_shift); // generate C/A code 1 sample per chip - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== // --- Make index array to read C/A code values -------------------- // The length of the index array depends on the sampling frequency - - // number of samples per millisecond (because one C/A code period is one - // millisecond). + // number of samples per millisecond (because one C/A code period is + // one millisecond). - aux = (_ts * (static_cast(i) + 1)) / _tc; - _codeValueIndex = AUX_CEIL(aux) - 1; + aux = (ts * (static_cast(i) + 1)) / tc; + codeValueIndex = AUX_CEIL(aux) - 1; // --- Make the digitized version of the C/A code ------------------ // The "upsampled" code is made by selecting values form the CA code // chip array (caCode) for the time instances of each sample. - if (i == _samplesPerCode - 1) + if (i == samplesPerCode - 1) { - // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = _code[_codeLength - 1]; + // Correct the last index (due to number rounding issues) + dest[i] = code_aux[codeLength - 1]; } else { - _dest[i] = _code[_codeValueIndex]; // repeat the chip -> upsample + dest[i] = code_aux[codeValueIndex]; // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/glonass_l1_signal_replica.h b/src/algorithms/libs/glonass_l1_signal_replica.h index a4afbc36b..1965b2f0d 100644 --- a/src/algorithms/libs/glonass_l1_signal_replica.h +++ b/src/algorithms/libs/glonass_l1_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -38,14 +35,11 @@ namespace own = gsl; * \{ */ -//! Generates complex GLONASS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency -void glonass_l1_ca_code_gen_complex(own::span> _dest, uint32_t _chip_shift); - -//! Generates N complex GLONASS L1 C/A codes for the desired SV ID and code shift -void glonass_l1_ca_code_gen_complex_sampled(own::span> _dest, int32_t _fs, uint32_t _chip_shift, uint32_t _ncodes); - //! Generates complex GLONASS L1 C/A code for the desired SV ID and code shift -void glonass_l1_ca_code_gen_complex_sampled(own::span> _dest, int32_t _fs, uint32_t _chip_shift); +void glonass_l1_ca_code_gen_complex(own::span> dest, uint32_t chip_shift); + +//! Generates complex GLONASS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency +void glonass_l1_ca_code_gen_complex_sampled(own::span> dest, int32_t sampling_freq, uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/glonass_l2_signal_replica.cc b/src/algorithms/libs/glonass_l2_signal_replica.cc index f526295c8..879adc414 100644 --- a/src/algorithms/libs/glonass_l2_signal_replica.cc +++ b/src/algorithms/libs/glonass_l2_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -25,10 +22,10 @@ const auto AUX_CEIL = [](float x) { return static_cast(static_cast((x) + 1)); }; -void glonass_l2_ca_code_gen_complex(own::span> _dest, uint32_t _chip_shift) +void glonass_l2_ca_code_gen_complex(own::span> dest, uint32_t chip_shift) { - const uint32_t _code_length = 511; - std::bitset<_code_length> G1{}; + const uint32_t code_length = 511; + std::bitset G1{}; auto G1_register = std::bitset<9>{}.set(); // All true bool feedback1; bool aux; @@ -37,7 +34,7 @@ void glonass_l2_ca_code_gen_complex(own::span> _dest, uint32 uint32_t lcv2; /* Generate G1 Register */ - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { G1[lcv] = G1_register[2]; @@ -52,38 +49,38 @@ void glonass_l2_ca_code_gen_complex(own::span> _dest, uint32 } /* Generate PRN from G1 Register */ - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { aux = G1[lcv]; if (aux == true) { - _dest[lcv] = std::complex(1, 0); + dest[lcv] = std::complex(1, 0); } else { - _dest[lcv] = std::complex(-1, 0); + dest[lcv] = std::complex(-1, 0); } } /* Set the delay */ - delay = _code_length; - delay += _chip_shift; - delay %= _code_length; + delay = code_length; + delay += chip_shift; + delay %= code_length; /* Generate PRN from G1 and G2 Registers */ - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { - aux = G1[(lcv + _chip_shift) % _code_length]; + aux = G1[(lcv + chip_shift) % code_length]; if (aux == true) { - _dest[lcv] = std::complex(1, 0); + dest[lcv] = std::complex(1, 0); } else { - _dest[lcv] = std::complex(-1, 0); + dest[lcv] = std::complex(-1, 0); } delay++; - delay %= _code_length; + delay %= code_length; } } @@ -91,44 +88,44 @@ void glonass_l2_ca_code_gen_complex(own::span> _dest, uint32 /* * Generates complex GLONASS L2 C/A code for the desired SV ID and sampled to specific sampling frequency */ -void glonass_l2_ca_code_gen_complex_sampled(own::span> _dest, int32_t _fs, uint32_t _chip_shift) +void glonass_l2_ca_code_gen_complex_sampled(own::span> dest, int32_t sampling_freq, uint32_t chip_shift) { - constexpr int32_t _codeFreqBasis = 511000; // Hz - constexpr int32_t _codeLength = 511; - constexpr float _tc = 1.0 / static_cast(_codeFreqBasis); // C/A chip period in sec + constexpr int32_t codeFreqBasis = 511000; // chips per second + constexpr int32_t codeLength = 511; + constexpr float tc = 1.0 / static_cast(codeFreqBasis); // C/A chip period in sec - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec - std::array, 511> _code{}; - int32_t _codeValueIndex; + std::array, 511> code_aux{}; + int32_t codeValueIndex; float aux; - glonass_l2_ca_code_gen_complex(_code, _chip_shift); // generate C/A code 1 sample per chip + glonass_l2_ca_code_gen_complex(code_aux, chip_shift); // generate C/A code 1 sample per chip - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== // --- Make index array to read C/A code values -------------------- // The length of the index array depends on the sampling frequency - - // number of samples per millisecond (because one C/A code period is one - // millisecond). + // number of samples per millisecond (because one C/A code period is + // one millisecond). - aux = (_ts * (static_cast(i) + 1)) / _tc; - _codeValueIndex = AUX_CEIL(aux) - 1; + aux = (ts * (static_cast(i) + 1)) / tc; + codeValueIndex = AUX_CEIL(aux) - 1; // --- Make the digitized version of the C/A code ------------------ // The "upsampled" code is made by selecting values form the CA code // chip array (caCode) for the time instances of each sample. - if (i == _samplesPerCode - 1) + if (i == samplesPerCode - 1) { - // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = _code[_codeLength - 1]; + // Correct the last index (due to number rounding issues) + dest[i] = code_aux[codeLength - 1]; } else { - _dest[i] = _code[_codeValueIndex]; // repeat the chip -> upsample + dest[i] = code_aux[codeValueIndex]; // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/glonass_l2_signal_replica.h b/src/algorithms/libs/glonass_l2_signal_replica.h index b87555ca1..3b09e5c46 100644 --- a/src/algorithms/libs/glonass_l2_signal_replica.h +++ b/src/algorithms/libs/glonass_l2_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -38,14 +35,11 @@ namespace own = gsl; * \{ */ -//! Generates complex GLONASS L2 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency -void glonass_l2_ca_code_gen_complex(own::span> _dest, uint32_t _chip_shift); - -//! Generates N complex GLONASS L2 C/A codes for the desired SV ID and code shift -void glonass_l2_ca_code_gen_complex_sampled(own::span> _dest, int32_t _fs, uint32_t _chip_shift, uint32_t _ncodes); - //! Generates complex GLONASS L2 C/A code for the desired SV ID and code shift -void glonass_l2_ca_code_gen_complex_sampled(own::span> _dest, int32_t _fs, uint32_t _chip_shift); +void glonass_l2_ca_code_gen_complex(own::span> dest, uint32_t chip_shift); + +//! Generates complex GLONASS L2 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency +void glonass_l2_ca_code_gen_complex_sampled(own::span> dest, int32_t sampling_freq, uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/gnss_circular_deque.h b/src/algorithms/libs/gnss_circular_deque.h index 052b23f60..cbdb49bda 100644 --- a/src/algorithms/libs/gnss_circular_deque.h +++ b/src/algorithms/libs/gnss_circular_deque.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/gnss_sdr_create_directory.cc b/src/algorithms/libs/gnss_sdr_create_directory.cc index bf14a5881..f986bcf83 100644 --- a/src/algorithms/libs/gnss_sdr_create_directory.cc +++ b/src/algorithms/libs/gnss_sdr_create_directory.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -46,7 +43,7 @@ namespace errorlib = boost::system; bool gnss_sdr_create_directory(const std::string& foldername) { std::string new_folder; - for (auto& folder : fs::path(foldername)) + for (const auto& folder : fs::path(foldername)) { new_folder += folder.string(); errorlib::error_code ec; diff --git a/src/algorithms/libs/gnss_sdr_create_directory.h b/src/algorithms/libs/gnss_sdr_create_directory.h index cc34be184..703508e50 100644 --- a/src/algorithms/libs/gnss_sdr_create_directory.h +++ b/src/algorithms/libs/gnss_sdr_create_directory.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc index b775ffcc9..3bd3e35ce 100644 --- a/src/algorithms/libs/gnss_sdr_flags.cc +++ b/src/algorithms/libs/gnss_sdr_flags.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/gnss_sdr_flags.h b/src/algorithms/libs/gnss_sdr_flags.h index 736e9f6ad..de3daec99 100644 --- a/src/algorithms/libs/gnss_sdr_flags.h +++ b/src/algorithms/libs/gnss_sdr_flags.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/gnss_sdr_make_unique.h b/src/algorithms/libs/gnss_sdr_make_unique.h index 785c2eb4f..ad340221e 100644 --- a/src/algorithms/libs/gnss_sdr_make_unique.h +++ b/src/algorithms/libs/gnss_sdr_make_unique.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/gnss_signal_replica.cc b/src/algorithms/libs/gnss_signal_replica.cc index 1edced77c..4a64d56e8 100644 --- a/src/algorithms/libs/gnss_signal_replica.cc +++ b/src/algorithms/libs/gnss_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -27,121 +24,121 @@ const auto AUX_CEIL2 = [](float x) { return static_cast(static_cast((x) + 1)); }; -void complex_exp_gen(own::span> _dest, double _f, double _fs) +void complex_exp_gen(own::span> dest, double freq, double sampling_freq) { gr::fxpt_nco d_nco; - d_nco.set_freq(static_cast((TWO_PI * _f) / _fs)); - d_nco.sincos(_dest.data(), _dest.size(), 1); + d_nco.set_freq(static_cast((TWO_PI * freq) / sampling_freq)); + d_nco.sincos(dest.data(), dest.size(), 1); } -void complex_exp_gen_conj(own::span> _dest, double _f, double _fs) +void complex_exp_gen_conj(own::span> dest, double freq, double sampling_freq) { gr::fxpt_nco d_nco; - d_nco.set_freq(-static_cast((TWO_PI * _f) / _fs)); - d_nco.sincos(_dest.data(), _dest.size(), 1); + d_nco.set_freq(-static_cast((TWO_PI * freq) / sampling_freq)); + d_nco.sincos(dest.data(), dest.size(), 1); } -void hex_to_binary_converter(own::span _dest, char _from) +void hex_to_binary_converter(own::span dest, char from) { - switch (_from) + switch (from) { case '0': - _dest[0] = 1; - _dest[1] = 1; - _dest[2] = 1; - _dest[3] = 1; + dest[0] = 1; + dest[1] = 1; + dest[2] = 1; + dest[3] = 1; break; case '1': - _dest[0] = 1; - _dest[1] = 1; - _dest[2] = 1; - _dest[3] = -1; + dest[0] = 1; + dest[1] = 1; + dest[2] = 1; + dest[3] = -1; break; case '2': - _dest[0] = 1; - _dest[1] = 1; - _dest[2] = -1; - _dest[3] = 1; + dest[0] = 1; + dest[1] = 1; + dest[2] = -1; + dest[3] = 1; break; case '3': - _dest[0] = 1; - _dest[1] = 1; - _dest[2] = -1; - _dest[3] = -1; + dest[0] = 1; + dest[1] = 1; + dest[2] = -1; + dest[3] = -1; break; case '4': - _dest[0] = 1; - _dest[1] = -1; - _dest[2] = 1; - _dest[3] = 1; + dest[0] = 1; + dest[1] = -1; + dest[2] = 1; + dest[3] = 1; break; case '5': - _dest[0] = 1; - _dest[1] = -1; - _dest[2] = 1; - _dest[3] = -1; + dest[0] = 1; + dest[1] = -1; + dest[2] = 1; + dest[3] = -1; break; case '6': - _dest[0] = 1; - _dest[1] = -1; - _dest[2] = -1; - _dest[3] = 1; + dest[0] = 1; + dest[1] = -1; + dest[2] = -1; + dest[3] = 1; break; case '7': - _dest[0] = 1; - _dest[1] = -1; - _dest[2] = -1; - _dest[3] = -1; + dest[0] = 1; + dest[1] = -1; + dest[2] = -1; + dest[3] = -1; break; case '8': - _dest[0] = -1; - _dest[1] = 1; - _dest[2] = 1; - _dest[3] = 1; + dest[0] = -1; + dest[1] = 1; + dest[2] = 1; + dest[3] = 1; break; case '9': - _dest[0] = -1; - _dest[1] = 1; - _dest[2] = 1; - _dest[3] = -1; + dest[0] = -1; + dest[1] = 1; + dest[2] = 1; + dest[3] = -1; break; case 'A': - _dest[0] = -1; - _dest[1] = 1; - _dest[2] = -1; - _dest[3] = 1; + dest[0] = -1; + dest[1] = 1; + dest[2] = -1; + dest[3] = 1; break; case 'B': - _dest[0] = -1; - _dest[1] = 1; - _dest[2] = -1; - _dest[3] = -1; + dest[0] = -1; + dest[1] = 1; + dest[2] = -1; + dest[3] = -1; break; case 'C': - _dest[0] = -1; - _dest[1] = -1; - _dest[2] = 1; - _dest[3] = 1; + dest[0] = -1; + dest[1] = -1; + dest[2] = 1; + dest[3] = 1; break; case 'D': - _dest[0] = -1; - _dest[1] = -1; - _dest[2] = 1; - _dest[3] = -1; + dest[0] = -1; + dest[1] = -1; + dest[2] = 1; + dest[3] = -1; break; case 'E': - _dest[0] = -1; - _dest[1] = -1; - _dest[2] = -1; - _dest[3] = 1; + dest[0] = -1; + dest[1] = -1; + dest[2] = -1; + dest[3] = 1; break; case 'F': - _dest[0] = -1; - _dest[1] = -1; - _dest[2] = -1; - _dest[3] = -1; + dest[0] = -1; + dest[1] = -1; + dest[2] = -1; + dest[3] = -1; break; default: break; @@ -149,143 +146,145 @@ void hex_to_binary_converter(own::span _dest, char _from) } -std::string hex_to_binary_string(char _from) +std::string hex_to_binary_string(char from) { - std::string _dest("0000"); - switch (_from) + std::string dest("0000"); + switch (from) { case '0': - _dest[0] = '0'; - _dest[1] = '0'; - _dest[2] = '0'; - _dest[3] = '0'; + dest[0] = '0'; + dest[1] = '0'; + dest[2] = '0'; + dest[3] = '0'; break; case '1': - _dest[0] = '0'; - _dest[1] = '0'; - _dest[2] = '0'; - _dest[3] = '1'; + dest[0] = '0'; + dest[1] = '0'; + dest[2] = '0'; + dest[3] = '1'; break; case '2': - _dest[0] = '0'; - _dest[1] = '0'; - _dest[2] = '1'; - _dest[3] = '0'; + dest[0] = '0'; + dest[1] = '0'; + dest[2] = '1'; + dest[3] = '0'; break; case '3': - _dest[0] = '0'; - _dest[1] = '0'; - _dest[2] = '1'; - _dest[3] = '1'; + dest[0] = '0'; + dest[1] = '0'; + dest[2] = '1'; + dest[3] = '1'; break; case '4': - _dest[0] = '0'; - _dest[1] = '1'; - _dest[2] = '0'; - _dest[3] = '0'; + dest[0] = '0'; + dest[1] = '1'; + dest[2] = '0'; + dest[3] = '0'; break; case '5': - _dest[0] = '0'; - _dest[1] = '1'; - _dest[2] = '0'; - _dest[3] = '1'; + dest[0] = '0'; + dest[1] = '1'; + dest[2] = '0'; + dest[3] = '1'; break; case '6': - _dest[0] = '0'; - _dest[1] = '1'; - _dest[2] = '1'; - _dest[3] = '0'; + dest[0] = '0'; + dest[1] = '1'; + dest[2] = '1'; + dest[3] = '0'; break; case '7': - _dest[0] = '0'; - _dest[1] = '1'; - _dest[2] = '1'; - _dest[3] = '1'; + dest[0] = '0'; + dest[1] = '1'; + dest[2] = '1'; + dest[3] = '1'; break; case '8': - _dest[0] = '1'; - _dest[1] = '0'; - _dest[2] = '0'; - _dest[3] = '0'; + dest[0] = '1'; + dest[1] = '0'; + dest[2] = '0'; + dest[3] = '0'; break; case '9': - _dest[0] = '1'; - _dest[1] = '0'; - _dest[2] = '0'; - _dest[3] = '1'; + dest[0] = '1'; + dest[1] = '0'; + dest[2] = '0'; + dest[3] = '1'; break; case 'A': - _dest[0] = '1'; - _dest[1] = '0'; - _dest[2] = '1'; - _dest[3] = '0'; + dest[0] = '1'; + dest[1] = '0'; + dest[2] = '1'; + dest[3] = '0'; break; case 'B': - _dest[0] = '1'; - _dest[1] = '0'; - _dest[2] = '1'; - _dest[3] = '1'; + dest[0] = '1'; + dest[1] = '0'; + dest[2] = '1'; + dest[3] = '1'; break; case 'C': - _dest[0] = '1'; - _dest[1] = '1'; - _dest[2] = '0'; - _dest[3] = '0'; + dest[0] = '1'; + dest[1] = '1'; + dest[2] = '0'; + dest[3] = '0'; break; case 'D': - _dest[0] = '1'; - _dest[1] = '1'; - _dest[2] = '0'; - _dest[3] = '1'; + dest[0] = '1'; + dest[1] = '1'; + dest[2] = '0'; + dest[3] = '1'; break; case 'E': - _dest[0] = '1'; - _dest[1] = '1'; - _dest[2] = '1'; - _dest[3] = '0'; + dest[0] = '1'; + dest[1] = '1'; + dest[2] = '1'; + dest[3] = '0'; break; case 'F': - _dest[0] = '1'; - _dest[1] = '1'; - _dest[2] = '1'; - _dest[3] = '1'; + dest[0] = '1'; + dest[1] = '1'; + dest[2] = '1'; + dest[3] = '1'; break; default: break; } - return _dest; + return dest; } -void resampler(const own::span _from, own::span _dest, float _fs_in, - float _fs_out) +void resampler(const own::span from, own::span dest, float fs_in, + float fs_out) { - uint32_t _codeValueIndex; + uint32_t codeValueIndex; float aux; - const float _t_out = 1.0F / _fs_out; // Output sampling period - for (size_t i = 0; i < _dest.size() - 1; i++) + const float t_out = 1.0F / fs_out; // Output sampling period + const size_t dest_size = dest.size(); + for (size_t i = 0; i < dest_size - 1; i++) { - aux = (_t_out * (static_cast(i) + 1.0F)) * _fs_in; - _codeValueIndex = AUX_CEIL2(aux) - 1; - _dest[i] = _from[_codeValueIndex]; + aux = (t_out * (static_cast(i) + 1.0F)) * fs_in; + codeValueIndex = AUX_CEIL2(aux) - 1; + dest[i] = from[codeValueIndex]; } // Correct the last index (due to number rounding issues) - _dest[_dest.size() - 1] = _from[_from.size() - 1]; + dest[dest_size - 1] = from[from.size() - 1]; } -void resampler(own::span> _from, own::span> _dest, float _fs_in, - float _fs_out) +void resampler(own::span> from, own::span> dest, float fs_in, + float fs_out) { - uint32_t _codeValueIndex; + uint32_t codeValueIndex; float aux; - const float _t_out = 1.0F / _fs_out; // Output sampling period - for (size_t i = 0; i < _dest.size() - 1; i++) + const float t_out = 1.0F / fs_out; // Output sampling period + const size_t dest_size = dest.size(); + for (size_t i = 0; i < dest_size - 1; i++) { - aux = (_t_out * (static_cast(i) + 1.0F)) * _fs_in; - _codeValueIndex = AUX_CEIL2(aux) - 1; - _dest[i] = _from[_codeValueIndex]; + aux = (t_out * (static_cast(i) + 1.0F)) * fs_in; + codeValueIndex = AUX_CEIL2(aux) - 1; + dest[i] = from[codeValueIndex]; } // Correct the last index (due to number rounding issues) - _dest[_dest.size() - 1] = _from[_from.size() - 1]; + dest[dest_size - 1] = from[from.size() - 1]; } diff --git a/src/algorithms/libs/gnss_signal_replica.h b/src/algorithms/libs/gnss_signal_replica.h index 70864187d..2c8254388 100644 --- a/src/algorithms/libs/gnss_signal_replica.h +++ b/src/algorithms/libs/gnss_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -40,44 +37,44 @@ namespace own = gsl; /*! - * \brief This function generates a complex exponential in _dest. + * \brief This function generates a complex exponential in dest. * */ -void complex_exp_gen(own::span> _dest, double _f, double _fs); +void complex_exp_gen(own::span> dest, double freq, double sampling_freq); /*! - * \brief This function generates a conjugate complex exponential in _dest. + * \brief This function generates a conjugate complex exponential in dest. * */ -void complex_exp_gen_conj(own::span> _dest, double _f, double _fs); +void complex_exp_gen_conj(own::span> dest, double freq, double sampling_freq); /*! * \brief This function makes a conversion from hex (the input is a char) * to binary (the output are 4 ints with +1 or -1 values). * */ -void hex_to_binary_converter(own::span _dest, char _from); +void hex_to_binary_converter(own::span dest, char from); /*! * \brief This function makes a conversion from hex (the input is a char) * to binary (the output is a string of 4 char with 0 or 1 values). * */ -std::string hex_to_binary_string(char _from); +std::string hex_to_binary_string(char from); /*! * \brief This function resamples a sequence of float values. * */ -void resampler(const own::span _from, own::span _dest, - float _fs_in, float _fs_out); +void resampler(const own::span from, own::span dest, + float fs_in, float fs_out); /*! * \brief This function resamples a sequence of complex values. * */ -void resampler(own::span> _from, own::span> _dest, - float _fs_in, float _fs_out); +void resampler(own::span> from, own::span> dest, + float fs_in, float fs_out); /** \} */ diff --git a/src/algorithms/libs/gps_l2c_signal_replica.cc b/src/algorithms/libs/gps_l2c_signal_replica.cc index 5bf5e8f6d..5be9e632e 100644 --- a/src/algorithms/libs/gps_l2c_signal_replica.cc +++ b/src/algorithms/libs/gps_l2c_signal_replica.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -31,43 +28,43 @@ uint32_t gps_l2c_m_shift(uint32_t x) } -void gps_l2c_m_code(own::span _dest, uint32_t _prn) +void gps_l2c_m_code(own::span dest, uint32_t prn) { - uint32_t x = GPS_L2C_M_INIT_REG[_prn - 1]; + uint32_t x = GPS_L2C_M_INIT_REG[prn - 1]; for (int32_t n = 0; n < GPS_L2_M_CODE_LENGTH_CHIPS; n++) { - _dest[n] = static_cast(x & 1U); + dest[n] = static_cast(x & 1U); x = gps_l2c_m_shift(x); } } -void gps_l2c_m_code_gen_complex(own::span> _dest, uint32_t _prn) +void gps_l2c_m_code_gen_complex(own::span> dest, uint32_t prn) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - gps_l2c_m_code(_code, _prn); + gps_l2c_m_code(code_aux, prn); } for (int32_t i = 0; i < GPS_L2_M_CODE_LENGTH_CHIPS; i++) { - _dest[i] = std::complex(0.0, 1.0F - 2.0F * _code[i]); + dest[i] = std::complex(0.0, 1.0F - 2.0F * code_aux[i]); } } -void gps_l2c_m_code_gen_float(own::span _dest, uint32_t _prn) +void gps_l2c_m_code_gen_float(own::span dest, uint32_t prn) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - gps_l2c_m_code(_code, _prn); + gps_l2c_m_code(code_aux, prn); } for (int32_t i = 0; i < GPS_L2_M_CODE_LENGTH_CHIPS; i++) { - _dest[i] = 1.0 - 2.0 * static_cast(_code[i]); + dest[i] = 1.0 - 2.0 * static_cast(code_aux[i]); } } @@ -75,37 +72,37 @@ void gps_l2c_m_code_gen_float(own::span _dest, uint32_t _prn) /* * Generates complex GPS L2C M code for the desired SV ID and sampled to specific sampling frequency */ -void gps_l2c_m_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs) +void gps_l2c_m_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq) { - constexpr int32_t _codeLength = GPS_L2_M_CODE_LENGTH_CHIPS; - constexpr float _tc = 1.0F / static_cast(GPS_L2_M_CODE_RATE_CPS); // L2C chip period in sec + constexpr int32_t codeLength = GPS_L2_M_CODE_LENGTH_CHIPS; + constexpr float tc = 1.0F / static_cast(GPS_L2_M_CODE_RATE_CPS); // L2C chip period in sec - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(GPS_L2_M_CODE_RATE_CPS) / static_cast(_codeLength))); - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec - int32_t _codeValueIndex; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(GPS_L2_M_CODE_RATE_CPS) / static_cast(codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec + int32_t codeValueIndex; - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - gps_l2c_m_code(_code, _prn); + gps_l2c_m_code(code_aux, prn); } - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== // --- Make index array to read L2C code values -------------------- - _codeValueIndex = std::ceil((_ts * (static_cast(i) + 1.0F)) / _tc) - 1; + codeValueIndex = std::ceil((ts * (static_cast(i) + 1.0F)) / tc) - 1; // --- Make the digitized version of the L2C code ------------------ - if (i == _samplesPerCode - 1) + if (i == samplesPerCode - 1) { - // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = std::complex(0.0, 1.0F - 2.0F * _code[_codeLength - 1]); + // Correct the last index (due to number rounding issues) + dest[i] = std::complex(0.0, 1.0F - 2.0F * code_aux[codeLength - 1]); } else { - _dest[i] = std::complex(0.0, 1.0F - 2.0F * _code[_codeValueIndex]); // repeat the chip -> upsample + dest[i] = std::complex(0.0, 1.0F - 2.0F * code_aux[codeValueIndex]); // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/gps_l2c_signal_replica.h b/src/algorithms/libs/gps_l2c_signal_replica.h index 6c0e65b69..1d1ae3ff4 100644 --- a/src/algorithms/libs/gps_l2c_signal_replica.h +++ b/src/algorithms/libs/gps_l2c_signal_replica.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -38,11 +35,13 @@ namespace own = gsl; //! Generates complex GPS L2C M code for the desired SV ID -void gps_l2c_m_code_gen_complex(own::span> _dest, uint32_t _prn); -void gps_l2c_m_code_gen_float(own::span _dest, uint32_t _prn); +void gps_l2c_m_code_gen_complex(own::span> dest, uint32_t prn); + +//! Generates float GPS L2C M code for the desired SV ID +void gps_l2c_m_code_gen_float(own::span dest, uint32_t prn); //! Generates complex GPS L2C M code for the desired SV ID, and sampled to specific sampling frequency -void gps_l2c_m_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs); +void gps_l2c_m_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq); /** \} */ diff --git a/src/algorithms/libs/gps_l5_signal_replica.cc b/src/algorithms/libs/gps_l5_signal_replica.cc index 3a397750e..75ce0c9bc 100644 --- a/src/algorithms/libs/gps_l5_signal_replica.cc +++ b/src/algorithms/libs/gps_l5_signal_replica.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -120,7 +117,7 @@ std::deque make_l5q_xb() } -void make_l5i(own::span _dest, int32_t prn) +void make_l5i(own::span dest, int32_t prn) { const int32_t xb_offset = GPS_L5I_INIT_REG[prn]; @@ -135,12 +132,12 @@ void make_l5i(own::span _dest, int32_t prn) for (int32_t n = 0; n < GPS_L5I_CODE_LENGTH_CHIPS; n++) { - _dest[n] = xa[n] xor xb_shift[n]; + dest[n] = xa[n] xor xb_shift[n]; } } -void make_l5q(own::span _dest, int32_t prn) +void make_l5q(own::span dest, int32_t prn) { const int32_t xb_offset = GPS_L5Q_INIT_REG[prn]; @@ -155,37 +152,37 @@ void make_l5q(own::span _dest, int32_t prn) for (int32_t n = 0; n < GPS_L5Q_CODE_LENGTH_CHIPS; n++) { - _dest[n] = xa[n] xor xb_shift[n]; + dest[n] = xa[n] xor xb_shift[n]; } } -void gps_l5i_code_gen_complex(own::span> _dest, uint32_t _prn) +void gps_l5i_code_gen_complex(own::span> dest, uint32_t prn) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - make_l5i(_code, _prn - 1); + make_l5i(code_aux, prn - 1); } for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++) { - _dest[i] = std::complex(1.0F - 2.0F * static_cast(_code[i]), 0.0); + dest[i] = std::complex(1.0F - 2.0F * static_cast(code_aux[i]), 0.0); } } -void gps_l5i_code_gen_float(own::span _dest, uint32_t _prn) +void gps_l5i_code_gen_float(own::span dest, uint32_t prn) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - make_l5i(_code, _prn - 1); + make_l5i(code_aux, prn - 1); } for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++) { - _dest[i] = 1.0F - 2.0F * static_cast(_code[i]); + dest[i] = 1.0F - 2.0F * static_cast(code_aux[i]); } } @@ -193,68 +190,68 @@ void gps_l5i_code_gen_float(own::span _dest, uint32_t _prn) /* * Generates complex GPS L5i code for the desired SV ID and sampled to specific sampling frequency */ -void gps_l5i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs) +void gps_l5i_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq) { - constexpr int32_t _codeLength = GPS_L5I_CODE_LENGTH_CHIPS; - constexpr float _tc = 1.0 / static_cast(GPS_L5I_CODE_RATE_CPS); // L5I primary chip period in sec + constexpr int32_t codeLength = GPS_L5I_CODE_LENGTH_CHIPS; + constexpr float tc = 1.0 / static_cast(GPS_L5I_CODE_RATE_CPS); // L5I primary chip period in sec - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(GPS_L5I_CODE_RATE_CPS) / static_cast(_codeLength))); - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec - int32_t _codeValueIndex; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(GPS_L5I_CODE_RATE_CPS) / static_cast(codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec + int32_t codeValueIndex; - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - make_l5i(_code, _prn - 1); + make_l5i(code_aux, prn - 1); } - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== // --- Make index array to read L5 code values --------------------- - _codeValueIndex = static_cast(std::ceil(_ts * static_cast(i + 1.0F) / _tc)) - 1; + codeValueIndex = static_cast(std::ceil(ts * static_cast(i + 1.0F) / tc)) - 1; // --- Make the digitized version of the L5I code ------------------ - if (i == _samplesPerCode - 1) + if (i == samplesPerCode - 1) { // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = std::complex(1.0F - 2.0F * _code[_codeLength - 1], 0.0); + dest[i] = std::complex(1.0F - 2.0F * code_aux[codeLength - 1], 0.0); } else { - _dest[i] = std::complex(1.0F - 2.0F * _code[_codeValueIndex], 0.0); // repeat the chip -> upsample + dest[i] = std::complex(1.0F - 2.0F * code_aux[codeValueIndex], 0.0); // repeat the chip -> upsample } } } -void gps_l5q_code_gen_complex(own::span> _dest, uint32_t _prn) +void gps_l5q_code_gen_complex(own::span> dest, uint32_t prn) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - make_l5q(_code, _prn - 1); + make_l5q(code_aux, prn - 1); } for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++) { - _dest[i] = std::complex(0.0, 1.0F - 2.0F * static_cast(_code[i])); + dest[i] = std::complex(0.0, 1.0F - 2.0F * static_cast(code_aux[i])); } } -void gps_l5q_code_gen_float(own::span _dest, uint32_t _prn) +void gps_l5q_code_gen_float(own::span dest, uint32_t prn) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - make_l5q(_code, _prn - 1); + make_l5q(code_aux, prn - 1); } for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++) { - _dest[i] = 1.0 - 2.0 * static_cast(_code[i]); + dest[i] = 1.0 - 2.0 * static_cast(code_aux[i]); } } @@ -262,40 +259,40 @@ void gps_l5q_code_gen_float(own::span _dest, uint32_t _prn) /* * Generates complex GPS L5Q code for the desired SV ID and sampled to specific sampling frequency */ -void gps_l5q_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs) +void gps_l5q_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq) { - std::array _code{}; - if (_prn > 0 and _prn < 51) + std::array code_aux{}; + if (prn > 0 and prn < 51) { - make_l5q(_code, _prn - 1); + make_l5q(code_aux, prn - 1); } - int32_t _codeValueIndex; - constexpr int32_t _codeLength = GPS_L5Q_CODE_LENGTH_CHIPS; + int32_t codeValueIndex; + constexpr int32_t codeLength = GPS_L5Q_CODE_LENGTH_CHIPS; // --- Find number of samples per spreading code --------------------------- - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(GPS_L5Q_CODE_RATE_CPS) / static_cast(_codeLength))); + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(GPS_L5Q_CODE_RATE_CPS) / static_cast(codeLength))); // --- Find time constants ------------------------------------------------- - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec - constexpr float _tc = 1.0F / static_cast(GPS_L5Q_CODE_RATE_CPS); // L5Q chip period in sec + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec + constexpr float tc = 1.0F / static_cast(GPS_L5Q_CODE_RATE_CPS); // L5Q chip period in sec - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== // --- Make index array to read L5 code values --------------------- - _codeValueIndex = static_cast(std::ceil(_ts * static_cast(i + 1.0F) / _tc)) - 1; + codeValueIndex = static_cast(std::ceil(ts * static_cast(i + 1.0F) / tc)) - 1; // --- Make the digitized version of the L5Q code ------------------ - if (i == _samplesPerCode - 1) + if (i == samplesPerCode - 1) { // --- Correct the last index (due to number rounding issues) ----------- - _dest[i] = std::complex(0.0, 1.0F - 2.0F * _code[_codeLength - 1]); + dest[i] = std::complex(0.0, 1.0F - 2.0F * code_aux[codeLength - 1]); } else { - _dest[i] = std::complex(0.0, 1.0F - 2.0F * _code[_codeValueIndex]); // repeat the chip -> upsample + dest[i] = std::complex(0.0, 1.0F - 2.0F * code_aux[codeValueIndex]); // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/gps_l5_signal_replica.h b/src/algorithms/libs/gps_l5_signal_replica.h index ab0fa81e6..f89b7a65b 100644 --- a/src/algorithms/libs/gps_l5_signal_replica.h +++ b/src/algorithms/libs/gps_l5_signal_replica.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -38,22 +35,22 @@ namespace own = gsl; //! Generates complex GPS L5I code for the desired SV ID -void gps_l5i_code_gen_complex(own::span> _dest, uint32_t _prn); +void gps_l5i_code_gen_complex(own::span> dest, uint32_t prn); //! Generates real GPS L5I code for the desired SV ID -void gps_l5i_code_gen_float(own::span _dest, uint32_t _prn); +void gps_l5i_code_gen_float(own::span dest, uint32_t prn); //! Generates complex GPS L5Q code for the desired SV ID -void gps_l5q_code_gen_complex(own::span> _dest, uint32_t _prn); +void gps_l5q_code_gen_complex(own::span> dest, uint32_t prn); //! Generates real GPS L5Q code for the desired SV ID -void gps_l5q_code_gen_float(own::span _dest, uint32_t _prn); +void gps_l5q_code_gen_float(own::span dest, uint32_t prn); //! Generates complex GPS L5I code for the desired SV ID, and sampled to specific sampling frequency -void gps_l5i_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs); +void gps_l5i_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq); //! Generates complex GPS L5Q code for the desired SV ID, and sampled to specific sampling frequency -void gps_l5q_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs); +void gps_l5q_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq); /** \} */ diff --git a/src/algorithms/libs/gps_sdr_signal_replica.cc b/src/algorithms/libs/gps_sdr_signal_replica.cc index 5eb9e4150..ba439377f 100644 --- a/src/algorithms/libs/gps_sdr_signal_replica.cc +++ b/src/algorithms/libs/gps_sdr_signal_replica.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -25,11 +22,11 @@ const auto AUX_CEIL = [](float x) { return static_cast(static_cast((x) + 1)); }; -void gps_l1_ca_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_shift) +void gps_l1_ca_code_gen_int(own::span dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 1023; - std::bitset<_code_length> G1{}; - std::bitset<_code_length> G2{}; + constexpr uint32_t code_length = 1023; + std::bitset G1{}; + std::bitset G2{}; auto G1_register = std::bitset<10>{}.set(); // All true auto G2_register = std::bitset<10>{}.set(); // All true uint32_t lcv; @@ -47,13 +44,13 @@ void gps_l1_ca_code_gen_int(own::span _dest, int32_t _prn, uint32_t _ch 355, 1012, 176, 603, 130, 359, 595, 68, 386 /*PRN138*/}; // compute delay array index for given PRN number - if (120 <= _prn && _prn <= 138) + if (120 <= prn && prn <= 138) { - prn_idx = _prn - 88; // SBAS PRNs are at array indices 31 to 50 (offset: -120+33-1 =-88) + prn_idx = prn - 88; // SBAS PRNs are at array indices 31 to 50 (offset: -120+33-1 =-88) } else { - prn_idx = _prn - 1; + prn_idx = prn - 1; } // A simple error check @@ -63,7 +60,7 @@ void gps_l1_ca_code_gen_int(own::span _dest, int32_t _prn, uint32_t _ch } // Generate G1 & G2 Register - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { G1[lcv] = G1_register[0]; G2[lcv] = G2_register[0]; @@ -82,52 +79,52 @@ void gps_l1_ca_code_gen_int(own::span _dest, int32_t _prn, uint32_t _ch } // Set the delay - delay = _code_length - delays[prn_idx]; - delay += _chip_shift; - delay %= _code_length; + delay = code_length - delays[prn_idx]; + delay += chip_shift; + delay %= code_length; // Generate PRN from G1 and G2 Registers - for (lcv = 0; lcv < _code_length; lcv++) + for (lcv = 0; lcv < code_length; lcv++) { - aux = G1[(lcv + _chip_shift) % _code_length] xor G2[delay]; + aux = G1[(lcv + chip_shift) % code_length] xor G2[delay]; if (aux == true) { - _dest[lcv] = 1; + dest[lcv] = 1; } else { - _dest[lcv] = -1; + dest[lcv] = -1; } delay++; - delay %= _code_length; + delay %= code_length; } } -void gps_l1_ca_code_gen_float(own::span _dest, int32_t _prn, uint32_t _chip_shift) +void gps_l1_ca_code_gen_float(own::span dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 1023; - std::array ca_code_int{}; + constexpr uint32_t code_length = 1023; + std::array ca_code_int{}; - gps_l1_ca_code_gen_int(ca_code_int, _prn, _chip_shift); + gps_l1_ca_code_gen_int(ca_code_int, prn, chip_shift); - for (uint32_t ii = 0; ii < _code_length; ++ii) + for (uint32_t ii = 0; ii < code_length; ++ii) { - _dest[ii] = static_cast(ca_code_int[ii]); + dest[ii] = static_cast(ca_code_int[ii]); } } -void gps_l1_ca_code_gen_complex(own::span> _dest, int32_t _prn, uint32_t _chip_shift) +void gps_l1_ca_code_gen_complex(own::span> dest, int32_t prn, uint32_t chip_shift) { - constexpr uint32_t _code_length = 1023; - std::array ca_code_int{}; + constexpr uint32_t code_length = 1023; + std::array ca_code_int{}; - gps_l1_ca_code_gen_int(ca_code_int, _prn, _chip_shift); + gps_l1_ca_code_gen_int(ca_code_int, prn, chip_shift); - for (uint32_t ii = 0; ii < _code_length; ++ii) + for (uint32_t ii = 0; ii < code_length; ++ii) { - _dest[ii] = std::complex(0.0F, static_cast(ca_code_int[ii])); + dest[ii] = std::complex(0.0F, static_cast(ca_code_int[ii])); } } @@ -136,22 +133,22 @@ void gps_l1_ca_code_gen_complex(own::span> _dest, int32_t _p * Generates complex GPS L1 C/A code for the desired SV ID and sampled to specific sampling frequency * NOTICE: the number of samples is rounded towards zero (integer truncation) */ -void gps_l1_ca_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift) +void gps_l1_ca_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift) { // This function is based on the GNU software GPS for MATLAB in the Kay Borre book - constexpr int32_t _codeFreqBasis = 1023000; // Hz - constexpr int32_t _codeLength = 1023; - constexpr float _tc = 1.0F / static_cast(_codeFreqBasis); // C/A chip period in sec + constexpr int32_t codeFreqBasis = 1023000; // chips per second + constexpr int32_t codeLength = 1023; + constexpr float tc = 1.0F / static_cast(codeFreqBasis); // C/A chip period in sec - const auto _samplesPerCode = static_cast(static_cast(_fs) / (static_cast(_codeFreqBasis) / static_cast(_codeLength))); - const float _ts = 1.0F / static_cast(_fs); // Sampling period in sec - std::array, 1023> _code{}; - int32_t _codeValueIndex; + const auto samplesPerCode = static_cast(static_cast(sampling_freq) / (static_cast(codeFreqBasis) / static_cast(codeLength))); + const float ts = 1.0F / static_cast(sampling_freq); // Sampling period in sec + std::array, 1023> code_aux{}; + int32_t codeValueIndex; float aux; - gps_l1_ca_code_gen_complex(_code, _prn, _chip_shift); // generate C/A code 1 sample per chip + gps_l1_ca_code_gen_complex(code_aux, prn, chip_shift); // generate C/A code 1 sample per chip - for (int32_t i = 0; i < _samplesPerCode; i++) + for (int32_t i = 0; i < samplesPerCode; i++) { // === Digitizing ================================================== @@ -160,20 +157,20 @@ void gps_l1_ca_code_gen_complex_sampled(own::span> _dest, ui // number of samples per millisecond (because one C/A code period is one // millisecond). - aux = (_ts * (static_cast(i) + 1)) / _tc; - _codeValueIndex = AUX_CEIL(aux) - 1; + aux = (ts * (static_cast(i) + 1)) / tc; + codeValueIndex = AUX_CEIL(aux) - 1; // --- Make the digitized version of the C/A code ------------------- // The "upsampled" code is made by selecting values form the CA code // chip array (caCode) for the time instances of each sample. - if (i == _samplesPerCode - 1) + if (i == samplesPerCode - 1) { // --- Correct the last index (due to number rounding issues) - _dest[i] = _code[_codeLength - 1]; + dest[i] = code_aux[codeLength - 1]; } else { - _dest[i] = _code[_codeValueIndex]; // repeat the chip -> upsample + dest[i] = code_aux[codeValueIndex]; // repeat the chip -> upsample } } } diff --git a/src/algorithms/libs/gps_sdr_signal_replica.h b/src/algorithms/libs/gps_sdr_signal_replica.h index 652bfafe9..bb3b243de 100644 --- a/src/algorithms/libs/gps_sdr_signal_replica.h +++ b/src/algorithms/libs/gps_sdr_signal_replica.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -39,19 +36,16 @@ namespace own = gsl; //! Generates int GPS L1 C/A code for the desired SV ID and code shift -void gps_l1_ca_code_gen_int(own::span _dest, int32_t _prn, uint32_t _chip_shift); +void gps_l1_ca_code_gen_int(own::span dest, int32_t prn, uint32_t chip_shift); //! Generates float GPS L1 C/A code for the desired SV ID and code shift -void gps_l1_ca_code_gen_float(own::span _dest, int32_t _prn, uint32_t _chip_shift); - -//! Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency -void gps_l1_ca_code_gen_complex(own::span> _dest, int32_t _prn, uint32_t _chip_shift); - -//! Generates N complex GPS L1 C/A codes for the desired SV ID and code shift -void gps_l1_ca_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, uint32_t _ncodes); +void gps_l1_ca_code_gen_float(own::span dest, int32_t prn, uint32_t chip_shift); //! Generates complex GPS L1 C/A code for the desired SV ID and code shift -void gps_l1_ca_code_gen_complex_sampled(own::span> _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift); +void gps_l1_ca_code_gen_complex(own::span> dest, int32_t prn, uint32_t chip_shift); + +//! Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency +void gps_l1_ca_code_gen_complex_sampled(own::span> dest, uint32_t prn, int32_t sampling_freq, uint32_t chip_shift); /** \} */ diff --git a/src/algorithms/libs/item_type_helpers.cc b/src/algorithms/libs/item_type_helpers.cc index 97f1f93ef..4a2db800b 100644 --- a/src/algorithms/libs/item_type_helpers.cc +++ b/src/algorithms/libs/item_type_helpers.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/item_type_helpers.h b/src/algorithms/libs/item_type_helpers.h index 1e0f25a50..01fecd6a6 100644 --- a/src/algorithms/libs/item_type_helpers.h +++ b/src/algorithms/libs/item_type_helpers.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index a67a7ee75..b5b7d2039 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h index 6679e95b0..317ed73ab 100644 --- a/src/algorithms/libs/pass_through.h +++ b/src/algorithms/libs/pass_through.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt index f1149c07e..ec7958c02 100644 --- a/src/algorithms/libs/rtklib/CMakeLists.txt +++ b/src/algorithms/libs/rtklib/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(RTKLIB_LIB_SOURCES diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.cc b/src/algorithms/libs/rtklib/rtklib_conversions.cc index 4cb668386..d3c0dfabd 100644 --- a/src/algorithms/libs/rtklib/rtklib_conversions.cc +++ b/src/algorithms/libs/rtklib/rtklib_conversions.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.h b/src/algorithms/libs/rtklib/rtklib_conversions.h index a956cb74b..d3109002e 100644 --- a/src/algorithms/libs/rtklib/rtklib_conversions.h +++ b/src/algorithms/libs/rtklib/rtklib_conversions.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc index f66a13160..5d023842b 100644 --- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc @@ -26,7 +26,6 @@ * All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause - * * ----------------------------------------------------------------------------- */ diff --git a/src/algorithms/libs/rtklib/rtklib_preceph.cc b/src/algorithms/libs/rtklib/rtklib_preceph.cc index 2d3286bcd..5d297fe44 100644 --- a/src/algorithms/libs/rtklib/rtklib_preceph.cc +++ b/src/algorithms/libs/rtklib/rtklib_preceph.cc @@ -304,8 +304,8 @@ void readsp3b(FILE *fp, char type, int *sats __attribute__((unused)), int ns, co /* compare precise ephemeris -------------------------------------------------*/ int cmppeph(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); double tt = timediff(q1->time, q2->time); return tt < -1e-9 ? -1 : (tt > 1e-9 ? 1 : q1->index - q2->index); } diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc index e8e3d0d81..cccf72d97 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc @@ -3309,8 +3309,8 @@ int geterp(const erp_t *erp, gtime_t time, double *erpv) /* compare ephemeris ---------------------------------------------------------*/ int cmpeph(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); return q1->ttr.time != q2->ttr.time ? static_cast(q1->ttr.time - q2->ttr.time) : (q1->toe.time != q2->toe.time ? static_cast(q1->toe.time - q2->toe.time) : q1->sat - q2->sat); } @@ -3359,8 +3359,8 @@ void uniqeph(nav_t *nav) /* compare glonass ephemeris -------------------------------------------------*/ int cmpgeph(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); return q1->tof.time != q2->tof.time ? static_cast(q1->tof.time - q2->tof.time) : (q1->toe.time != q2->toe.time ? static_cast(q1->toe.time - q2->toe.time) : q1->sat - q2->sat); } @@ -3410,8 +3410,8 @@ void uniqgeph(nav_t *nav) /* compare sbas ephemeris ----------------------------------------------------*/ int cmpseph(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); return q1->tof.time != q2->tof.time ? static_cast(q1->tof.time - q2->tof.time) : (q1->t0.time != q2->t0.time ? static_cast(q1->t0.time - q2->t0.time) : q1->sat - q2->sat); } @@ -3488,8 +3488,8 @@ void uniqnav(nav_t *nav) /* compare observation data -------------------------------------------------*/ int cmpobs(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); double tt = timediff(q1->time, q2->time); if (fabs(tt) > DTTOL) { diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc index 0dae19d37..490321f2a 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc @@ -26,8 +26,6 @@ * All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause - * - * * ----------------------------------------------------------------------------- */ diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.h b/src/algorithms/libs/rtklib/rtklib_rtkpos.h index acdadfa51..29f1924d2 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkpos.h +++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.h @@ -26,8 +26,6 @@ * All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause - * - * * ----------------------------------------------------------------------------- */ diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc index 8aed35122..975a61f86 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc @@ -26,8 +26,6 @@ * All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause - * - * * ----------------------------------------------------------------------------- */ diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.cc b/src/algorithms/libs/rtklib/rtklib_sbas.cc index 2b6ec74b7..4d682692c 100644 --- a/src/algorithms/libs/rtklib/rtklib_sbas.cc +++ b/src/algorithms/libs/rtklib/rtklib_sbas.cc @@ -730,8 +730,8 @@ void readmsgs(const char *file, int sel, gtime_t ts, gtime_t te, /* compare sbas messages -----------------------------------------------------*/ int cmpmsgs(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); return q1->week != q2->week ? q1->week - q2->week : (q1->tow < q2->tow ? -1 : (q1->tow > q2->tow ? 1 : q1->prn - q2->prn)); } diff --git a/src/algorithms/libs/rtklib/rtklib_solution.cc b/src/algorithms/libs/rtklib/rtklib_solution.cc index e900bbe58..57aa8e26e 100644 --- a/src/algorithms/libs/rtklib/rtklib_solution.cc +++ b/src/algorithms/libs/rtklib/rtklib_solution.cc @@ -982,8 +982,8 @@ int readsoldata(FILE *fp, gtime_t ts, gtime_t te, double tint, int qflag, /* compare solution data -----------------------------------------------------*/ int cmpsol(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); double tt = timediff(q1->time, q2->time); return tt < -0.0 ? -1 : (tt > 0.0 ? 1 : 0); } @@ -1211,8 +1211,8 @@ void freesolstatbuf(solstatbuf_t *solstatbuf) /* compare solution status ---------------------------------------------------*/ int cmpsolstat(const void *p1, const void *p2) { - auto *q1 = static_cast(p1); - auto *q2 = static_cast(p2); + const auto *q1 = static_cast(p1); + const auto *q2 = static_cast(p2); double tt = timediff(q1->time, q2->time); return tt < -0.0 ? -1 : (tt > 0.0 ? 1 : 0); } @@ -1802,6 +1802,46 @@ int outnmea_gsa(unsigned char *buff, const sol_t *sol, } p += std::snprintf(p, MSG_TAIL, "*%02X%c%c", sum, 0x0D, 0x0A); } + /* BDGSA: beidou */ + for (sat = 1, nsat = 0; sat <= MAXSAT && nsat < 12; sat++) + { + if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0) + { + continue; + } + if (satsys(sat, prn + nsat) != SYS_BDS) + { + continue; + } + for (i = 0; i < 2; i++) + { + azel[i + nsat * 2] = ssat[sat - 1].azel[i]; + } + nsat++; + } + if (nsat > 0) + { + s = p; + p += std::snprintf(p, MAXSOLBUF, "$BDGSA,A,%d", sol->stat <= 0 ? 1 : 3); + for (i = 0; i < 12; i++) + { + if (i < nsat) + { + p += std::snprintf(p, MAX_LENGTH_INT + 2, ",%02d", prn[i]); + } + else + { + p += std::snprintf(p, COMMA_LENGTH, ","); + } + } + dops(nsat, azel, 0.0, dop); + p += std::snprintf(p, MAXSOLBUF - (p - s), ",%3.1f,%3.1f,%3.1f,3", dop[1], dop[2], dop[3]); + for (q = s + 1, sum = 0; *q; q++) + { + sum ^= *q; /* check-sum */ + } + p += std::snprintf(p, MSG_TAIL, "*%02X%c%c", sum, 0x0D, 0x0A); + } return p - reinterpret_cast(buff); } @@ -1980,6 +2020,51 @@ int outnmea_gsv(unsigned char *buff, const sol_t *sol, } p += std::snprintf(p, MSG_TAIL, "*%02X%c%c", sum, 0x0D, 0x0A); } + /* BDGSV: beidou */ + for (sat = 1, n = 0; sat < MAXSAT && n < 12; sat++) + { + if (satsys(sat, &prn) != SYS_BDS) + { + continue; + } + if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0) + { + sats[n++] = sat; + } + } + nmsg = n <= 0 ? 0 : (n - 1) / 4 + 1; + + for (i = k = 0; i < nmsg; i++) + { + s = p; + p += std::snprintf(p, MAXSOLBUF, "$BDGSV,%d,%d,%02d", nmsg, i + 1, n); + + for (j = 0; j < 4; j++, k++) + { + if (k < n) + { + satsys(sats[k], &prn); /* 1-63 */ + az = ssat[sats[k] - 1].azel[0] * R2D; + if (az < 0.0) + { + az += 360.0; + } + el = ssat[sats[k] - 1].azel[1] * R2D; + snr = ssat[sats[k] - 1].snr[0] * 0.25; + p += std::snprintf(p, MAXSOLBUF - (s - p), ",%02d,%02.0f,%03.0f,%02.0f", prn, el, az, snr); + } + else + { + p += std::snprintf(p, MAXSOLBUF - (s - p), ",,,,"); + } + } + p += std::snprintf(p, MAXSOLBUF - (s - p), ",1"); + for (q = s + 1, sum = 0; *q; q++) + { + sum ^= *q; /* check-sum */ + } + p += std::snprintf(p, MSG_TAIL, "*%02X%c%c", sum, 0x0D, 0x0A); + } return p - reinterpret_cast(buff); } diff --git a/src/algorithms/libs/rtklib/rtklib_solution.h b/src/algorithms/libs/rtklib/rtklib_solution.h index c7f6c074a..af748f5d5 100644 --- a/src/algorithms/libs/rtklib/rtklib_solution.h +++ b/src/algorithms/libs/rtklib/rtklib_solution.h @@ -26,8 +26,8 @@ * All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause - * - *-----------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------ + */ #ifndef GNSS_SDR_RTKLIB_SOLUTION_H #define GNSS_SDR_RTKLIB_SOLUTION_H diff --git a/src/algorithms/libs/short_x2_to_cshort.cc b/src/algorithms/libs/short_x2_to_cshort.cc index 7c414d8fe..24d4cf864 100644 --- a/src/algorithms/libs/short_x2_to_cshort.cc +++ b/src/algorithms/libs/short_x2_to_cshort.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/short_x2_to_cshort.h b/src/algorithms/libs/short_x2_to_cshort.h index 77a1dee8a..99376cd26 100644 --- a/src/algorithms/libs/short_x2_to_cshort.h +++ b/src/algorithms/libs/short_x2_to_cshort.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 526c07801..3df149278 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt @@ -1,12 +1,9 @@ -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + ######################################################################## # Project setup 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 9fac8694a..4ffdaff9f 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,11 +1,8 @@ -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # ######################################################################## 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 47e81abae..d7314d747 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,10 +1,9 @@ #!/usr/bin/env python -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # This script is used to compare the generic kernels to the highest performing kernel, for each operation 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 4176d0819..72d0199d2 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,9 +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 - * +/* + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later */ 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 d1d303d98..84d09aa3d 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,9 +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 - * +/* + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later */ 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 fb3c77060..cc481b4a8 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,9 +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 - * +/* + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later */ 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 6361e883f..d3c9269e0 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,9 +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 - * +/* + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later */ 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 0ed5d5080..e4ba0e922 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 @@ -4,12 +4,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 24657a63c..9c8dc3679 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,10 +1,8 @@ -# Copyright (C) 2019 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2019-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Original code from https://github.com/vector-of-bool/CMakeCM and modified # by C. Fernandez. The original code is distributed under the OSI-approved 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 10175d198..facb29f51 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,10 +1,8 @@ -# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) 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 3246f4330..5f55a0190 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,10 +1,8 @@ -# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_VOLK_ADD_TEST) return() 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 f727db6b4..b43046264 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,10 +1,8 @@ -# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_VOLK_BOOST_CMAKE) return() 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 1d138dc44..b828082f8 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,10 +1,8 @@ -# Copyright (C) 2014-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_VOLK_BUILD_TYPES_CMAKE) return() 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 5c7c25573..fcc292d72 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,10 +1,8 @@ -# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause get_filename_component(VOLK_GNSSSDR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) 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 a464503ab..d0ec44edb 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,10 +1,8 @@ -# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@) set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@) 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 4f08bc151..977b6b95e 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,10 +1,8 @@ -# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_VOLK_PYTHON_CMAKE) return() @@ -74,7 +72,14 @@ else() message(STATUS "User set python executable ${PYTHON_EXECUTABLE}") find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED) else() + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(_previous ${CMAKE_FIND_FRAMEWORK}) + set(CMAKE_FIND_FRAMEWORK LAST) + endif() find_package(Python3 COMPONENTS Interpreter) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_FIND_FRAMEWORK ${_previous}) + endif() if(Python3_FOUND) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR}) 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 662fb052f..322669700 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,10 +1,8 @@ -# Copyright (C) 2014-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause if(DEFINED __INCLUDED_VOLK_VERSION_CMAKE) return() 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 55b0ab9b9..cfe23b292 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR aarch64) 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 1a674ce98..e99de29a6 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) 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 5419681d3..1b2ec34cf 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON 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 053704eac..a9a5d47f6 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A72 w/ NEON 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 0b5f02650..a3261fea8 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A72 w/ NEON 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 9c5d52892..a2340e892 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON 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 4c856167c..e4e249020 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON 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 c3e1e9293..72335cfee 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## # Toolchain file for building native on a ARM Cortex A8 w/ NEON 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 9be00cd07..4c4835e8b 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause set(CMAKE_SYSTEM_NAME Linux) string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT}) 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 54d24c68a..eeea64dbc 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,10 +1,8 @@ -# Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors) +# SPDX-License-Identifier: BSD-3-Clause if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") 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 b796fc7dc..2c7355dd0 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,10 +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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/cpuinfo_aarch64.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/cpuinfo_aarch64.h index 6f910c52f..34d258873 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/cpuinfo_aarch64.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/cpuinfo_aarch64.h @@ -62,6 +62,7 @@ typedef struct int dgh : 1; // Data Gathering Hint instruction. int rng : 1; // True random number generator support. int bti : 1; // Branch target identification. + int mte : 1; // Memory tagging extension. // Make sure to update Aarch64FeaturesEnum below if you add a field here. } Aarch64Features; @@ -132,6 +133,7 @@ typedef enum AARCH64_DGH, AARCH64_RNG, AARCH64_BTI, + AARCH64_MTE, AARCH64_LAST_, } Aarch64FeaturesEnum; diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/internal/hwcaps.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/internal/hwcaps.h index 831c342df..34c364e94 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/internal/hwcaps.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/include/internal/hwcaps.h @@ -68,6 +68,7 @@ CPU_FEATURES_START_CPP_NAMESPACE #define AARCH64_HWCAP2_DGH (1UL << 15) #define AARCH64_HWCAP2_RNG (1UL << 16) #define AARCH64_HWCAP2_BTI (1UL << 17) +#define AARCH64_HWCAP2_MTE (1UL << 18) // http://elixir.free-electrons.com/linux/latest/source/arch/arm/include/uapi/asm/hwcap.h #define ARM_HWCAP_SWP (1UL << 0) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/src/cpuinfo_aarch64.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/src/cpuinfo_aarch64.c index a62b35026..62cdb403d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/src/cpuinfo_aarch64.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/src/cpuinfo_aarch64.c @@ -62,7 +62,8 @@ FEATURE(AARCH64_BF16, bf16, "bf16", 0, AARCH64_HWCAP2_BF16) \ FEATURE(AARCH64_DGH, dgh, "dgh", 0, AARCH64_HWCAP2_DGH) \ FEATURE(AARCH64_RNG, rng, "rng", 0, AARCH64_HWCAP2_RNG) \ - FEATURE(AARCH64_BTI, bti, "bti", 0, AARCH64_HWCAP2_BTI) + FEATURE(AARCH64_BTI, bti, "bti", 0, AARCH64_HWCAP2_BTI) \ + FEATURE(AARCH64_MTE, mte, "mte", 0, AARCH64_HWCAP2_MTE) #define DEFINE_TABLE_FEATURE_TYPE Aarch64Features #include "define_tables.h" diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc index 2c29b5e7e..bb2aa6a0a 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc @@ -157,6 +157,7 @@ CPU revision : 3)"); EXPECT_FALSE(info.features.dgh); EXPECT_FALSE(info.features.rng); EXPECT_FALSE(info.features.bti); + EXPECT_FALSE(info.features.mte); } } // namespace 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 0f6a766c0..4776e98b1 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,9 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # /*! \page extending_volk Extending VOLK 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 ddfe60c1b..06ab5521a 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,9 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # /*! \page kernels Kernels 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 6879fe382..4653be5f5 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,9 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # /*! \mainpage VOLK_GNSSSDR 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 17dcb98cc..301bf320d 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,9 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # /*! \page concepts_terms_and_techniques Concepts, Terms, and Techniques 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 904028217..c9c050156 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,9 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # /*! \page using_volk_gnsssdr Using VOLK_GNSSSDR diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py.in index e9d61a591..53fcd4073 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py.in @@ -1,13 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# from __future__ import print_function import sys 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 bf1e2ed3f..dcd26d25d 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,13 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# from __future__ import print_function 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 2b15678b1..e919caa09 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,15 +1,11 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# - from __future__ import print_function import os 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 193bc8c79..2ac24e7c0 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,13 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# from __future__ import print_function import sys 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 7d4e03d5a..9a2379e15 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,13 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# from __future__ import print_function @@ -30,9 +27,9 @@ def __parse_tmpl(_tmpl, **kwargs): } defs.update(kwargs) _tmpl = """ - + /* this file was generated by volk_gnsssdr template utils, do not edit! */ - + """ + _tmpl return str(Template(_tmpl).render(**defs)) @@ -41,10 +38,9 @@ def main(): parser.add_option('--input', type='string') parser.add_option('--output', type='string') (opts, args) = parser.parse_args() - + output = __parse_tmpl(open(opts.input).read(), args=args) if opts.output: open(opts.output, 'w').write(output) else: print(output) if __name__ == '__main__': main() - 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 f0abe231e..a8165a030 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 @@ -3,12 +3,10 @@ * \brief Definition of VOLK_GNSSSDR-related constants * \author Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * 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 9b7b113be..c483d38f6 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 @@ -3,12 +3,10 @@ * \brief Defines addition of 16-bit integers with saturation * \author Javier Arribas, 2015. javier.arribas(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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * 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 88a146638..5f468f3ea 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 @@ -4,12 +4,10 @@ * \brief C++11 allocator using volk_gnsssdr_malloc and volk_gnsssdr_free. * Based on https://github.com/gnuradio/volk/pull/284/ by @hcab14 * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * 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 9209f12c3..91927aa07 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 @@ -4,12 +4,10 @@ * \brief This file is intended to hold AVX intrinsics of intrinsics. * They should be used in VOLK kernels to avoid copy-paste. * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * 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 2b31b9bcb..42739ba60 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 @@ -3,12 +3,10 @@ * \brief Cross-platform attribute macros * \author Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * 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 a40a7dedc..6f6f54751 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 @@ -3,13 +3,12 @@ * \brief Provide typedefs and operators for all complex types in C and C++. * \author Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDE_VOLK_COMPLEX_H 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 5ff613148..9cc153a58 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 @@ -4,13 +4,12 @@ * returns a pointer to the allocated memory. * \author Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_MALLOC_H 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 4e21e8760..efda4358a 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 @@ -4,13 +4,12 @@ * \brief Holds NEON intrinsics of intrinsics. * They can be used in VOLK_GNSSSDR kernels to avoid copy-paste * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_NEON_INTRINSICS_H 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 1e2dbea64..fcdec0ee9 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 @@ -4,13 +4,12 @@ * prefs into global prefs struct * \author Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_PREFS_H 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 7e4daeb32..b1e6ca1f4 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 @@ -3,13 +3,12 @@ * \brief Sine table * \author Carles Fernandez-Prades, 2015 cfernandez(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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * 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 9144e5790..da5b0b824 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 @@ -4,13 +4,12 @@ * \brief Holds SSE3 intrinsics of intrinsics. * They should be used in VOLK kernels to avoid copy-paste. * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * 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 d32b246b3..eec961f40 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 @@ -4,13 +4,12 @@ * \brief Holds SSE intrinsics of intrinsics. * They should be used in VOLK kernels to avoid copy-paste * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_VOLK_SSE_INTRINSICS_H 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 921c6e762..2e2c2f2cc 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,11 +1,8 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# .function volk_gnsssdr_16ic_magnitude_32f_a_orc_impl .source 4 src 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 d9ad812cf..af018ec32 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,11 +1,8 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# .function volk_gnsssdr_32f_x2_add_32f_a_orc_impl .dest 4 dst 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 e3d63a764..b732aee43 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,11 +1,8 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# .function volk_gnsssdr_32fc_s32fc_multiply_32fc_a_orc_impl .source 8 src1 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 71064fcf4..768637d42 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,11 +1,8 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# .function volk_gnsssdr_32fc_x2_multiply_32fc_a_orc_impl .source 8 src1 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 ab279bf9f..d529fb1e9 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 @@ -1,22 +1,20 @@ # # ORC implementation: 8 bits (char) scalar accumulator -# -# Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# -# ORC code that implements an accumulator of char values -# -# ------------------------------------------------------------------------- -# -# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # +# Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com +# +# ORC code that implements an accumulator of char values +# +# ------------------------------------------------------------------------------ +# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8i_accumulator_s8i_a_orc_impl .source 1 src1 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 c31ab368e..861af2eb7 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 @@ -1,21 +1,19 @@ # # ORC implementation: adds pairs of 8 bits (char) scalars -# -# Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# -# -# ------------------------------------------------------------------------- -# -# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver # +# Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com +# +# +# ------------------------------------------------------------------------------ +# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8i_x2_add_8i_a_orc_impl .dest 1 dst 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 698123a65..38e439925 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 @@ -1,25 +1,23 @@ # # ORC implementation: calculates the conjugate of a 16 bits vector -# +# # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# +# # ORC code that calculates the conjugate of a # 16 bits vector (8 bits the real part and 8 bits the imaginary part) # result = (real*real) + (imag*imag) # -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8ic_conjugate_8ic_a_orc_impl .source 2 src1 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 4c785d17e..bce77c487 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 @@ -1,25 +1,23 @@ # # ORC implementation: calculates the magnitude squared of a 16 bits vector # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# -# +# +# # ORC code that calculates the magnitude squared of a # 16 bits vector (8 bits the real part and 8 bits the imaginary part) # result = (real*real) + (imag*imag) # -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8ic_magnitude_squared_8i_a_orc_impl .source 2 src1 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 7d4e20adb..bdd0dc32d 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 @@ -3,22 +3,20 @@ # # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com # -# +# # ORC code that multiplies a group of 16 bits vectors # (8 bits the real part and 8 bits the imaginary part) by one constant vector -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8ic_s8ic_multiply_8ic_a_orc_impl .source 2 src1 @@ -39,7 +37,3 @@ splitwb ii, ri, iqprod subb real, rr, ii addb imag, ri, ir mergebw dst, real, imag - - - - 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 6538b37f0..e13eeaa7d 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 @@ -2,24 +2,22 @@ # ORC implementation: multiplies two 16 bits vectors and accumulates them # # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# -# +# +# # ORC code that multiplies two 16 bits vectors (8 bits the real part # and 8 bits the imaginary part) and accumulates them -# -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8ic_x2_dot_prod_8ic_a_orc_impl .source 2 src1 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 549949f4d..59e799aba 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 @@ -1,25 +1,23 @@ # # ORC implementation: multiplies two 16 bits vectors -# +# # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# +# # # ORC code that multiplies two 16 bits vectors (8 bits the real part # and 8 bits the imaginary part) -# -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8ic_x2_multiply_8ic_a_orc_impl .source 2 src1 @@ -39,7 +37,3 @@ x2 mullb iqprod, swapped, src2 splitwb bd, ac, iqprod addb imag, ac, bd mergebw dst, real, imag - - - - 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 6bf244da9..acb6e8e6a 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 @@ -1,8 +1,8 @@ # # ORC implementation: performs the carrier wipe-off mixing and the Early, Prompt, and Late correlation with 16 bits vectors # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# -# +# +# # ORC code that performs the carrier wipe-off mixing and the # Early, Prompt, and Late correlation with 16 bits vectors (8 bits the # real part and 8 bits the imaginary part): @@ -15,20 +15,18 @@ # prompt code (multiplication of 16 bits vectors), accumulating the results # - Late values are calculated by multiplying the input signal in BB by the # late code (multiplication of 16 bits vectors), accumulating the results -# -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8ic_x5_cw_epl_corr_8ic_x3_first_a_orc_impl .source 2 input @@ -122,5 +120,3 @@ mergebw real2, 0, real mergebw imag2, 0, imag accw L_out_real, real2 accw L_out_imag, imag2 - - 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 279456211..f365fd42a 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 @@ -1,23 +1,21 @@ # # ORC implementation: multiplies unsigned char values -# +# # Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com -# +# # # ORC code that multiplies unsigned char values (8 bits data) -# -# ------------------------------------------------------------------------- -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later # -# ------------------------------------------------------------------------- -# +# ------------------------------------------------------------------------------ +# .function volk_gnsssdr_8u_x2_multiply_8u_a_orc_impl .source 1 src1 diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_resamplerxnpuppet_16i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_resamplerxnpuppet_16i.h index 3370fdc39..22338c3f3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_resamplerxnpuppet_16i.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_resamplerxnpuppet_16i.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h index 51bc89c18..988b14a39 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h index 127ed1125..b1b8d6350 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h index ab18f7f75..5e9e7161b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_conjugate_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_conjugate_16ic.h index 0ee8da652..1770e5206 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_conjugate_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_conjugate_16ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h index 444cb061d..78fce6549 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resampler_fast_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resampler_fast_16ic.h index fc46d695e..ea7f03d24 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resampler_fast_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resampler_fast_16ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastpuppet_16ic.h index 2d7743830..14585318b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastxnpuppet_16ic.h index 00f7e17d2..563b6009b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerfastxnpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h index 987795411..381a6c797 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_rotatorpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_rotatorpuppet_16ic.h index 757cd67cc..49ffc1f32 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_rotatorpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_rotatorpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h index 7a95fa89c..c5eaa201d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h index cf404592b..adc29674a 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h index 893268df6..cbbb231ba 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h index 12faa0652..71879af61 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h index 46786ff5b..d39a8cd57 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h index fdda0d032..d94d456fb 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h index 8a63f2580..dc3238776 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h index 0554a3c96..fc67d3cec 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_fast_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_fast_16ic_xn.h index 9830e37ac..e97dfdf1b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_fast_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_fast_16ic_xn.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_high_dynamics_resamplerxnpuppet_32f.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_high_dynamics_resamplerxnpuppet_32f.h index 51aadd9fd..5f898db03 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_high_dynamics_resamplerxnpuppet_32f.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_high_dynamics_resamplerxnpuppet_32f.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_index_max_32u.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_index_max_32u.h index 80043cf6e..48edd8f17 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_index_max_32u.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_index_max_32u.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_resamplerxnpuppet_32f.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_resamplerxnpuppet_32f.h index 86b0ec4a8..2218f6e63 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_resamplerxnpuppet_32f.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_resamplerxnpuppet_32f.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h index 3df072dea..5bd0039d5 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h index 3d7b08b26..6c1d1d7ea 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h index 7f35d0c0f..d20542d58 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dotprodxnpuppet_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dotprodxnpuppet_32fc.h index febd004f3..414555e84 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dotprodxnpuppet_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dotprodxnpuppet_32fc.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h index 2888cc679..bcca81c9d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc.h index a73bac9cd..d9b29b0d0 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h index d620f97b7..31f8aab1b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h index 8ef3bbe4f..d2f212041 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_resamplerxnpuppet_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_resamplerxnpuppet_32fc.h index e47dd4f36..9f948e086 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_resamplerxnpuppet_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_resamplerxnpuppet_32fc.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h index 45f0b7452..486729f69 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dotprodxnpuppet_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dotprodxnpuppet_32fc.h index 3460cf7ec..94ce64683 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dotprodxnpuppet_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dotprodxnpuppet_32fc.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h index b52aeadab..f13edc7ec 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h index 337eff9d7..9a1c6a2bd 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_64f_accumulator_64f.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h index ae54f495f..344f68714 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h index bee647e72..33ec7cfb8 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h index d8dde6548..be20b3b1b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h index 78c2d4c41..70a808b78 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h index 4bf47a50a..0ab8b49e7 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h index 225de080b..fc7368bf9 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h index 0c1234bd2..71cf1d269 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_s8ic_multiply_8ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h index 70a5bb0bd..6af667263 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_dot_prod_8ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h index f2ae27501..be1605040 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_x2_multiply_8ic.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h index 895408486..a1776bd20 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h index 02e5b1a74..cedb20073 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 1efcfde13..48a34ddf7 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,12 +1,8 @@ -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause ######################################################################## 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 d68c973d1..1caaa4826 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,11 +1,11 @@ /* -*- c++ -*- */ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #if HAVE_CONFIG_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h index e61557f7b..3f38b263e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h @@ -4,13 +4,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 053d7c8e7..81f03d355 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #include "qa_utils.h" 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 5a01d64e0..878c73659 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef GNSS_SDR_VOLK_QA_UTILS_H 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 3083dc405..c0105fb21 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,11 +1,10 @@ /* - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * 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 14781ecbc..25d5f984b 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,11 +1,10 @@ /* - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #include "volk_gnsssdr/volk_gnsssdr_malloc.h" 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 c47c62f3d..d358db542 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #include 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 dca205524..69f41f920 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ // clang-format off 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 140731d36..9fdbc7005 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef GNSS_SDR_VOLK_GNSSSDR_RANK_ARCHS_H 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 ee1cc66bf..6c87dc850 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,11 +1,9 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + ######################################################################## # Install python files and apps 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 5fe0f1e57..81aa0b2d6 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,9 +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 -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later The volk_gnsssdr_modtool tool is installed along with VOLK as a way of helping 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 edcde5c59..1f4b8d190 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,14 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# -# from .cfg import volk_gnsssdr_modtool_config from .volk_gnsssdr_modtool_generate import volk_gnsssdr_modtool 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 d871b325f..16b8048af 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,14 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# -# from __future__ import print_function 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 9bd4f7e00..d567b92b6 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,13 +1,10 @@ #!/usr/bin/env python # -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# from __future__ import print_function from volk_gnsssdr_modtool import volk_gnsssdr_modtool, volk_gnsssdr_modtool_config 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 2e86f2538..a8fe52b58 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,12 +1,9 @@ -# -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # +# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # SPDX-License-Identifier: GPL-3.0-or-later -# + from __future__ import print_function import os 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 e6f48691e..372ee1c19 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ // clang-format off 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 60106e84f..b42dfa395 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_RUNTIME @@ -79,4 +79,4 @@ extern VOLK_API volk_gnsssdr_func_desc_t ${kern.name}_get_func_desc(void); __VOLK_DECL_END // clang-format on -#endif /*INCLUDED_VOLK_GNSSSDR_RUNTIME*/ +#endif /* INCLUDED_VOLK_GNSSSDR_RUNTIME */ 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 2bfce5c57..6471fa443 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED_H @@ -17,4 +17,4 @@ #endif %endfor // clang-format on -#endif /*INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED*/ +#endif // INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED 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 4af4031de..ace129dad 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ // clang-format off 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 07b10ab55..2c6469db4 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_CPU_H @@ -29,4 +29,4 @@ unsigned int volk_gnsssdr_get_lvarch(); __VOLK_DECL_END -#endif /*INCLUDED_VOLK_GNSSSDR_CPU_H*/ +#endif /* INCLUDED_VOLK_GNSSSDR_CPU_H */ diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.old.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.old.c index 65af6b623..5b4df33b0 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.old.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.old.c @@ -1,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ // clang-format off 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 4ad4551c8..cfaf50d42 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ // clang-format off 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 09d44f300..59c20ffec 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ // clang-format off 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 3865a9cbe..80d7e80bb 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,11 +1,10 @@ /* - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_LIBVOLK_GNSSSDR_MACHINES_H 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 81051a242..91700ee4b 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,10 +1,10 @@ -/* 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later + * */ #ifndef INCLUDED_VOLK_GNSSSDR_TYPEDEFS @@ -19,4 +19,4 @@ typedef void (*${kern.pname})(${kern.arglist_types}); %endfor // clang-format on -#endif /*INCLUDED_VOLK_GNSSSDR_TYPEDEFS*/ +#endif /* INCLUDED_VOLK_GNSSSDR_TYPEDEFS */ diff --git a/src/algorithms/observables/CMakeLists.txt b/src/algorithms/observables/CMakeLists.txt index fbca8d8aa..164af7fa6 100644 --- a/src/algorithms/observables/CMakeLists.txt +++ b/src/algorithms/observables/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(libs) add_subdirectory(adapters) diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index 917ef5782..e2b0ce826 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_library(obs_adapters STATIC) diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index 8c181fbd8..9061ba4bb 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h index 4834d5812..871d1c7da 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.h +++ b/src/algorithms/observables/adapters/hybrid_observables.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index c62fa0950..d0433b30b 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_library(obs_gr_blocks STATIC) diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index b604ea3b9..1297529ed 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h index c5a448c37..2f3551cd3 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index c44657385..8a6bd81ba 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_library(observables_libs STATIC) diff --git a/src/algorithms/observables/libs/obs_conf.cc b/src/algorithms/observables/libs/obs_conf.cc index ccbfc0bad..5e6b8ae7e 100644 --- a/src/algorithms/observables/libs/obs_conf.cc +++ b/src/algorithms/observables/libs/obs_conf.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * 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 d21a99fba..b3728d688 100644 --- a/src/algorithms/observables/libs/obs_conf.h +++ b/src/algorithms/observables/libs/obs_conf.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/resampler/CMakeLists.txt b/src/algorithms/resampler/CMakeLists.txt index 37ea002b3..bbc63213f 100644 --- a/src/algorithms/resampler/CMakeLists.txt +++ b/src/algorithms/resampler/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt index fe494fdfe..1a0cc1e24 100644 --- a/src/algorithms/resampler/adapters/CMakeLists.txt +++ b/src/algorithms/resampler/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(RESAMPLER_ADAPTER_SOURCES diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index aad0648de..ab8b24f31 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h index 789577272..dca44fe5b 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index a8a9e3a90..c40f4450c 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -55,8 +52,7 @@ MmseResamplerConditioner::MmseResamplerConditioner( std::vector taps = gr::filter::firdes::low_pass(1.0, sample_freq_in_, sample_freq_out_ / 2.1, - sample_freq_out_ / 5, - gr::filter::firdes::win_type::WIN_HAMMING); + sample_freq_out_ / 5); std::cout << "Enabled fractional resampler low pass filter with " << taps.size() << " taps\n"; fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(1, taps); diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h index 13a09b87d..2cf38396f 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt index fe197b56d..8e182b23a 100644 --- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(RESAMPLER_GR_BLOCKS_SOURCES 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 79ead99d2..a243cc957 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 fad0f9a9b..2cda3f4fe 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 d29bdcac9..3a063f81c 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 2506dd0b9..0eb081643 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 26006ad8b..a8b83e6d4 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 3a2a410f4..408ad28b5 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_generator/CMakeLists.txt b/src/algorithms/signal_generator/CMakeLists.txt index 37ea002b3..bbc63213f 100644 --- a/src/algorithms/signal_generator/CMakeLists.txt +++ b/src/algorithms/signal_generator/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt index 6bba504d5..2b08f3c44 100644 --- a/src/algorithms/signal_generator/adapters/CMakeLists.txt +++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_library(signal_generator_adapters STATIC) diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc index 40767c30c..d47db1b17 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.cc +++ b/src/algorithms/signal_generator/adapters/signal_generator.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h index 53766a213..aaa6d091b 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.h +++ b/src/algorithms/signal_generator/adapters/signal_generator.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt index 88d391036..1551b9eeb 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_library(signal_generator_gr_blocks STATIC) diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc index 76460852c..a49f476fe 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h index 23dcd977d..f6423e8ea 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/CMakeLists.txt b/src/algorithms/signal_source/CMakeLists.txt index fbca8d8aa..164af7fa6 100644 --- a/src/algorithms/signal_source/CMakeLists.txt +++ b/src/algorithms/signal_source/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(libs) add_subdirectory(adapters) diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index 5c87fb920..3bd766ff1 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause # Optional drivers diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc index defebfd53..613e981b8 100644 --- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc +++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h index 55758031d..2e1c951a3 100644 --- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h +++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc index d2ccfb078..efacc52cd 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc @@ -5,13 +5,10 @@ * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h index 8e7b70f17..fb3aa39b4 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h @@ -5,13 +5,10 @@ * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index 883a224cf..e41596689 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index c6dcfae78..1ba059a0c 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc index 5efb13c65..4b3996b9e 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h index 79729eb9c..4dca13e68 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc index 57a0e444f..c685cae28 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h index d4389b0b2..1038548cb 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h @@ -8,13 +8,10 @@ * This class represent a fmcomms2 signal source. It use the gr_iio block * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.cc b/src/algorithms/signal_source/adapters/gen_signal_source.cc index 2f307f03d..06fee3486 100644 --- a/src/algorithms/signal_source/adapters/gen_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gen_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h index 16ae3543f..42cff5237 100644 --- a/src/algorithms/signal_source/adapters/gen_signal_source.h +++ b/src/algorithms/signal_source/adapters/gen_signal_source.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc index 1920a5e41..abc0dc58a 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index dafb7e412..01ab5bc2c 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc index 105569f06..c02559e57 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h index 57a17fd45..f93f55570 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.h +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc index 4cf189a11..335458660 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h index a95849a1e..2632777f5 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc index 0a02cb7e9..ad2bc1502 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h index 8fcc304da..642f692f4 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc index a44964a40..c776ad74b 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h index 05dfdf684..a25aad183 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc index 2d4c146b0..e415e2b2a 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h index 5fcef8b76..e27d25c48 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc index f30a93498..bdc4d7352 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h index ea7c69c3d..f61342dc7 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc index 7dd2e93e9..1e0a738c4 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h index 5a2bee4b7..27af99ac5 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc index d62b6e397..e30f1b5ba 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -8,9 +8,7 @@ * * 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 Global Navigation Satellite System software-defined receiver. * This file is not part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc index f3c0587f8..430e44e64 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc @@ -8,9 +8,7 @@ * * 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 Global Navigation Satellite System software-defined receiver. * This file is not part of GNSS-SDR. * * SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc index 30a13a150..f496f11df 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h index f4fe0ee80..59987a623 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc index ac35fe69e..ed43e34c8 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h index 0f79e5347..c87a7759f 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc index 289e64a2d..81ed5e75b 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index 276500b07..8cc9e27ec 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index a71dde216..26fd89c98 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(OPT_DRIVER_SOURCES "") set(OPT_DRIVER_HEADERS "") diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc index a72ee564e..6d43166a7 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc @@ -4,15 +4,13 @@ * \brief Receives ip frames containing samples in UDP frame encapsulation * using a high performance packet capture library (libpcap) * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -329,7 +327,7 @@ void Gr_Complex_Ip_Packet_Source::demux_samples(const gr_vector_void_star &outpu switch (d_wire_sample_type) { case 1: // interleaved byte samples - for (auto &output_item : output_items) + for (const auto &output_item : output_items) { int8_t real; int8_t imag; @@ -346,7 +344,7 @@ void Gr_Complex_Ip_Packet_Source::demux_samples(const gr_vector_void_star &outpu } break; case 2: // 4-bit samples - for (auto &output_item : output_items) + for (const auto &output_item : output_items) { int8_t real; int8_t imag; @@ -381,7 +379,7 @@ void Gr_Complex_Ip_Packet_Source::demux_samples(const gr_vector_void_star &outpu } break; case 3: // interleaved float samples - for (auto &output_item : output_items) + for (const auto &output_item : output_items) { float real; float imag; diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h index 383031e5b..fc3a39da3 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h @@ -4,15 +4,13 @@ * \brief Receives ip frames containing samples in UDP frame encapsulation * using a high performance packet capture library (libpcap) * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc index 791df09fb..44d6f7027 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc @@ -3,15 +3,13 @@ * * \brief Unpacks the Labsat 2 (ls2) and (ls3) capture files * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h index 2de36d3ed..3d04b26e6 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h @@ -3,15 +3,13 @@ * * \brief Unpacks the Labsat 2 (ls2) and (ls3) capture files * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc index 491701281..ecab05cac 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h index 489f071d6..9babb7b15 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc index e350fe90f..cb47400d3 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc @@ -3,15 +3,13 @@ * * \brief Unpacks 2 bit samples that have been packed into bytes or shorts * \author Cillian O'Driscoll cillian.odriscoll (at) gmail.com + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h index 0d30dcf24..fdc09d74e 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h @@ -40,15 +40,13 @@ * Value_0, Value_1, Value_2, ..., Value_n, Value_n+1, Value_n+2, ... * * \author Cillian O'Driscoll cillian.odriscoll (at) gmail . com + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc index 0cf730e9a..6d4142d51 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc @@ -9,13 +9,10 @@ * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h index 5189fbdea..2adc72222 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h @@ -7,15 +7,13 @@ * Least Significant Nibble - Sample n+1 * Packing order in Nibble Q1 Q0 I1 I0 * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc index a722542db..d6a095355 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc @@ -1,17 +1,14 @@ /*! * \file unpack_byte_2bit_samples.cc - * * \brief Unpacks byte samples to NSR 2 bits samples * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h index e3a626d87..21d6363f5 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h @@ -3,15 +3,13 @@ * * \brief Unpacks byte samples to NSR 2 bits samples * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc index b31b0e8bf..ca82f23b5 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc @@ -7,13 +7,10 @@ * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h index ad22d9a1a..2357f13a7 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h @@ -5,15 +5,13 @@ * Packing Order * Packing order in Nibble I0 I1 I2 I3 I0 I1 I2 I3 * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc index cc2bd74db..ab3674d62 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc @@ -1,17 +1,14 @@ /*! * \file unpack_intspir_1bit_samples.cc - * * \brief Unpacks SPIR int samples to NSR 1 bit samples * \author Fran Fabra fabra (at) ice.csic.es + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is not part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h index ebe432aa8..568556a69 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h @@ -3,15 +3,13 @@ * * \brief Unpacks SPIR int samples to NSR 1 bit samples * \author Fran Fabra fabra (at) ice.csic.es + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is not part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc index cbe23ea40..d5e0070c9 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc @@ -1,18 +1,15 @@ /*! * \file unpack_spir_gss6450_samples.cc - * * \brief Unpacks SPIR int samples * \author Antonio Ramos, antonio(at)cttc.es * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is not part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h index 85db05d14..050cf6dec 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h @@ -1,18 +1,15 @@ /*! * \file unpack_spir_gss6450_samples.h - * * \brief Unpacks SPIR int samples * \author Antonio Ramos, antonio.ramos(at)cttc.es * \author Javier Arribas 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is not part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * 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 f6a1c4b52..dc65b1476 100644 --- a/src/algorithms/signal_source/libs/CMakeLists.txt +++ b/src/algorithms/signal_source/libs/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(OPT_SIGNAL_SOURCE_LIB_SOURCES "") set(OPT_SIGNAL_SOURCE_LIB_HEADERS "") diff --git a/src/algorithms/signal_source/libs/ad9361_manager.cc b/src/algorithms/signal_source/libs/ad9361_manager.cc index d6340fddd..651b24819 100644 --- a/src/algorithms/signal_source/libs/ad9361_manager.cc +++ b/src/algorithms/signal_source/libs/ad9361_manager.cc @@ -7,13 +7,10 @@ * https://git.osmocom.org/rtl-sdr * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/ad9361_manager.h b/src/algorithms/signal_source/libs/ad9361_manager.h index bcd05e5c0..3d36c4c46 100644 --- a/src/algorithms/signal_source/libs/ad9361_manager.h +++ b/src/algorithms/signal_source/libs/ad9361_manager.h @@ -5,15 +5,13 @@ * * This file contains information taken from librtlsdr: * https://git.osmocom.org/rtl-sdr + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc b/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc index 9bf2ed2c9..583fbfe0c 100644 --- a/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc +++ b/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.h b/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.h index 538671aa2..90109e5d1 100644 --- a/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.h +++ b/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/fpga_switch.cc b/src/algorithms/signal_source/libs/fpga_switch.cc index 3b631b7fd..4bcbe4dc9 100644 --- a/src/algorithms/signal_source/libs/fpga_switch.cc +++ b/src/algorithms/signal_source/libs/fpga_switch.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/fpga_switch.h b/src/algorithms/signal_source/libs/fpga_switch.h index d272f0a10..b89442471 100644 --- a/src/algorithms/signal_source/libs/fpga_switch.h +++ b/src/algorithms/signal_source/libs/fpga_switch.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc index f1d1e0996..4866b5bb7 100644 --- a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc +++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h index ca8488042..bc6bf12eb 100644 --- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h +++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/rtl_tcp_commands.cc b/src/algorithms/signal_source/libs/rtl_tcp_commands.cc index c72a39d61..b1685adf7 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_commands.cc +++ b/src/algorithms/signal_source/libs/rtl_tcp_commands.cc @@ -7,13 +7,10 @@ * https://git.osmocom.org/rtl-sdr * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/rtl_tcp_commands.h b/src/algorithms/signal_source/libs/rtl_tcp_commands.h index 7b6811a15..a7c588539 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_commands.h +++ b/src/algorithms/signal_source/libs/rtl_tcp_commands.h @@ -7,17 +7,15 @@ * https://git.osmocom.org/rtl-sdr * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_RTL_TCP_COMMANDS_H #define GNSS_SDR_RTL_TCP_COMMANDS_H diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc index d92fd06d7..eafb05f6c 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc +++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc @@ -8,13 +8,10 @@ * https://git.osmocom.org/rtl-sdr * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h index 0ef5f03c8..2b0f469d9 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h +++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h @@ -7,13 +7,10 @@ * https://git.osmocom.org/rtl-sdr * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/CMakeLists.txt b/src/algorithms/telemetry_decoder/CMakeLists.txt index 79a937fb4..013023ecb 100644 --- a/src/algorithms/telemetry_decoder/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt index 5e2542ddd..a374f25d0 100644 --- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(TELEMETRY_DECODER_ADAPTER_SOURCES diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc index 2eaa17103..da0925b1f 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h index dc20d3838..82b619dd7 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc index 9dd220fe1..3932a4fa0 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h index 40969f3ac..73cf9d8b0 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc index bd5c5ff94..8b87d1026 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h index 914baf31d..725b64d46 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc index b859b4eb3..0ecb44ba9 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h index 52a3e8713..5d70f7bca 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.cc index d5666ce84..c1bbc442c 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.h index 1331565de..7641c9aa5 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5b_telemetry_decoder.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.cc index 0dba7e238..6543b6b62 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.h index 34608ed13..5907d973e 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e6_telemetry_decoder.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc index 4ce135ee6..e8effb547 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h index fddfd2fd6..197fcc8fa 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc index 188f827c3..680805bea 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h index c0e535eca..b844348c6 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc index a707502d4..720caf8f8 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index 3bbe21f9c..628766ef1 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc index 7a5325f60..5ecacb621 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h index 225c17278..dd4298417 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc index a6d80ebe6..c626a1eec 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h index 67e879d68..62ea658e0 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 8c8310ff8..b246d4f26 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index fd31ea9cf..314ae4d51 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt index 690c5af3d..8fd6c9189 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(TELEMETRY_DECODER_GR_BLOCKS_SOURCES gps_l1_ca_telemetry_decoder_gs.cc diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc index e84cbb77b..a4ace3b1a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h index 5b07f5fb4..29810ea18 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc index 5256eed11..c680e3914 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h index eb5bd6548..c715e17f2 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index b4409bdd3..a065c4721 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -84,16 +81,16 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs( { case 1: // INAV { - d_PRN_code_period_ms = static_cast(GALILEO_E1_CODE_PERIOD_MS); // for Galileo E5b is also 4 ms + d_PRN_code_period_ms = GALILEO_E1_CODE_PERIOD_MS; // for Galileo E5b is also 4 ms d_bits_per_preamble = GALILEO_INAV_PREAMBLE_LENGTH_BITS; // set the preamble d_samples_per_preamble = GALILEO_INAV_PREAMBLE_LENGTH_BITS; d_preamble_period_symbols = GALILEO_INAV_PREAMBLE_PERIOD_SYMBOLS; - d_required_symbols = static_cast(GALILEO_INAV_PAGE_SYMBOLS) + d_samples_per_preamble; + d_required_symbols = GALILEO_INAV_PAGE_SYMBOLS + d_samples_per_preamble; // preamble bits to sampled symbols d_preamble_samples.reserve(d_samples_per_preamble); d_frame_length_symbols = GALILEO_INAV_PAGE_PART_SYMBOLS - GALILEO_INAV_PREAMBLE_LENGTH_BITS; - d_codelength = GALILEO_INAV_PAGE_PART_SYMBOLS - GALILEO_INAV_PREAMBLE_LENGTH_BITS; + d_codelength = static_cast(d_frame_length_symbols); d_datalength = (d_codelength / d_nn) - d_mm; d_max_symbols_without_valid_frame = GALILEO_INAV_PAGE_SYMBOLS * 30; // rise alarm 60 seconds without valid tlm @@ -110,21 +107,21 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs( // preamble bits to sampled symbols d_preamble_samples.reserve(d_samples_per_preamble); d_frame_length_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS; - d_codelength = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS; + d_codelength = static_cast(d_frame_length_symbols); d_datalength = (d_codelength / d_nn) - d_mm; d_max_symbols_without_valid_frame = GALILEO_FNAV_SYMBOLS_PER_PAGE * 5; // rise alarm 100 seconds without valid tlm break; } case 3: // CNAV { - d_PRN_code_period_ms = static_cast(GALILEO_E6_CODE_PERIOD_MS); + d_PRN_code_period_ms = GALILEO_E6_CODE_PERIOD_MS; d_bits_per_preamble = GALILEO_CNAV_PREAMBLE_LENGTH_BITS; d_samples_per_preamble = GALILEO_CNAV_PREAMBLE_LENGTH_BITS; d_preamble_period_symbols = GALILEO_CNAV_SYMBOLS_PER_PAGE; d_required_symbols = static_cast(GALILEO_CNAV_SYMBOLS_PER_PAGE) + d_samples_per_preamble; d_preamble_samples.reserve(d_samples_per_preamble); d_frame_length_symbols = GALILEO_CNAV_SYMBOLS_PER_PAGE - GALILEO_CNAV_PREAMBLE_LENGTH_BITS; - d_codelength = GALILEO_CNAV_SYMBOLS_PER_PAGE - GALILEO_CNAV_PREAMBLE_LENGTH_BITS; + d_codelength = static_cast(d_frame_length_symbols); d_datalength = (d_codelength / d_nn) - d_mm; d_max_symbols_without_valid_frame = GALILEO_CNAV_SYMBOLS_PER_PAGE * 60; break; @@ -607,6 +604,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( } default: { + LOG(WARNING) << "Frame type " << d_frame_type << " is not defined"; d_symbol_history.push_back(current_symbol.Prompt_I); break; } @@ -784,7 +782,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( { case 1: // INAV { - if (d_inav_nav.is_TOW_set() == true) + if (d_inav_nav.get_flag_TOW_set() == true) { if (d_inav_nav.is_TOW5_set() == true) // page 5 arrived and decoded, so we are in the odd page (since Tow refers to the even page, we have to add 1 sec) { @@ -794,7 +792,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( d_inav_nav.set_TOW5_flag(false); } - else if (d_inav_nav.is_TOW5_set() == true) // page 6 arrived and decoded, so we are in the odd page (since Tow refers to the even page, we have to add 1 sec) + else if (d_inav_nav.is_TOW6_set() == true) // page 6 arrived and decoded, so we are in the odd page (since Tow refers to the even page, we have to add 1 sec) { // TOW_6 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay d_TOW_at_Preamble_ms = static_cast(d_inav_nav.get_TOW6() * 1000.0); @@ -804,14 +802,14 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( else { // this page has no timing information - d_TOW_at_current_symbol_ms += static_cast(d_PRN_code_period_ms); // + GALILEO_INAV_PAGE_PART_SYMBOLS*GALILEO_E1_CODE_PERIOD_S; + d_TOW_at_current_symbol_ms += d_PRN_code_period_ms; } } break; } case 2: // FNAV { - if (d_fnav_nav.is_TOW_set() == true) + if (d_fnav_nav.get_flag_TOW_set() == true) { if (d_fnav_nav.is_TOW1_set() == true) { @@ -860,7 +858,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( { case 1: // INAV { - if (d_inav_nav.is_TOW_set() == true) + if (d_inav_nav.get_flag_TOW_set() == true) { d_TOW_at_current_symbol_ms += d_PRN_code_period_ms; } @@ -868,7 +866,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( } case 2: // FNAV { - if (d_fnav_nav.is_TOW_set() == true) + if (d_fnav_nav.get_flag_TOW_set() == true) { d_TOW_at_current_symbol_ms += d_PRN_code_period_ms; } @@ -886,9 +884,9 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( { case 1: // INAV { - if (d_inav_nav.is_TOW_set()) + if (d_inav_nav.get_flag_TOW_set() == true) { - if (d_inav_nav.get_flag_GGTO()) // all GGTO parameters arrived + if (d_inav_nav.get_flag_GGTO() == true) // all GGTO parameters arrived { d_delta_t = d_inav_nav.get_A0G() + d_inav_nav.get_A1G() * (static_cast(d_TOW_at_current_symbol_ms) / 1000.0 - d_inav_nav.get_t0G() + 604800.0 * (std::fmod(static_cast(d_inav_nav.get_Galileo_week() - d_inav_nav.get_WN0G()), 64.0))); } @@ -900,7 +898,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( case 2: // FNAV { - if (d_fnav_nav.is_TOW_set()) + if (d_fnav_nav.get_flag_TOW_set() == true) { current_symbol.Flag_valid_word = true; } @@ -913,7 +911,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( } } - if (d_inav_nav.is_TOW_set() or d_fnav_nav.is_TOW_set()) + if (d_inav_nav.get_flag_TOW_set() == true or d_fnav_nav.get_flag_TOW_set() == true) { current_symbol.TOW_at_current_symbol_ms = d_TOW_at_current_symbol_ms; // todo: Galileo to GPS time conversion should be moved to observable block. diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h index eec8d3ce4..7243613ce 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc index a2c75e08a..beccf34d3 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h index 74adb1068..5bcc5ba77 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc index fc7aad5a9..6c3608a1f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h index a02ae658b..a259d237a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h index dae94c761..e368fac93 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h @@ -5,13 +5,10 @@ * \author Javier Arribas, 2011. 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc index 018793f98..fbcbc32e4 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h index 5ff1a6681..8316b4eda 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h @@ -2,15 +2,13 @@ * \file gps_l2c_telemetry_decoder_gs.h * \brief Interface of a CNAV message demodulator block * \author Javier Arribas, 2015. 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc index 88aa5f996..4e49b72e2 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h index bc351f6b8..a084f07c8 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h @@ -4,13 +4,10 @@ * \author Antonio Ramos, 2017. antonio.ramos(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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc index 5e8822bc4..fdde049eb 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h index f89634e21..3e12b9eeb 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt index e0e5aa7c9..d08dc2f9d 100644 --- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(libswiftcnav) diff --git a/src/algorithms/telemetry_decoder/libs/convolutional.h b/src/algorithms/telemetry_decoder/libs/convolutional.h index 603fa979c..2dae42adb 100644 --- a/src/algorithms/telemetry_decoder/libs/convolutional.h +++ b/src/algorithms/telemetry_decoder/libs/convolutional.h @@ -6,14 +6,11 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2006-2008 Matthew C. Valenti - * Copyright (C) 2019 C. Fernandez-Prades - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2006-2008 Matthew C. Valenti + * Copyright (C) 2019 C. Fernandez-Prades * SPDX-License-Identifier: GPL-3.0-or-later * * This file is a derived work of the original file, which had this note: diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt index 33725d274..2e7e985de 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES cnav_msg.c diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c index 67ba0d488..c7b36e4ac 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c @@ -3,6 +3,9 @@ * \author Fergus Noble * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -11,13 +14,8 @@ * Copyright (C) 2013, 2016 Swift Navigation Inc. * Contact: Fergus Noble * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ #include "bits.h" diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h index f861f44a6..79cb3a83e 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h @@ -4,6 +4,9 @@ * \author Fergus Noble * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -12,13 +15,8 @@ * Copyright (C) 2013, 2016 Swift Navigation Inc. * Contact: Fergus Noble * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ #ifndef GNSS_SDR_BITS_H diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c index e19bcead8..d7e4e5e24 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c @@ -3,6 +3,9 @@ * \author Valeri Atamaniouk * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -11,13 +14,8 @@ * Copyright (C) 2016 Swift Navigation Inc. * Contact: Valeri Atamaniouk * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ @@ -71,7 +69,7 @@ const uint32_t GPS_CNAV_PREAMBLE2 = 0x74U; /* (0b01110100u) */ * * \private */ -static uint32_t _cnav_compute_crc(cnav_v27_part_t *part) +static uint32_t cnav_compute_crc_(cnav_v27_part_t *part) { uint32_t crc = crc24q_bits(0, part->decoded, GPS_CNAV_MSG_DATA_LENGTH, part->invert); @@ -90,7 +88,7 @@ static uint32_t _cnav_compute_crc(cnav_v27_part_t *part) * * \private */ -static uint32_t _cnav_extract_crc(const cnav_v27_part_t *part) +static uint32_t cnav_extract_crc_(const cnav_v27_part_t *part) { uint32_t crc = getbitu(part->decoded, GPS_CNAV_MSG_DATA_LENGTH, GPS_CNAV_MSG_CRC_LENGTH); @@ -116,7 +114,7 @@ static uint32_t _cnav_extract_crc(const cnav_v27_part_t *part) * * \private */ -static void _cnav_rescan_preamble(cnav_v27_part_t *part) +static void cnav_rescan_preamble_(cnav_v27_part_t *part) { part->preamble_seen = false; @@ -161,7 +159,7 @@ static void _cnav_rescan_preamble(cnav_v27_part_t *part) * * \private */ -static void _cnav_add_symbol(cnav_v27_part_t *part, uint8_t ch) +static void cnav_add_symbol_(cnav_v27_part_t *part, uint8_t ch) { part->symbols[part->n_symbols++] = ch; @@ -224,14 +222,14 @@ static void _cnav_add_symbol(cnav_v27_part_t *part, uint8_t ch) if (!part->preamble_seen) { /* Rescan for preamble if possible. The first bit is ignored. */ - _cnav_rescan_preamble(part); + cnav_rescan_preamble_(part); } if (part->preamble_seen && GPS_CNAV_MSG_LENGTH <= part->n_decoded) { /* We have collected 300 bits starting from message preamble. Now try * to compute CRC-24Q */ - const uint32_t crc = _cnav_compute_crc(part); - const uint32_t crc2 = _cnav_extract_crc(part); + const uint32_t crc = cnav_compute_crc_(part); + const uint32_t crc2 = cnav_extract_crc_(part); if (part->message_lock) { @@ -292,7 +290,7 @@ static void _cnav_add_symbol(cnav_v27_part_t *part, uint8_t ch) * * \return None */ -static void _cnav_msg_invert(cnav_v27_part_t *part) +static void cnav_msg_invert_(cnav_v27_part_t *part) { size_t i = 0; for (i = 0; i < sizeof(part->decoded); i++) @@ -322,7 +320,7 @@ static void _cnav_msg_invert(cnav_v27_part_t *part) * * \private */ -static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, uint32_t *delay) +static bool cnav_msg_decode_(cnav_v27_part_t *part, cnav_msg_t *msg, uint32_t *delay) { bool res = false; if (GPS_CNAV_MSG_LENGTH <= part->n_decoded) @@ -332,7 +330,7 @@ static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, uint32_t *d /* CRC is OK */ if (part->invert) { - _cnav_msg_invert(part); + cnav_msg_invert_(part); } msg->prn = getbitu(part->decoded, 8, 6); @@ -347,7 +345,7 @@ static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, uint32_t *d if (part->invert) { - _cnav_msg_invert(part); + cnav_msg_invert_(part); } res = true; } @@ -388,7 +386,7 @@ void cnav_msg_decoder_init(cnav_msg_decoder_t *dec) 0); dec->part1.init = true; dec->part2.init = true; - _cnav_add_symbol(&dec->part2, 0x80); + cnav_add_symbol_(&dec->part2, 0x80); } /** @@ -419,22 +417,22 @@ bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec, cnav_msg_t *msg, uint32_t *pdelay) { - _cnav_add_symbol(&dec->part1, symbol); - _cnav_add_symbol(&dec->part2, symbol); + cnav_add_symbol_(&dec->part1, symbol); + cnav_add_symbol_(&dec->part2, symbol); if (dec->part1.message_lock) { /* Flush data in decoder. */ dec->part2.n_decoded = 0; dec->part2.n_symbols = 0; - return _cnav_msg_decode(&dec->part1, msg, pdelay); + return cnav_msg_decode_(&dec->part1, msg, pdelay); } if (dec->part2.message_lock) { /* Flush data in decoder. */ dec->part1.n_decoded = 0; dec->part1.n_symbols = 0; - return _cnav_msg_decode(&dec->part2, msg, pdelay); + return cnav_msg_decode_(&dec->part2, msg, pdelay); } return false; diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h index 6be609101..88ddf2b0d 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h @@ -4,6 +4,9 @@ * \author Valeri Atamaniouk * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -12,13 +15,8 @@ * Copyright (C) 2016 Swift Navigation Inc. * Contact: Valeri Atamaniouk * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c index 87a8c161b..2591a1a3b 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c @@ -3,6 +3,9 @@ * \author Fergus Noble * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -11,13 +14,8 @@ * Copyright (C) 2010 Swift Navigation Inc. * Contact: Fergus Noble * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ #include "edc.h" diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h index 224e33484..bda073207 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h @@ -4,6 +4,9 @@ * \author Fergus Noble * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -12,13 +15,8 @@ * Copyright (C) 2010 Swift Navigation Inc. * Contact: Fergus Noble * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h index 3774c83f4..f1a20335c 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h @@ -4,6 +4,9 @@ * \author Phil Karn, KA9Q * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -11,13 +14,8 @@ * * Copyright (C) 2004, Phil Karn, KA9Q * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h index f7546120a..9943c6347 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h @@ -5,6 +5,9 @@ * Fergus Noble * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -14,13 +17,8 @@ * Contact: Henry Hallam * Fergus Noble * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c index 47d43c36c..77b0ac595 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c @@ -4,6 +4,9 @@ * \brief K=7 r=1/2 Viterbi decoder in portable C * * ----------------------------------------------------------------------------- + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. + * This file is part of GNSS-SDR. + * * This file was originally borrowed from libswiftnav * , * a portable C library implementing GNSS related functions and algorithms, @@ -11,13 +14,8 @@ * * Copyright (C) 2004, Phil Karn, KA9Q * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * - * This file is part of GNSS-SDR. - * * SPDX-License-Identifier: LGPL-3.0-only - *. + * */ diff --git a/src/algorithms/telemetry_decoder/libs/tlm_conf.cc b/src/algorithms/telemetry_decoder/libs/tlm_conf.cc index cd81b8085..1a78472bf 100644 --- a/src/algorithms/telemetry_decoder/libs/tlm_conf.cc +++ b/src/algorithms/telemetry_decoder/libs/tlm_conf.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -24,6 +21,7 @@ Tlm_Conf::Tlm_Conf() { dump = false; dump_mat = false; + remove_dat = false; } diff --git a/src/algorithms/telemetry_decoder/libs/tlm_conf.h b/src/algorithms/telemetry_decoder/libs/tlm_conf.h index f925cd4e6..13003b47c 100644 --- a/src/algorithms/telemetry_decoder/libs/tlm_conf.h +++ b/src/algorithms/telemetry_decoder/libs/tlm_conf.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/libs/tlm_utils.cc b/src/algorithms/telemetry_decoder/libs/tlm_utils.cc index bf1caf892..03246f02c 100644 --- a/src/algorithms/telemetry_decoder/libs/tlm_utils.cc +++ b/src/algorithms/telemetry_decoder/libs/tlm_utils.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/libs/tlm_utils.h b/src/algorithms/telemetry_decoder/libs/tlm_utils.h index c20d01c1e..dc00cd94e 100644 --- a/src/algorithms/telemetry_decoder/libs/tlm_utils.h +++ b/src/algorithms/telemetry_decoder/libs/tlm_utils.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc index de3bf1479..93d8d1fd6 100644 --- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc +++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h index 1871394ac..a25c0b7b0 100644 --- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h +++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/CMakeLists.txt b/src/algorithms/tracking/CMakeLists.txt index 79a937fb4..013023ecb 100644 --- a/src/algorithms/tracking/CMakeLists.txt +++ b/src/algorithms/tracking/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index 9ac82be43..b4110e1c0 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(OPT_TRACKING_ADAPTERS_SOURCES "") set(OPT_TRACKING_ADAPTERS_HEADERS "") diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc index 5940e7c30..b9ca4f26f 100644 --- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h index d6de574bb..d1d72078b 100644 --- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc index ad819b26f..50d7e7db9 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h index 3b8435a7f..484a00932 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc index bf9812466..e9de4c014 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h index dbdaf781d..574f8434f 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc index ccfc102ab..d43aa5270 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h index cc8305f87..72c008600 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc index cb95f2c0d..6ce6613fb 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h index c76f262e8..3dd9aa9e8 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc index cfee92871..38a88833e 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc @@ -11,17 +11,15 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- */ + #include "galileo_e5a_dll_pll_tracking.h" #include "Galileo_E5a.h" #include "configuration_interface.h" diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h index 134e227f7..5cc1d2fc8 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc index 0194357b6..d0cce92eb 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h index a75fd0a51..9cf247403 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.cc index 99a7f3124..ef072c0ff 100644 --- a/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.h index b910e19cb..bda52e3de 100644 --- a/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e5b_dll_pll_tracking.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.cc index 3f12b97c4..5fb8dfa82 100644 --- a/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.h index 3f2947409..d4a66c50f 100644 --- a/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e6_dll_pll_tracking.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc index 7b36fb698..3f5814abd 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h index 89dc6d169..ff535bb97 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc index a7e6304f6..4d34b8da2 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h index b8278e3a2..dae9bbf58 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc index 319fb3668..061d2a064 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h index acd62580b..65a2754ea 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc index af68d4a35..1d6759676 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h index 2e5a726d6..1bc541c3a 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc index 0c5dcf7c0..768888b12 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h index eb67be0f5..53c1b7cc0 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc index 06826f427..7fd7792a6 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h index 61aad4a4a..25ad59132 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc index 784050ee2..94001c8bd 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h index 167a760b5..e4f5cdd5b 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc index 703160fc7..bba2cb308 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h index 03a99550d..a0c886bde 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc index b89eba553..4360ba61f 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h index 0febc6039..ded02212c 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc index ea10d2d94..fdfd11948 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h index fd89824fc..874e74eba 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc index e2e3869ed..f96a723a1 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h index cb203401e..cf2a4a30a 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc index d1936fc5e..e14a01327 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h index ed159f973..1cd1353dc 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc index a3aba284f..46582013b 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h index a9ac97233..1376e69a7 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index af38671f5..ac2bb641a 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + set(OPT_TRACKING_BLOCKS_SOURCES "") set(OPT_TRACKING_BLOCKS_HEADERS "") diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index bcc075c9e..2498055e4 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h index e3724eb0e..71948e4f0 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index 4347fef72..4b24feb7f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -11,17 +11,15 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- */ + #include "dll_pll_veml_tracking_fpga.h" #include "GPS_L1_CA.h" #include "GPS_L2C.h" diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h index 154e8da83..9233f2715 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc index 202ad3f4e..887e282fe 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h index a8dffde79..1277cbed6 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc index 55a54e818..cd222856a 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h index c418e9e73..c1a530fd3 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc index 12b6aa834..5131063e3 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h index 14cfb4242..3cdaed909 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 4aaec2ee9..700a43a25 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 @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h index a18ce893d..dbfb8e1d0 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc index 4c17b1022..739d029f9 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h index eadf8b69c..dad366a48 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc index 5c4432b88..969d5aef5 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h index c83bd4353..8fedd8ad7 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc index 1592bc062..2e98170d6 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h index 5f951d5a0..6ed8cd636 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc index 6bb56aa92..858244669 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h index 5c0f9270b..f093a2865 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc index 50f985b14..b65713b46 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h index 75c317a91..56b0fbda5 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h @@ -14,13 +14,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc index aee2d5576..1322784eb 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h index 0a7feb14a..5c29377e8 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index fd470a502..9f7c42f7b 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(TRACKING_LIB_SOURCES diff --git a/src/algorithms/tracking/libs/bayesian_estimation.cc b/src/algorithms/tracking/libs/bayesian_estimation.cc index b49845aea..888ad0661 100644 --- a/src/algorithms/tracking/libs/bayesian_estimation.cc +++ b/src/algorithms/tracking/libs/bayesian_estimation.cc @@ -19,13 +19,10 @@ *
* ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/bayesian_estimation.h b/src/algorithms/tracking/libs/bayesian_estimation.h index 5b683e524..d7e40f86e 100644 --- a/src/algorithms/tracking/libs/bayesian_estimation.h +++ b/src/algorithms/tracking/libs/bayesian_estimation.h @@ -19,13 +19,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc index 8854b2ae0..d82d740b1 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.h b/src/algorithms/tracking/libs/cpu_multicorrelator.h index 4926f0ec7..4197d6c1d 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator.h +++ b/src/algorithms/tracking/libs/cpu_multicorrelator.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc index 8f4ccd345..93792d504 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h index b413a366d..2e35ab2d9 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h +++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc index 72adf53c4..7c45363ad 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h index e99cb16dc..9200529a0 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h +++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/cuda_multicorrelator.h b/src/algorithms/tracking/libs/cuda_multicorrelator.h index 9b2fdf4ff..e23c698ef 100644 --- a/src/algorithms/tracking/libs/cuda_multicorrelator.h +++ b/src/algorithms/tracking/libs/cuda_multicorrelator.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/dll_pll_conf.cc b/src/algorithms/tracking/libs/dll_pll_conf.cc index 338fe5fe8..33da12bf9 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf.cc +++ b/src/algorithms/tracking/libs/dll_pll_conf.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/dll_pll_conf.h b/src/algorithms/tracking/libs/dll_pll_conf.h index 56795a991..0da13321b 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf.h +++ b/src/algorithms/tracking/libs/dll_pll_conf.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc b/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc index c836a8687..5f6e5a098 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc +++ b/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/dll_pll_conf_fpga.h b/src/algorithms/tracking/libs/dll_pll_conf_fpga.h index 4c5b5a939..76fd76136 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf_fpga.h +++ b/src/algorithms/tracking/libs/dll_pll_conf_fpga.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/exponential_smoother.cc b/src/algorithms/tracking/libs/exponential_smoother.cc index d1d87371f..160a62e72 100644 --- a/src/algorithms/tracking/libs/exponential_smoother.cc +++ b/src/algorithms/tracking/libs/exponential_smoother.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/exponential_smoother.h b/src/algorithms/tracking/libs/exponential_smoother.h index af6083cde..a3abb9ea8 100644 --- a/src/algorithms/tracking/libs/exponential_smoother.h +++ b/src/algorithms/tracking/libs/exponential_smoother.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/fpga_multicorrelator.cc b/src/algorithms/tracking/libs/fpga_multicorrelator.cc index ad9118fa7..a962dfbe1 100644 --- a/src/algorithms/tracking/libs/fpga_multicorrelator.cc +++ b/src/algorithms/tracking/libs/fpga_multicorrelator.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/fpga_multicorrelator.h b/src/algorithms/tracking/libs/fpga_multicorrelator.h index aadb5df30..f67520f63 100644 --- a/src/algorithms/tracking/libs/fpga_multicorrelator.h +++ b/src/algorithms/tracking/libs/fpga_multicorrelator.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/lock_detectors.cc b/src/algorithms/tracking/libs/lock_detectors.cc index 1e304bdd8..0d9a716dd 100644 --- a/src/algorithms/tracking/libs/lock_detectors.cc +++ b/src/algorithms/tracking/libs/lock_detectors.cc @@ -23,13 +23,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/lock_detectors.h b/src/algorithms/tracking/libs/lock_detectors.h index b951384b7..eb0eb93ef 100644 --- a/src/algorithms/tracking/libs/lock_detectors.h +++ b/src/algorithms/tracking/libs/lock_detectors.h @@ -20,15 +20,13 @@ *
  • Javier Arribas, 2011. jarribas(at)cttc.es *
  • Luis Esteve, 2012. luis(at)epsilon-formacion.com * + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/nonlinear_tracking.cc b/src/algorithms/tracking/libs/nonlinear_tracking.cc index 3bab95f91..081f51252 100644 --- a/src/algorithms/tracking/libs/nonlinear_tracking.cc +++ b/src/algorithms/tracking/libs/nonlinear_tracking.cc @@ -17,13 +17,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/nonlinear_tracking.h b/src/algorithms/tracking/libs/nonlinear_tracking.h index abc49289e..f00671f8d 100644 --- a/src/algorithms/tracking/libs/nonlinear_tracking.h +++ b/src/algorithms/tracking/libs/nonlinear_tracking.h @@ -17,13 +17,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tcp_communication.cc b/src/algorithms/tracking/libs/tcp_communication.cc index 1bf6505a2..4ca44e734 100644 --- a/src/algorithms/tracking/libs/tcp_communication.cc +++ b/src/algorithms/tracking/libs/tcp_communication.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tcp_communication.h b/src/algorithms/tracking/libs/tcp_communication.h index 88211a579..8c9693e5c 100644 --- a/src/algorithms/tracking/libs/tcp_communication.h +++ b/src/algorithms/tracking/libs/tcp_communication.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tcp_packet_data.cc b/src/algorithms/tracking/libs/tcp_packet_data.cc index 45f52383d..75d27fcdc 100644 --- a/src/algorithms/tracking/libs/tcp_packet_data.cc +++ b/src/algorithms/tracking/libs/tcp_packet_data.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tcp_packet_data.h b/src/algorithms/tracking/libs/tcp_packet_data.h index f012931cf..1b8c7236a 100644 --- a/src/algorithms/tracking/libs/tcp_packet_data.h +++ b/src/algorithms/tracking/libs/tcp_packet_data.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc index d7d51d346..d60a2accf 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc +++ b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h index ae992516a..322797e46 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h +++ b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc index ecf0103f5..5e162b4df 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc +++ b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h index 1a4240391..b19554272 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h +++ b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc index 98d7cd246..e478cb061 100644 --- a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc +++ b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h index cc42a9ccf..570b235e8 100644 --- a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h +++ b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_discriminators.cc b/src/algorithms/tracking/libs/tracking_discriminators.cc index 93e4a8158..39917c3a0 100644 --- a/src/algorithms/tracking/libs/tracking_discriminators.cc +++ b/src/algorithms/tracking/libs/tracking_discriminators.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_discriminators.h b/src/algorithms/tracking/libs/tracking_discriminators.h index 834d511fc..2ad4787d3 100644 --- a/src/algorithms/tracking/libs/tracking_discriminators.h +++ b/src/algorithms/tracking/libs/tracking_discriminators.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_loop_filter.cc b/src/algorithms/tracking/libs/tracking_loop_filter.cc index 9d0843485..a722f6ffa 100644 --- a/src/algorithms/tracking/libs/tracking_loop_filter.cc +++ b/src/algorithms/tracking/libs/tracking_loop_filter.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/algorithms/tracking/libs/tracking_loop_filter.h b/src/algorithms/tracking/libs/tracking_loop_filter.h index 2b9748617..6ab5cc9c1 100644 --- a/src/algorithms/tracking/libs/tracking_loop_filter.h +++ b/src/algorithms/tracking/libs/tracking_loop_filter.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ffeb70575..b09737dfb 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(system_parameters) add_subdirectory(libs) diff --git a/src/core/interfaces/acquisition_interface.h b/src/core/interfaces/acquisition_interface.h index ac3c3de0b..f72aabce3 100644 --- a/src/core/interfaces/acquisition_interface.h +++ b/src/core/interfaces/acquisition_interface.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/channel_interface.h b/src/core/interfaces/channel_interface.h index 68cf43774..da0da3ccc 100644 --- a/src/core/interfaces/channel_interface.h +++ b/src/core/interfaces/channel_interface.h @@ -11,13 +11,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/configuration_interface.h b/src/core/interfaces/configuration_interface.h index 7d28f4454..ab331cd1b 100644 --- a/src/core/interfaces/configuration_interface.h +++ b/src/core/interfaces/configuration_interface.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h index a3e100a88..0a2de5d6e 100644 --- a/src/core/interfaces/gnss_block_interface.h +++ b/src/core/interfaces/gnss_block_interface.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/observables_interface.h b/src/core/interfaces/observables_interface.h index c326bda0a..11d7e1618 100644 --- a/src/core/interfaces/observables_interface.h +++ b/src/core/interfaces/observables_interface.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/pvt_interface.h b/src/core/interfaces/pvt_interface.h index d5dfc8806..9709b7438 100644 --- a/src/core/interfaces/pvt_interface.h +++ b/src/core/interfaces/pvt_interface.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/telemetry_decoder_interface.h b/src/core/interfaces/telemetry_decoder_interface.h index e044f7198..864995fbf 100644 --- a/src/core/interfaces/telemetry_decoder_interface.h +++ b/src/core/interfaces/telemetry_decoder_interface.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/interfaces/tracking_interface.h b/src/core/interfaces/tracking_interface.h index e94a2aff4..1c815060f 100644 --- a/src/core/interfaces/tracking_interface.h +++ b/src/core/interfaces/tracking_interface.h @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index c14fbe529..587e33fb9 100644 --- a/src/core/libs/CMakeLists.txt +++ b/src/core/libs/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(supl) diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc index 5abee6a6c..f45ddcc9e 100644 --- a/src/core/libs/INIReader.cc +++ b/src/core/libs/INIReader.cc @@ -38,7 +38,7 @@ INIReader::INIReader(const std::string& filename) } -int INIReader::ParseError() +int INIReader::ParseError() const { return _error; } diff --git a/src/core/libs/INIReader.h b/src/core/libs/INIReader.h index afc65976b..0cd269a38 100644 --- a/src/core/libs/INIReader.h +++ b/src/core/libs/INIReader.h @@ -49,7 +49,7 @@ public: explicit INIReader(const std::string& filename); //! Return the result of ini_parse(), i.e., 0 on success, line number of first error on parse error, or -1 on file open error. - int ParseError(); + int ParseError() const; //! Get a string value from INI file, returning default_value if not found. std::string Get(const std::string& section, const std::string& name, diff --git a/src/core/libs/channel_event.cc b/src/core/libs/channel_event.cc index 4c59110f9..818d25a7d 100644 --- a/src/core/libs/channel_event.cc +++ b/src/core/libs/channel_event.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/channel_event.h b/src/core/libs/channel_event.h index f03b23cdd..6ca91c67a 100644 --- a/src/core/libs/channel_event.h +++ b/src/core/libs/channel_event.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index 72757ecfb..7093018a4 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/channel_status_msg_receiver.h b/src/core/libs/channel_status_msg_receiver.h index 9c9ab8d80..5168dc690 100644 --- a/src/core/libs/channel_status_msg_receiver.h +++ b/src/core/libs/channel_status_msg_receiver.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/command_event.cc b/src/core/libs/command_event.cc index 7372de00d..9a4cc539f 100644 --- a/src/core/libs/command_event.cc +++ b/src/core/libs/command_event.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/command_event.h b/src/core/libs/command_event.h index 2cc77ed84..461d63642 100644 --- a/src/core/libs/command_event.h +++ b/src/core/libs/command_event.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/gnss_sdr_fpga_sample_counter.cc b/src/core/libs/gnss_sdr_fpga_sample_counter.cc index 77a974d32..57bd274ed 100644 --- a/src/core/libs/gnss_sdr_fpga_sample_counter.cc +++ b/src/core/libs/gnss_sdr_fpga_sample_counter.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -274,7 +271,7 @@ int gnss_sdr_fpga_sample_counter::general_work(int noutput_items __attribute__(( } -void gnss_sdr_fpga_sample_counter::wait_for_interrupt() +void gnss_sdr_fpga_sample_counter::wait_for_interrupt() const { int32_t irq_count; ssize_t nb; diff --git a/src/core/libs/gnss_sdr_fpga_sample_counter.h b/src/core/libs/gnss_sdr_fpga_sample_counter.h index a59cea1f9..5ace34391 100644 --- a/src/core/libs/gnss_sdr_fpga_sample_counter.h +++ b/src/core/libs/gnss_sdr_fpga_sample_counter.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -63,7 +60,7 @@ private: void open_device(void); bool start(); bool stop(); - void wait_for_interrupt(void); + void wait_for_interrupt(void) const; volatile uint32_t *map_base; // driver memory map diff --git a/src/core/libs/gnss_sdr_sample_counter.cc b/src/core/libs/gnss_sdr_sample_counter.cc index 17d175d6a..dc1412d41 100644 --- a/src/core/libs/gnss_sdr_sample_counter.cc +++ b/src/core/libs/gnss_sdr_sample_counter.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/gnss_sdr_sample_counter.h b/src/core/libs/gnss_sdr_sample_counter.h index c5b816d01..40e54d47e 100644 --- a/src/core/libs/gnss_sdr_sample_counter.h +++ b/src/core/libs/gnss_sdr_sample_counter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc index 6621e675b..de7628f34 100644 --- a/src/core/libs/gnss_sdr_supl_client.cc +++ b/src/core/libs/gnss_sdr_supl_client.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h index ef95f2764..0a73b4ead 100644 --- a/src/core/libs/gnss_sdr_supl_client.h +++ b/src/core/libs/gnss_sdr_supl_client.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/gnss_sdr_time_counter.cc b/src/core/libs/gnss_sdr_time_counter.cc index fab5ba00f..434f9aad9 100644 --- a/src/core/libs/gnss_sdr_time_counter.cc +++ b/src/core/libs/gnss_sdr_time_counter.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/gnss_sdr_time_counter.h b/src/core/libs/gnss_sdr_time_counter.h index 985670eba..51417d756 100644 --- a/src/core/libs/gnss_sdr_time_counter.h +++ b/src/core/libs/gnss_sdr_time_counter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/string_converter.cc b/src/core/libs/string_converter.cc index 52417ecad..148361e6a 100644 --- a/src/core/libs/string_converter.cc +++ b/src/core/libs/string_converter.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/string_converter.h b/src/core/libs/string_converter.h index 216f1dbe9..880754dd3 100644 --- a/src/core/libs/string_converter.h +++ b/src/core/libs/string_converter.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt index 61e33df0e..070fd69fe 100644 --- a/src/core/libs/supl/CMakeLists.txt +++ b/src/core/libs/supl/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause file(GLOB ASN_RRLP_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.c") list(SORT ASN_RRLP_SOURCES) diff --git a/src/core/libs/supl/asn-rrlp/BIT_STRING.c b/src/core/libs/supl/asn-rrlp/BIT_STRING.c index 5bb0c4ae7..a683caf02 100644 --- a/src/core/libs/supl/asn-rrlp/BIT_STRING.c +++ b/src/core/libs/supl/asn-rrlp/BIT_STRING.c @@ -63,7 +63,7 @@ int BIT_STRING_constraint(asn_TYPE_descriptor_t *td, const void *sptr, return 0; } -static char *_bit_pattern[16] = {"0000", "0001", "0010", "0011", "0100", "0101", +static char *bit_pattern[16] = {"0000", "0001", "0010", "0011", "0100", "0101", "0110", "0111", "1000", "1001", "1010", "1011", "1100", "1101", "1110", "1111"}; @@ -107,8 +107,8 @@ asn_enc_rval_t BIT_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, _i_ASN_TEXT_INDENT(1, ilevel); } } - memcpy(p + 0, _bit_pattern[v >> 4], 4); - memcpy(p + 4, _bit_pattern[v & 0x0f], 4); + memcpy(p + 0, bit_pattern[v >> 4], 4); + memcpy(p + 4, bit_pattern[v & 0x0f], 4); p += 8; } diff --git a/src/core/libs/supl/asn-rrlp/OCTET_STRING.c b/src/core/libs/supl/asn-rrlp/OCTET_STRING.c index 96120193c..b54db4624 100644 --- a/src/core/libs/supl/asn-rrlp/OCTET_STRING.c +++ b/src/core/libs/supl/asn-rrlp/OCTET_STRING.c @@ -121,7 +121,7 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = { * necessity to demonstrate that acquired skill everywhere afterwards. * No, I am not going to explain what the following stuff is. */ -struct _stack_el +struct stack_el { ber_tlv_len_t left; /* What's left to read (or -1) */ ber_tlv_len_t got; /* What was actually processed */ @@ -129,18 +129,18 @@ struct _stack_el int want_nulls; /* Want null "end of content" octets? */ int bits_chopped; /* Flag in BIT STRING mode */ ber_tlv_tag_t tag; /* For debugging purposes */ - struct _stack_el *prev; - struct _stack_el *next; + struct stack_el *prev; + struct stack_el *next; }; -struct _stack +struct stack { - struct _stack_el *tail; - struct _stack_el *cur_ptr; + struct stack_el *tail; + struct stack_el *cur_ptr; }; -static struct _stack_el *OS__add_stack_el(struct _stack *st) +static struct stack_el *OS__add_stack_el(struct stack *st) { - struct _stack_el *nel; + struct stack_el *nel; /* * Reuse the old stack frame or allocate a new one. @@ -154,7 +154,7 @@ static struct _stack_el *OS__add_stack_el(struct _stack *st) } else { - nel = (struct _stack_el *)CALLOC(1, sizeof(struct _stack_el)); + nel = (struct stack_el *)CALLOC(1, sizeof(struct stack_el)); if (nel == NULL) { return NULL; @@ -175,9 +175,9 @@ static struct _stack_el *OS__add_stack_el(struct _stack *st) return nel; } -static struct _stack *_new_stack() +static struct stack *new_stack() { - return (struct _stack *)CALLOC(1, sizeof(struct _stack)); + return (struct stack *)CALLOC(1, sizeof(struct stack)); } /* @@ -195,8 +195,8 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_dec_rval_t rval; asn_struct_ctx_t *ctx; ssize_t consumed_myself = 0; - struct _stack *stck; /* Expectations stack structure */ - struct _stack_el *sel = 0; /* Stack element */ + struct stack *stck; /* Expectations stack structure */ + struct stack_el *sel = 0; /* Stack element */ int tlv_constr; enum asn_OS_Subvariant type_variant = specs->subvariant; @@ -238,10 +238,10 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, /* * Complex operation, requires stack of expectations. */ - ctx->ptr = _new_stack(); + ctx->ptr = new_stack(); if (ctx->ptr) { - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; } else { @@ -269,7 +269,7 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, /* * Fill the stack with expectations. */ - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; sel = stck->cur_ptr; do { @@ -292,7 +292,7 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, { if (sel->prev) { - struct _stack_el *prev = sel->prev; + struct stack_el *prev = sel->prev; if (prev->left != -1) { if (prev->left < sel->got) @@ -500,7 +500,7 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, NEXT_PHASE(ctx); /* Fall through */ case 2: - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; sel = stck->cur_ptr; ASN_DEBUG("Phase 2: Need %ld bytes, size=%ld, alrg=%ld, wn=%d", (long)sel->left, (long)size, (long)sel->got, @@ -2207,7 +2207,7 @@ void OCTET_STRING_free(asn_TYPE_descriptor_t *td, void *sptr, int contents_only) : &asn_DEF_OCTET_STRING_specs; asn_struct_ctx_t *ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); - struct _stack *stck; + struct stack *stck; if (!td || !st) { @@ -2225,12 +2225,12 @@ void OCTET_STRING_free(asn_TYPE_descriptor_t *td, void *sptr, int contents_only) /* * Remove decode-time stack. */ - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; if (stck) { while (stck->tail) { - struct _stack_el *sel = stck->tail; + struct stack_el *sel = stck->tail; stck->tail = sel->prev; FREEMEM(sel); } diff --git a/src/core/libs/supl/asn-rrlp/constr_CHOICE.c b/src/core/libs/supl/asn-rrlp/constr_CHOICE.c index 5b03745bf..4cc5d8a34 100644 --- a/src/core/libs/supl/asn-rrlp/constr_CHOICE.c +++ b/src/core/libs/supl/asn-rrlp/constr_CHOICE.c @@ -70,14 +70,14 @@ /* * See the definitions. */ -static int _fetch_present_idx(const void *struct_ptr, int pres_offset, +static int fetch_present_idx(const void *struct_ptr, int pres_offset, int size); -static void _set_present_idx(void *struct_ptr, int offset, int size, int pres); +static void set_present_idx(void *struct_ptr, int offset, int size, int pres); /* * Tags are canonically sorted in the tag to member table. */ -static int _search4tag(const void *ap, const void *bp) +static int search4tag(const void *ap, const void *bp) { const asn_TYPE_tag2member_t *a = (const asn_TYPE_tag2member_t *)ap; const asn_TYPE_tag2member_t *b = (const asn_TYPE_tag2member_t *)bp; @@ -224,7 +224,7 @@ asn_dec_rval_t CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, key.el_tag = tlv_tag; t2m = (asn_TYPE_tag2member_t *)bsearch( &key, specs->tag2el, specs->tag2el_count, - sizeof(specs->tag2el[0]), _search4tag); + sizeof(specs->tag2el[0]), search4tag); if (t2m) { /* @@ -308,7 +308,7 @@ asn_dec_rval_t CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, } /* Set presence to be able to free it properly at any * time */ - _set_present_idx(st, specs->pres_offset, + set_present_idx(st, specs->pres_offset, specs->pres_size, ctx->step + 1); /* * Invoke the member fetch routine according to member's @@ -448,7 +448,7 @@ asn_enc_rval_t CHOICE_encode_der(asn_TYPE_descriptor_t *td, void *sptr, ASN_DEBUG("%s %s as CHOICE", cb ? "Encoding" : "Estimating", td->name); - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); /* * If the structure was not initialized, it cannot be encoded: @@ -550,7 +550,7 @@ ber_tlv_tag_t CHOICE_outmost_tag(asn_TYPE_descriptor_t *td, const void *ptr, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); if (present > 0 || present <= td->elements_count) { @@ -593,7 +593,7 @@ int CHOICE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); if (present > 0 && present <= td->elements_count) { asn_TYPE_member_t *elm = &td->elements[present - 1]; @@ -758,7 +758,7 @@ asn_dec_rval_t CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, assert(_fetch_present_idx(st, specs->pres_offset, specs->pres_size) == 0); /* Record what we've got */ - _set_present_idx(st, specs->pres_offset, specs->pres_size, + set_present_idx(st, specs->pres_offset, specs->pres_size, edx + 1); ctx->phase = 3; /* Fall through */ @@ -942,7 +942,7 @@ asn_enc_rval_t CHOICE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); if (present <= 0 || present > td->elements_count) { @@ -1095,7 +1095,7 @@ asn_dec_rval_t CHOICE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, } /* Set presence to be able to free it later */ - _set_present_idx(st, specs->pres_offset, specs->pres_size, value + 1); + set_present_idx(st, specs->pres_offset, specs->pres_size, value + 1); elm = &td->elements[value]; if (elm->flags & ATF_POINTER) @@ -1159,7 +1159,7 @@ asn_enc_rval_t CHOICE_encode_uper(asn_TYPE_descriptor_t *td, ct = 0; } - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); /* * If the structure was not initialized properly, it cannot be encoded: @@ -1268,7 +1268,7 @@ int CHOICE_print(asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); /* * Print that element. @@ -1327,7 +1327,7 @@ void CHOICE_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); /* * Free that element. @@ -1367,7 +1367,7 @@ void CHOICE_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) * is guaranteed to be aligned properly. ASN.1 compiler itself does not * produce packed code. */ -static int _fetch_present_idx(const void *struct_ptr, int pres_offset, +static int fetch_present_idx(const void *struct_ptr, int pres_offset, int pres_size) { const void *present_ptr; @@ -1395,7 +1395,7 @@ static int _fetch_present_idx(const void *struct_ptr, int pres_offset, return present; } -static void _set_present_idx(void *struct_ptr, int pres_offset, int pres_size, +static void set_present_idx(void *struct_ptr, int pres_offset, int pres_size, int present) { void *present_ptr; diff --git a/src/core/libs/supl/asn-rrlp/constr_SEQUENCE.c b/src/core/libs/supl/asn-rrlp/constr_SEQUENCE.c index ec46d9778..59acb6e90 100644 --- a/src/core/libs/supl/asn-rrlp/constr_SEQUENCE.c +++ b/src/core/libs/supl/asn-rrlp/constr_SEQUENCE.c @@ -83,7 +83,7 @@ /* * Tags are canonically sorted in the tag2element map. */ -static int _t2e_cmp(const void *ap, const void *bp) +static int t2e_cmp(const void *ap, const void *bp) { const asn_TYPE_tag2member_t *a = (const asn_TYPE_tag2member_t *)ap; const asn_TYPE_tag2member_t *b = (const asn_TYPE_tag2member_t *)bp; @@ -375,7 +375,7 @@ asn_dec_rval_t SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, key.el_no = edx; t2m = (asn_TYPE_tag2member_t *)bsearch( &key, specs->tag2el, specs->tag2el_count, - sizeof(specs->tag2el[0]), _t2e_cmp); + sizeof(specs->tag2el[0]), t2e_cmp); if (t2m) { asn_TYPE_tag2member_t *best = 0; diff --git a/src/core/libs/supl/asn-rrlp/constr_SET_OF.c b/src/core/libs/supl/asn-rrlp/constr_SET_OF.c index 1d55053cb..82f9354cb 100644 --- a/src/core/libs/supl/asn-rrlp/constr_SET_OF.c +++ b/src/core/libs/supl/asn-rrlp/constr_SET_OF.c @@ -331,16 +331,16 @@ asn_dec_rval_t SET_OF_decode_ber(asn_codec_ctx_t *opt_codec_ctx, /* * Internally visible buffer holding a single encoded element. */ -struct _el_buffer +struct el_buffer { uint8_t *buf; size_t length; size_t size; }; /* Append bytes to the above structure */ -static int _el_addbytes(const void *buffer, size_t size, void *el_buf_ptr) +static int el_addbytes(const void *buffer, size_t size, void *el_buf_ptr) { - struct _el_buffer *el_buf = (struct _el_buffer *)el_buf_ptr; + struct el_buffer *el_buf = (struct el_buffer *)el_buf_ptr; if (el_buf->length + size > el_buf->size) { @@ -352,10 +352,10 @@ static int _el_addbytes(const void *buffer, size_t size, void *el_buf_ptr) el_buf->length += size; return 0; } -static int _el_buf_cmp(const void *ap, const void *bp) +static int el_buf_cmp(const void *ap, const void *bp) { - const struct _el_buffer *a = (const struct _el_buffer *)ap; - const struct _el_buffer *b = (const struct _el_buffer *)bp; + const struct el_buffer *a = (const struct el_buffer *)ap; + const struct el_buffer *b = (const struct el_buffer *)bp; int ret; size_t common_len; @@ -397,7 +397,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, asn_anonymous_set_ *list = _A_SET_FROM_VOID(ptr); size_t computed_size = 0; ssize_t encoding_size = 0; - struct _el_buffer *encoded_els; + struct el_buffer *encoded_els; ssize_t eels_count = 0; size_t max_encoded_len = 1; asn_enc_rval_t erval; @@ -456,7 +456,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, * encoded elements. */ encoded_els = - (struct _el_buffer *)MALLOC(list->count * sizeof(encoded_els[0])); + (struct el_buffer *)MALLOC(list->count * sizeof(encoded_els[0])); if (encoded_els == NULL) { erval.encoded = -1; @@ -473,7 +473,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, for (edx = 0; edx < list->count; edx++) { void *memb_ptr = list->array[edx]; - struct _el_buffer *encoded_el = &encoded_els[eels_count]; + struct el_buffer *encoded_el = &encoded_els[eels_count]; if (!memb_ptr) { @@ -505,7 +505,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, /* * Encode the member into the prepared space. */ - erval = der_encoder(elm_type, memb_ptr, 0, elm->tag, _el_addbytes, + erval = der_encoder(elm_type, memb_ptr, 0, elm->tag, el_addbytes, encoded_el); if (erval.encoded == -1) { @@ -523,7 +523,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, /* * Sort the encoded elements according to their encoding. */ - qsort(encoded_els, eels_count, sizeof(encoded_els[0]), _el_buf_cmp); + qsort(encoded_els, eels_count, sizeof(encoded_els[0]), el_buf_cmp); /* * Report encoded elements to the application. @@ -532,7 +532,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, ret = 0; for (edx = 0; edx < eels_count; edx++) { - struct _el_buffer *encoded_el = &encoded_els[edx]; + struct el_buffer *encoded_el = &encoded_els[edx]; /* Report encoded chunks to the application */ if (ret == 0 && cb(encoded_el->buf, encoded_el->length, app_key) < 0) diff --git a/src/core/libs/supl/asn-rrlp/constr_TYPE.c b/src/core/libs/supl/asn-rrlp/constr_TYPE.c index 50f349ded..09aa6966d 100644 --- a/src/core/libs/supl/asn-rrlp/constr_TYPE.c +++ b/src/core/libs/supl/asn-rrlp/constr_TYPE.c @@ -11,7 +11,7 @@ */ int get_asn1c_environment_version() { return ASN1C_ENVIRONMENT_VERSION; } -static asn_app_consume_bytes_f _print2fp; +static asn_app_consume_bytes_f print2fp; /* * Return the outmost tag of the type. @@ -49,13 +49,13 @@ int asn_fprint(FILE *stream, asn_TYPE_descriptor_t *td, const void *struct_ptr) } /* Invoke type-specific printer */ - if (td->print_struct(td, struct_ptr, 1, _print2fp, stream)) + if (td->print_struct(td, struct_ptr, 1, print2fp, stream)) { return -1; } /* Terminate the output */ - if (_print2fp("\n", 1, stream)) + if (print2fp("\n", 1, stream)) { return -1; } @@ -64,7 +64,7 @@ int asn_fprint(FILE *stream, asn_TYPE_descriptor_t *td, const void *struct_ptr) } /* Dump the data into the specified stdio stream */ -static int _print2fp(const void *buffer, size_t size, void *app_key) +static int print2fp(const void *buffer, size_t size, void *app_key) { FILE *stream = (FILE *)app_key; diff --git a/src/core/libs/supl/asn-rrlp/constraints.c b/src/core/libs/supl/asn-rrlp/constraints.c index bf278a66d..7de1cabfd 100644 --- a/src/core/libs/supl/asn-rrlp/constraints.c +++ b/src/core/libs/supl/asn-rrlp/constraints.c @@ -42,7 +42,7 @@ struct errbufDesc size_t errlen; }; -static void _asn_i_ctfailcb(void *key, asn_TYPE_descriptor_t *td, +static void asn_i_ctfailcb(void *key, asn_TYPE_descriptor_t *td, const void *sptr, const char *fmt, ...) { struct errbufDesc *arg = key; @@ -98,7 +98,7 @@ int asn_check_constraints(asn_TYPE_descriptor_t *type_descriptor, arg.errlen = errlen ? *errlen : 0; ret = type_descriptor->check_constraints(type_descriptor, struct_ptr, - _asn_i_ctfailcb, &arg); + asn_i_ctfailcb, &arg); if (ret == -1 && errlen) { *errlen = arg.errlen; diff --git a/src/core/libs/supl/asn-rrlp/per_encoder.c b/src/core/libs/supl/asn-rrlp/per_encoder.c index 23d1dc8cc..d3e6de9ab 100644 --- a/src/core/libs/supl/asn-rrlp/per_encoder.c +++ b/src/core/libs/supl/asn-rrlp/per_encoder.c @@ -123,7 +123,7 @@ ssize_t uper_encode_to_new_buffer(asn_TYPE_descriptor_t *td, */ /* Flush partially filled buffer */ -static int _uper_encode_flush_outp(asn_per_outp_t *po) +static int uper_encode_flush_outp(asn_per_outp_t *po) { uint8_t *buf; @@ -177,7 +177,7 @@ static asn_enc_rval_t uper_encode_internal(asn_TYPE_descriptor_t *td, /* Set number of bits encoded to a firm value */ er.encoded = (po.flushed_bytes << 3) + bits_to_flush; - if (_uper_encode_flush_outp(&po)) + if (uper_encode_flush_outp(&po)) { _ASN_ENCODE_FAILED; } diff --git a/src/core/libs/supl/asn-supl/BIT_STRING.c b/src/core/libs/supl/asn-supl/BIT_STRING.c index 5bb0c4ae7..a683caf02 100644 --- a/src/core/libs/supl/asn-supl/BIT_STRING.c +++ b/src/core/libs/supl/asn-supl/BIT_STRING.c @@ -63,7 +63,7 @@ int BIT_STRING_constraint(asn_TYPE_descriptor_t *td, const void *sptr, return 0; } -static char *_bit_pattern[16] = {"0000", "0001", "0010", "0011", "0100", "0101", +static char *bit_pattern[16] = {"0000", "0001", "0010", "0011", "0100", "0101", "0110", "0111", "1000", "1001", "1010", "1011", "1100", "1101", "1110", "1111"}; @@ -107,8 +107,8 @@ asn_enc_rval_t BIT_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, _i_ASN_TEXT_INDENT(1, ilevel); } } - memcpy(p + 0, _bit_pattern[v >> 4], 4); - memcpy(p + 4, _bit_pattern[v & 0x0f], 4); + memcpy(p + 0, bit_pattern[v >> 4], 4); + memcpy(p + 4, bit_pattern[v & 0x0f], 4); p += 8; } diff --git a/src/core/libs/supl/asn-supl/GeneralizedTime.c b/src/core/libs/supl/asn-supl/GeneralizedTime.c index 4bc2f6e37..113de45ae 100644 --- a/src/core/libs/supl/asn-supl/GeneralizedTime.c +++ b/src/core/libs/supl/asn-supl/GeneralizedTime.c @@ -2,9 +2,9 @@ * SPDX-FileCopyrightText: (c) 2003, 2004 Lev Walkin . All rights reserved. * SPDX-License-Identifier: BSD-1-Clause */ -#define _POSIX_PTHREAD_SEMANTICS /* for Sun */ +#define POSIX_PTHREAD_SEMANTICS /* for Sun */ #ifndef _REENTRANT -#define _REENTRANT /* for Sun */ +#define REENTRANT /* for Sun */ #endif #include #include diff --git a/src/core/libs/supl/asn-supl/OCTET_STRING.c b/src/core/libs/supl/asn-supl/OCTET_STRING.c index 96120193c..b54db4624 100644 --- a/src/core/libs/supl/asn-supl/OCTET_STRING.c +++ b/src/core/libs/supl/asn-supl/OCTET_STRING.c @@ -121,7 +121,7 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = { * necessity to demonstrate that acquired skill everywhere afterwards. * No, I am not going to explain what the following stuff is. */ -struct _stack_el +struct stack_el { ber_tlv_len_t left; /* What's left to read (or -1) */ ber_tlv_len_t got; /* What was actually processed */ @@ -129,18 +129,18 @@ struct _stack_el int want_nulls; /* Want null "end of content" octets? */ int bits_chopped; /* Flag in BIT STRING mode */ ber_tlv_tag_t tag; /* For debugging purposes */ - struct _stack_el *prev; - struct _stack_el *next; + struct stack_el *prev; + struct stack_el *next; }; -struct _stack +struct stack { - struct _stack_el *tail; - struct _stack_el *cur_ptr; + struct stack_el *tail; + struct stack_el *cur_ptr; }; -static struct _stack_el *OS__add_stack_el(struct _stack *st) +static struct stack_el *OS__add_stack_el(struct stack *st) { - struct _stack_el *nel; + struct stack_el *nel; /* * Reuse the old stack frame or allocate a new one. @@ -154,7 +154,7 @@ static struct _stack_el *OS__add_stack_el(struct _stack *st) } else { - nel = (struct _stack_el *)CALLOC(1, sizeof(struct _stack_el)); + nel = (struct stack_el *)CALLOC(1, sizeof(struct stack_el)); if (nel == NULL) { return NULL; @@ -175,9 +175,9 @@ static struct _stack_el *OS__add_stack_el(struct _stack *st) return nel; } -static struct _stack *_new_stack() +static struct stack *new_stack() { - return (struct _stack *)CALLOC(1, sizeof(struct _stack)); + return (struct stack *)CALLOC(1, sizeof(struct stack)); } /* @@ -195,8 +195,8 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_dec_rval_t rval; asn_struct_ctx_t *ctx; ssize_t consumed_myself = 0; - struct _stack *stck; /* Expectations stack structure */ - struct _stack_el *sel = 0; /* Stack element */ + struct stack *stck; /* Expectations stack structure */ + struct stack_el *sel = 0; /* Stack element */ int tlv_constr; enum asn_OS_Subvariant type_variant = specs->subvariant; @@ -238,10 +238,10 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, /* * Complex operation, requires stack of expectations. */ - ctx->ptr = _new_stack(); + ctx->ptr = new_stack(); if (ctx->ptr) { - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; } else { @@ -269,7 +269,7 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, /* * Fill the stack with expectations. */ - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; sel = stck->cur_ptr; do { @@ -292,7 +292,7 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, { if (sel->prev) { - struct _stack_el *prev = sel->prev; + struct stack_el *prev = sel->prev; if (prev->left != -1) { if (prev->left < sel->got) @@ -500,7 +500,7 @@ asn_dec_rval_t OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, NEXT_PHASE(ctx); /* Fall through */ case 2: - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; sel = stck->cur_ptr; ASN_DEBUG("Phase 2: Need %ld bytes, size=%ld, alrg=%ld, wn=%d", (long)sel->left, (long)size, (long)sel->got, @@ -2207,7 +2207,7 @@ void OCTET_STRING_free(asn_TYPE_descriptor_t *td, void *sptr, int contents_only) : &asn_DEF_OCTET_STRING_specs; asn_struct_ctx_t *ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); - struct _stack *stck; + struct stack *stck; if (!td || !st) { @@ -2225,12 +2225,12 @@ void OCTET_STRING_free(asn_TYPE_descriptor_t *td, void *sptr, int contents_only) /* * Remove decode-time stack. */ - stck = (struct _stack *)ctx->ptr; + stck = (struct stack *)ctx->ptr; if (stck) { while (stck->tail) { - struct _stack_el *sel = stck->tail; + struct stack_el *sel = stck->tail; stck->tail = sel->prev; FREEMEM(sel); } diff --git a/src/core/libs/supl/asn-supl/constr_CHOICE.c b/src/core/libs/supl/asn-supl/constr_CHOICE.c index 5b03745bf..4cc5d8a34 100644 --- a/src/core/libs/supl/asn-supl/constr_CHOICE.c +++ b/src/core/libs/supl/asn-supl/constr_CHOICE.c @@ -70,14 +70,14 @@ /* * See the definitions. */ -static int _fetch_present_idx(const void *struct_ptr, int pres_offset, +static int fetch_present_idx(const void *struct_ptr, int pres_offset, int size); -static void _set_present_idx(void *struct_ptr, int offset, int size, int pres); +static void set_present_idx(void *struct_ptr, int offset, int size, int pres); /* * Tags are canonically sorted in the tag to member table. */ -static int _search4tag(const void *ap, const void *bp) +static int search4tag(const void *ap, const void *bp) { const asn_TYPE_tag2member_t *a = (const asn_TYPE_tag2member_t *)ap; const asn_TYPE_tag2member_t *b = (const asn_TYPE_tag2member_t *)bp; @@ -224,7 +224,7 @@ asn_dec_rval_t CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, key.el_tag = tlv_tag; t2m = (asn_TYPE_tag2member_t *)bsearch( &key, specs->tag2el, specs->tag2el_count, - sizeof(specs->tag2el[0]), _search4tag); + sizeof(specs->tag2el[0]), search4tag); if (t2m) { /* @@ -308,7 +308,7 @@ asn_dec_rval_t CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, } /* Set presence to be able to free it properly at any * time */ - _set_present_idx(st, specs->pres_offset, + set_present_idx(st, specs->pres_offset, specs->pres_size, ctx->step + 1); /* * Invoke the member fetch routine according to member's @@ -448,7 +448,7 @@ asn_enc_rval_t CHOICE_encode_der(asn_TYPE_descriptor_t *td, void *sptr, ASN_DEBUG("%s %s as CHOICE", cb ? "Encoding" : "Estimating", td->name); - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); /* * If the structure was not initialized, it cannot be encoded: @@ -550,7 +550,7 @@ ber_tlv_tag_t CHOICE_outmost_tag(asn_TYPE_descriptor_t *td, const void *ptr, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); if (present > 0 || present <= td->elements_count) { @@ -593,7 +593,7 @@ int CHOICE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); if (present > 0 && present <= td->elements_count) { asn_TYPE_member_t *elm = &td->elements[present - 1]; @@ -758,7 +758,7 @@ asn_dec_rval_t CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, assert(_fetch_present_idx(st, specs->pres_offset, specs->pres_size) == 0); /* Record what we've got */ - _set_present_idx(st, specs->pres_offset, specs->pres_size, + set_present_idx(st, specs->pres_offset, specs->pres_size, edx + 1); ctx->phase = 3; /* Fall through */ @@ -942,7 +942,7 @@ asn_enc_rval_t CHOICE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); if (present <= 0 || present > td->elements_count) { @@ -1095,7 +1095,7 @@ asn_dec_rval_t CHOICE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, } /* Set presence to be able to free it later */ - _set_present_idx(st, specs->pres_offset, specs->pres_size, value + 1); + set_present_idx(st, specs->pres_offset, specs->pres_size, value + 1); elm = &td->elements[value]; if (elm->flags & ATF_POINTER) @@ -1159,7 +1159,7 @@ asn_enc_rval_t CHOICE_encode_uper(asn_TYPE_descriptor_t *td, ct = 0; } - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); /* * If the structure was not initialized properly, it cannot be encoded: @@ -1268,7 +1268,7 @@ int CHOICE_print(asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(sptr, specs->pres_offset, specs->pres_size); /* * Print that element. @@ -1327,7 +1327,7 @@ void CHOICE_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) /* * Figure out which CHOICE element is encoded. */ - present = _fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); + present = fetch_present_idx(ptr, specs->pres_offset, specs->pres_size); /* * Free that element. @@ -1367,7 +1367,7 @@ void CHOICE_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) * is guaranteed to be aligned properly. ASN.1 compiler itself does not * produce packed code. */ -static int _fetch_present_idx(const void *struct_ptr, int pres_offset, +static int fetch_present_idx(const void *struct_ptr, int pres_offset, int pres_size) { const void *present_ptr; @@ -1395,7 +1395,7 @@ static int _fetch_present_idx(const void *struct_ptr, int pres_offset, return present; } -static void _set_present_idx(void *struct_ptr, int pres_offset, int pres_size, +static void set_present_idx(void *struct_ptr, int pres_offset, int pres_size, int present) { void *present_ptr; diff --git a/src/core/libs/supl/asn-supl/constr_SEQUENCE.c b/src/core/libs/supl/asn-supl/constr_SEQUENCE.c index 691b51acb..4cd4ec093 100644 --- a/src/core/libs/supl/asn-supl/constr_SEQUENCE.c +++ b/src/core/libs/supl/asn-supl/constr_SEQUENCE.c @@ -83,7 +83,7 @@ /* * Tags are canonically sorted in the tag2element map. */ -static int _t2e_cmp(const void *ap, const void *bp) +static int t2e_cmp(const void *ap, const void *bp) { const asn_TYPE_tag2member_t *a = (const asn_TYPE_tag2member_t *)ap; const asn_TYPE_tag2member_t *b = (const asn_TYPE_tag2member_t *)bp; @@ -375,7 +375,7 @@ asn_dec_rval_t SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, key.el_no = edx; t2m = (asn_TYPE_tag2member_t *)bsearch( &key, specs->tag2el, specs->tag2el_count, - sizeof(specs->tag2el[0]), _t2e_cmp); + sizeof(specs->tag2el[0]), t2e_cmp); if (t2m) { asn_TYPE_tag2member_t *best = 0; diff --git a/src/core/libs/supl/asn-supl/constr_SET_OF.c b/src/core/libs/supl/asn-supl/constr_SET_OF.c index 1d55053cb..82f9354cb 100644 --- a/src/core/libs/supl/asn-supl/constr_SET_OF.c +++ b/src/core/libs/supl/asn-supl/constr_SET_OF.c @@ -331,16 +331,16 @@ asn_dec_rval_t SET_OF_decode_ber(asn_codec_ctx_t *opt_codec_ctx, /* * Internally visible buffer holding a single encoded element. */ -struct _el_buffer +struct el_buffer { uint8_t *buf; size_t length; size_t size; }; /* Append bytes to the above structure */ -static int _el_addbytes(const void *buffer, size_t size, void *el_buf_ptr) +static int el_addbytes(const void *buffer, size_t size, void *el_buf_ptr) { - struct _el_buffer *el_buf = (struct _el_buffer *)el_buf_ptr; + struct el_buffer *el_buf = (struct el_buffer *)el_buf_ptr; if (el_buf->length + size > el_buf->size) { @@ -352,10 +352,10 @@ static int _el_addbytes(const void *buffer, size_t size, void *el_buf_ptr) el_buf->length += size; return 0; } -static int _el_buf_cmp(const void *ap, const void *bp) +static int el_buf_cmp(const void *ap, const void *bp) { - const struct _el_buffer *a = (const struct _el_buffer *)ap; - const struct _el_buffer *b = (const struct _el_buffer *)bp; + const struct el_buffer *a = (const struct el_buffer *)ap; + const struct el_buffer *b = (const struct el_buffer *)bp; int ret; size_t common_len; @@ -397,7 +397,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, asn_anonymous_set_ *list = _A_SET_FROM_VOID(ptr); size_t computed_size = 0; ssize_t encoding_size = 0; - struct _el_buffer *encoded_els; + struct el_buffer *encoded_els; ssize_t eels_count = 0; size_t max_encoded_len = 1; asn_enc_rval_t erval; @@ -456,7 +456,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, * encoded elements. */ encoded_els = - (struct _el_buffer *)MALLOC(list->count * sizeof(encoded_els[0])); + (struct el_buffer *)MALLOC(list->count * sizeof(encoded_els[0])); if (encoded_els == NULL) { erval.encoded = -1; @@ -473,7 +473,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, for (edx = 0; edx < list->count; edx++) { void *memb_ptr = list->array[edx]; - struct _el_buffer *encoded_el = &encoded_els[eels_count]; + struct el_buffer *encoded_el = &encoded_els[eels_count]; if (!memb_ptr) { @@ -505,7 +505,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, /* * Encode the member into the prepared space. */ - erval = der_encoder(elm_type, memb_ptr, 0, elm->tag, _el_addbytes, + erval = der_encoder(elm_type, memb_ptr, 0, elm->tag, el_addbytes, encoded_el); if (erval.encoded == -1) { @@ -523,7 +523,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, /* * Sort the encoded elements according to their encoding. */ - qsort(encoded_els, eels_count, sizeof(encoded_els[0]), _el_buf_cmp); + qsort(encoded_els, eels_count, sizeof(encoded_els[0]), el_buf_cmp); /* * Report encoded elements to the application. @@ -532,7 +532,7 @@ asn_enc_rval_t SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, ret = 0; for (edx = 0; edx < eels_count; edx++) { - struct _el_buffer *encoded_el = &encoded_els[edx]; + struct el_buffer *encoded_el = &encoded_els[edx]; /* Report encoded chunks to the application */ if (ret == 0 && cb(encoded_el->buf, encoded_el->length, app_key) < 0) diff --git a/src/core/libs/supl/asn-supl/constr_TYPE.c b/src/core/libs/supl/asn-supl/constr_TYPE.c index 50f349ded..09aa6966d 100644 --- a/src/core/libs/supl/asn-supl/constr_TYPE.c +++ b/src/core/libs/supl/asn-supl/constr_TYPE.c @@ -11,7 +11,7 @@ */ int get_asn1c_environment_version() { return ASN1C_ENVIRONMENT_VERSION; } -static asn_app_consume_bytes_f _print2fp; +static asn_app_consume_bytes_f print2fp; /* * Return the outmost tag of the type. @@ -49,13 +49,13 @@ int asn_fprint(FILE *stream, asn_TYPE_descriptor_t *td, const void *struct_ptr) } /* Invoke type-specific printer */ - if (td->print_struct(td, struct_ptr, 1, _print2fp, stream)) + if (td->print_struct(td, struct_ptr, 1, print2fp, stream)) { return -1; } /* Terminate the output */ - if (_print2fp("\n", 1, stream)) + if (print2fp("\n", 1, stream)) { return -1; } @@ -64,7 +64,7 @@ int asn_fprint(FILE *stream, asn_TYPE_descriptor_t *td, const void *struct_ptr) } /* Dump the data into the specified stdio stream */ -static int _print2fp(const void *buffer, size_t size, void *app_key) +static int print2fp(const void *buffer, size_t size, void *app_key) { FILE *stream = (FILE *)app_key; diff --git a/src/core/libs/supl/asn-supl/constraints.c b/src/core/libs/supl/asn-supl/constraints.c index d6d8cc5ec..40ee01d88 100644 --- a/src/core/libs/supl/asn-supl/constraints.c +++ b/src/core/libs/supl/asn-supl/constraints.c @@ -42,7 +42,7 @@ struct errbufDesc size_t errlen; }; -static void _asn_i_ctfailcb(void *key, asn_TYPE_descriptor_t *td, +static void asn_i_ctfailcb(void *key, asn_TYPE_descriptor_t *td, const void *sptr, const char *fmt, ...) { struct errbufDesc *arg = key; @@ -98,7 +98,7 @@ int asn_check_constraints(asn_TYPE_descriptor_t *type_descriptor, arg.errlen = errlen ? *errlen : 0; ret = type_descriptor->check_constraints(type_descriptor, struct_ptr, - _asn_i_ctfailcb, &arg); + asn_i_ctfailcb, &arg); if (ret == -1 && errlen) { *errlen = arg.errlen; diff --git a/src/core/libs/supl/asn-supl/per_encoder.c b/src/core/libs/supl/asn-supl/per_encoder.c index 23d1dc8cc..d3e6de9ab 100644 --- a/src/core/libs/supl/asn-supl/per_encoder.c +++ b/src/core/libs/supl/asn-supl/per_encoder.c @@ -123,7 +123,7 @@ ssize_t uper_encode_to_new_buffer(asn_TYPE_descriptor_t *td, */ /* Flush partially filled buffer */ -static int _uper_encode_flush_outp(asn_per_outp_t *po) +static int uper_encode_flush_outp(asn_per_outp_t *po) { uint8_t *buf; @@ -177,7 +177,7 @@ static asn_enc_rval_t uper_encode_internal(asn_TYPE_descriptor_t *td, /* Set number of bits encoded to a firm value */ er.encoded = (po.flushed_bytes << 3) + bits_to_flush; - if (_uper_encode_flush_outp(&po)) + if (uper_encode_flush_outp(&po)) { _ASN_ENCODE_FAILED; } diff --git a/src/core/libs/supl/supl.c b/src/core/libs/supl/supl.c index c9d0ee44e..e35408406 100644 --- a/src/core/libs/supl/supl.c +++ b/src/core/libs/supl/supl.c @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (c) 2007 Tatu Mannisto - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (c) 2007 Tatu Mannisto * SPDX-License-Identifier: BSD-1-Clause * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/supl/supl.h b/src/core/libs/supl/supl.h index dedf90f5e..c879112f6 100644 --- a/src/core/libs/supl/supl.h +++ b/src/core/libs/supl/supl.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (c) 2007 Tatu Mannisto - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (c) 2007 Tatu Mannisto * SPDX-License-Identifier: BSD-1-Clause * * ----------------------------------------------------------------------------- diff --git a/src/core/libs/uio_fpga.cc b/src/core/libs/uio_fpga.cc index 95f6e74e6..634adbcfa 100644 --- a/src/core/libs/uio_fpga.cc +++ b/src/core/libs/uio_fpga.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -167,7 +164,7 @@ int32_t find_uio_num(const std::string &device_name, uint32_t device_num) // search for the requested device driver fs::path path(uio_dir); std::vector dirs; - for (auto &p : fs::directory_iterator(path)) + for (const auto &p : fs::directory_iterator(path)) { dirs.push_back(p); } diff --git a/src/core/libs/uio_fpga.h b/src/core/libs/uio_fpga.h index 0b5b873c4..7d35fde60 100644 --- a/src/core/libs/uio_fpga.h +++ b/src/core/libs/uio_fpga.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index dc8c3506d..3738f4852 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${CMAKE_SOURCE_DIR}/docs/protobuf/gnss_synchro.proto) diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc index e7b6dc448..beb0cab30 100644 --- a/src/core/monitor/gnss_synchro_monitor.cc +++ b/src/core/monitor/gnss_synchro_monitor.cc @@ -3,18 +3,14 @@ * \brief Implementation of a receiver monitoring block which allows sending * a data stream with the receiver internal parameters (Gnss_Synchro objects) * to local or remote clients over UDP. - * * \author Álvaro Cebrián Juan, 2018. acebrianjuan(at)gmail.com * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h index 0380ed5db..b45b7cc5b 100644 --- a/src/core/monitor/gnss_synchro_monitor.h +++ b/src/core/monitor/gnss_synchro_monitor.h @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/monitor/gnss_synchro_udp_sink.cc b/src/core/monitor/gnss_synchro_udp_sink.cc index 99e1e31de..fa1216433 100644 --- a/src/core/monitor/gnss_synchro_udp_sink.cc +++ b/src/core/monitor/gnss_synchro_udp_sink.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/monitor/gnss_synchro_udp_sink.h b/src/core/monitor/gnss_synchro_udp_sink.h index 887e4839b..cf777cc12 100644 --- a/src/core/monitor/gnss_synchro_udp_sink.h +++ b/src/core/monitor/gnss_synchro_udp_sink.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/monitor/serdes_gnss_synchro.h b/src/core/monitor/serdes_gnss_synchro.h index 23c890772..d9539c577 100644 --- a/src/core/monitor/serdes_gnss_synchro.h +++ b/src/core/monitor/serdes_gnss_synchro.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index d1c69372f..9d54be4a3 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(GNSS_RECEIVER_SOURCES diff --git a/src/core/receiver/concurrent_map.h b/src/core/receiver/concurrent_map.h index ec17b51d2..330ab02ef 100644 --- a/src/core/receiver/concurrent_map.h +++ b/src/core/receiver/concurrent_map.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/concurrent_queue.h b/src/core/receiver/concurrent_queue.h index 6c609b399..fc5c97053 100644 --- a/src/core/receiver/concurrent_queue.h +++ b/src/core/receiver/concurrent_queue.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 2569c69e6..e0642f15c 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -940,7 +937,7 @@ std::vector> ControlThread::get_visible_sats(time << "UTC, assuming RX position " << LLH[0] << " [deg], " << LLH[1] << " [deg], " << LLH[2] << " [m]\n"; const std::map gps_eph_map = pvt_ptr->get_gps_ephemeris(); - for (auto &it : gps_eph_map) + for (const auto &it : gps_eph_map) { const eph_t rtklib_eph = eph_to_rtklib(it.second, pre_2009_file_); std::array r_sat{}; @@ -965,7 +962,7 @@ std::vector> ControlThread::get_visible_sats(time } const std::map gal_eph_map = pvt_ptr->get_galileo_ephemeris(); - for (auto &it : gal_eph_map) + for (const auto &it : gal_eph_map) { const eph_t rtklib_eph = eph_to_rtklib(it.second); std::array r_sat{}; @@ -990,7 +987,7 @@ std::vector> ControlThread::get_visible_sats(time } const std::map gps_alm_map = pvt_ptr->get_gps_almanac(); - for (auto &it : gps_alm_map) + for (const auto &it : gps_alm_map) { const alm_t rtklib_alm = alm_to_rtklib(it.second); std::array r_sat{}; @@ -1020,7 +1017,7 @@ std::vector> ControlThread::get_visible_sats(time } const std::map gal_alm_map = pvt_ptr->get_galileo_almanac(); - for (auto &it : gal_alm_map) + for (const auto &it : gal_alm_map) { const alm_t rtklib_alm = alm_to_rtklib(it.second); std::array r_sat{}; @@ -1059,7 +1056,7 @@ std::vector> ControlThread::get_visible_sats(time } -void ControlThread::gps_acq_assist_data_collector() +void ControlThread::gps_acq_assist_data_collector() const { // ############ 1.bis READ EPHEMERIS/UTC_MODE/IONO QUEUE #################### Gps_Acq_Assist gps_acq; diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h index cd66d4e49..e28271725 100644 --- a/src/core/receiver/control_thread.h +++ b/src/core/receiver/control_thread.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -140,7 +137,7 @@ private: /* * Blocking function that reads the GPS assistance queue */ - void gps_acq_assist_data_collector(); + void gps_acq_assist_data_collector() const; /* * Compute elevations for the specified time and position for all the available satellites in ephemeris and almanac queues diff --git a/src/core/receiver/file_configuration.cc b/src/core/receiver/file_configuration.cc index b0b13e77b..b8cd47154 100644 --- a/src/core/receiver/file_configuration.cc +++ b/src/core/receiver/file_configuration.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/file_configuration.h b/src/core/receiver/file_configuration.h index b61809b5b..9b79b2374 100644 --- a/src/core/receiver/file_configuration.h +++ b/src/core/receiver/file_configuration.h @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 0563cc689..e9c4610e6 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -13,13 +13,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index fad210d49..13ceeb937 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -12,13 +12,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index ecb2a9a68..d8378dafb 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -464,8 +461,7 @@ void GNSSFlowgraph::connect() std::vector taps = gr::filter::firdes::low_pass(1.0, fs, acq_fs_decimated / 2.1, - acq_fs_decimated / 2, - gr::filter::firdes::win_type::WIN_HAMMING); + acq_fs_decimated / 2); gr::basic_block_sptr fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(decimation, taps); @@ -1477,7 +1473,7 @@ void GNSSFlowgraph::priorize_satellites(const std::vector -double Galileo_Utc_Model::GST_to_UTC_time(double t_e, int32_t WN) +double Galileo_Utc_Model::GST_to_UTC_time(double t_e, int32_t WN) const { double t_Utc; double t_Utc_daytime; diff --git a/src/core/system_parameters/galileo_utc_model.h b/src/core/system_parameters/galileo_utc_model.h index fb4eb3df6..770126755 100644 --- a/src/core/system_parameters/galileo_utc_model.h +++ b/src/core/system_parameters/galileo_utc_model.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -45,7 +42,7 @@ public: Galileo_Utc_Model() = default; // double TOW_6; - double GST_to_UTC_time(double t_e, int32_t WN); //!< GST-UTC Conversion Algorithm and Parameters + double GST_to_UTC_time(double t_e, int32_t WN) const; //!< GST-UTC Conversion Algorithm and Parameters // Word type 6: GST-UTC conversion parameters double A0_6{}; diff --git a/src/core/system_parameters/glonass_gnav_almanac.h b/src/core/system_parameters/glonass_gnav_almanac.h index 186ad4698..4048ec2af 100644 --- a/src/core/system_parameters/glonass_gnav_almanac.h +++ b/src/core/system_parameters/glonass_gnav_almanac.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.cc b/src/core/system_parameters/glonass_gnav_ephemeris.cc index 539d9850a..2398bad26 100644 --- a/src/core/system_parameters/glonass_gnav_ephemeris.cc +++ b/src/core/system_parameters/glonass_gnav_ephemeris.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.h b/src/core/system_parameters/glonass_gnav_ephemeris.h index 03f8d4619..4d33c090c 100644 --- a/src/core/system_parameters/glonass_gnav_ephemeris.h +++ b/src/core/system_parameters/glonass_gnav_ephemeris.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc index e2a1a50c6..4e8ed6f9b 100644 --- a/src/core/system_parameters/glonass_gnav_navigation_message.cc +++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.h b/src/core/system_parameters/glonass_gnav_navigation_message.h index 394c03fe5..0c69ba903 100644 --- a/src/core/system_parameters/glonass_gnav_navigation_message.h +++ b/src/core/system_parameters/glonass_gnav_navigation_message.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/glonass_gnav_utc_model.cc b/src/core/system_parameters/glonass_gnav_utc_model.cc index c0c457493..c402af550 100644 --- a/src/core/system_parameters/glonass_gnav_utc_model.cc +++ b/src/core/system_parameters/glonass_gnav_utc_model.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -21,7 +18,7 @@ #include "glonass_gnav_utc_model.h" -double Glonass_Gnav_Utc_Model::utc_time(double glonass_time_corrected) +double Glonass_Gnav_Utc_Model::utc_time(double glonass_time_corrected) const { // GLONASS Time is relative to UTC Moscow, so we simply add its time difference double t_utc = glonass_time_corrected + 3.0 * 3600.0 + d_tau_c; diff --git a/src/core/system_parameters/glonass_gnav_utc_model.h b/src/core/system_parameters/glonass_gnav_utc_model.h index e04fd5b90..36c45406c 100644 --- a/src/core/system_parameters/glonass_gnav_utc_model.h +++ b/src/core/system_parameters/glonass_gnav_utc_model.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -58,7 +55,7 @@ public: * \brief Computes the Coordinated Universal Time (UTC) and * returns it in [s] (GLONASS ICD (Edition 5.1) Section 3.3.3 GLONASS Time) */ - double utc_time(double glonass_time_corrected); + double utc_time(double glonass_time_corrected) const; template /*! diff --git a/src/core/system_parameters/gnss_frequencies.h b/src/core/system_parameters/gnss_frequencies.h index 15b87cd76..0d2288ceb 100644 --- a/src/core/system_parameters/gnss_frequencies.h +++ b/src/core/system_parameters/gnss_frequencies.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gnss_obs_codes.h b/src/core/system_parameters/gnss_obs_codes.h index 3873ce3b4..1f6c9a3ae 100644 --- a/src/core/system_parameters/gnss_obs_codes.h +++ b/src/core/system_parameters/gnss_obs_codes.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gnss_satellite.cc b/src/core/system_parameters/gnss_satellite.cc index 6b79db308..4bf7b758b 100644 --- a/src/core/system_parameters/gnss_satellite.cc +++ b/src/core/system_parameters/gnss_satellite.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gnss_satellite.h b/src/core/system_parameters/gnss_satellite.h index c525f87b7..9830e2a0b 100644 --- a/src/core/system_parameters/gnss_satellite.h +++ b/src/core/system_parameters/gnss_satellite.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gnss_signal.cc b/src/core/system_parameters/gnss_signal.cc index 9762718c2..f815edd5c 100644 --- a/src/core/system_parameters/gnss_signal.cc +++ b/src/core/system_parameters/gnss_signal.cc @@ -6,13 +6,10 @@ * Javier Arribas, 2012. 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gnss_signal.h b/src/core/system_parameters/gnss_signal.h index bcd76a6be..c861211c9 100644 --- a/src/core/system_parameters/gnss_signal.h +++ b/src/core/system_parameters/gnss_signal.h @@ -4,15 +4,13 @@ * \author * Luis Esteve, 2012. luis(at)epsilon-formacion.com * Javier Arribas, 2012. 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 - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gnss_synchro.h b/src/core/system_parameters/gnss_synchro.h index f06afa620..cc0e0e13a 100644 --- a/src/core/system_parameters/gnss_synchro.h +++ b/src/core/system_parameters/gnss_synchro.h @@ -5,15 +5,13 @@ * Luis Esteve, 2012. luis(at)epsilon-formacion.com * Javier Arribas, 2012. jarribas(at)cttc.es * Álvaro Cebrián Juan, 2018. acebrianjuan(at)gmail.com + * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_acq_assist.h b/src/core/system_parameters/gps_acq_assist.h index b7f7a39e9..71a6c1eb5 100644 --- a/src/core/system_parameters/gps_acq_assist.h +++ b/src/core/system_parameters/gps_acq_assist.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_almanac.h b/src/core/system_parameters/gps_almanac.h index 0a7469d74..fd5a1abbe 100644 --- a/src/core/system_parameters/gps_almanac.h +++ b/src/core/system_parameters/gps_almanac.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_cnav_ephemeris.cc b/src/core/system_parameters/gps_cnav_ephemeris.cc index a8766b3e0..35157fd46 100644 --- a/src/core/system_parameters/gps_cnav_ephemeris.cc +++ b/src/core/system_parameters/gps_cnav_ephemeris.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_cnav_ephemeris.h b/src/core/system_parameters/gps_cnav_ephemeris.h index da2950a0e..a6523a3f4 100644 --- a/src/core/system_parameters/gps_cnav_ephemeris.h +++ b/src/core/system_parameters/gps_cnav_ephemeris.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_cnav_iono.h b/src/core/system_parameters/gps_cnav_iono.h index f66cea95a..3def6e3af 100644 --- a/src/core/system_parameters/gps_cnav_iono.h +++ b/src/core/system_parameters/gps_cnav_iono.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_cnav_navigation_message.cc b/src/core/system_parameters/gps_cnav_navigation_message.cc index b2d4d3e7e..7b8b4f80f 100644 --- a/src/core/system_parameters/gps_cnav_navigation_message.cc +++ b/src/core/system_parameters/gps_cnav_navigation_message.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_cnav_navigation_message.h b/src/core/system_parameters/gps_cnav_navigation_message.h index 87dfdf681..85bd2c2fb 100644 --- a/src/core/system_parameters/gps_cnav_navigation_message.h +++ b/src/core/system_parameters/gps_cnav_navigation_message.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_cnav_utc_model.h b/src/core/system_parameters/gps_cnav_utc_model.h index ad1e8cc9b..1bc5faf38 100644 --- a/src/core/system_parameters/gps_cnav_utc_model.h +++ b/src/core/system_parameters/gps_cnav_utc_model.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_ephemeris.cc b/src/core/system_parameters/gps_ephemeris.cc index 73d432f0d..384c0be40 100644 --- a/src/core/system_parameters/gps_ephemeris.cc +++ b/src/core/system_parameters/gps_ephemeris.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h index 212f1f567..154f96710 100644 --- a/src/core/system_parameters/gps_ephemeris.h +++ b/src/core/system_parameters/gps_ephemeris.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_iono.h b/src/core/system_parameters/gps_iono.h index 5954e542e..a145ca8c7 100644 --- a/src/core/system_parameters/gps_iono.h +++ b/src/core/system_parameters/gps_iono.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc index c2a4c23c8..420134a75 100644 --- a/src/core/system_parameters/gps_navigation_message.cc +++ b/src/core/system_parameters/gps_navigation_message.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h index d77cc0b07..5b2616492 100644 --- a/src/core/system_parameters/gps_navigation_message.h +++ b/src/core/system_parameters/gps_navigation_message.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/gps_utc_model.h b/src/core/system_parameters/gps_utc_model.h index 37afa191e..9104b3715 100644 --- a/src/core/system_parameters/gps_utc_model.h +++ b/src/core/system_parameters/gps_utc_model.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/sbas_ephemeris.cc b/src/core/system_parameters/sbas_ephemeris.cc index 4c4fb4a3a..d9cc2208c 100644 --- a/src/core/system_parameters/sbas_ephemeris.cc +++ b/src/core/system_parameters/sbas_ephemeris.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/core/system_parameters/sbas_ephemeris.h b/src/core/system_parameters/sbas_ephemeris.h index 6698fdb60..af9dce491 100644 --- a/src/core/system_parameters/sbas_ephemeris.h +++ b/src/core/system_parameters/sbas_ephemeris.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index d9d3d835b..0d2ad6d01 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if(USE_CMAKE_TARGET_SOURCES) add_executable(gnss-sdr) diff --git a/src/main/main.cc b/src/main/main.cc index 1a521c7b2..fe60a3618 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 39de4fe42..6bb34335d 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,11 +1,8 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(unit-tests/signal-processing-blocks/libs) @@ -336,17 +333,32 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) endif() include(GNUInstallDirs) find_program(Patch_EXECUTABLE NAME patch PATHS ENV PATH) + set(GPSTK_PATCH_COMMAND + cd ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} && + ${Patch_EXECUTABLE} ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/src/tests/data/gpstk_static.patch + ) + # Patch only once + if(EXISTS ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/CMakeLists.txt) + set(GPSTK_PATCH_COMMAND "") + endif() if(CMAKE_VERSION VERSION_LESS 3.2) ExternalProject_Add(gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} GIT_REPOSITORY https://github.com/SGL-UT/GPSTk GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION} SOURCE_DIR ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} BINARY_DIR ${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} - PATCH_COMMAND cd ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} && ${Patch_EXECUTABLE} ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/src/tests/data/gpstk_static.patch - CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=ON -DBUILD_PYTHON=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_EXTENSIONS=ON -DCMAKE_C_STANDARD=11 -DCMAKE_C_EXTENSIONS=ON + PATCH_COMMAND ${GPSTK_PATCH_COMMAND} + CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install + -DBUILD_EXT=ON + -DBUILD_PYTHON=OFF + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_CXX_STANDARD=11 + -DCMAKE_CXX_EXTENSIONS=ON + -DCMAKE_C_STANDARD=11 + -DCMAKE_C_EXTENSIONS=ON BUILD_COMMAND ${GPSTK_BUILD_COMMAND} UPDATE_COMMAND "" - PATCH_COMMAND "" ) else() if(CMAKE_MAKE_PROGRAM MATCHES "make") @@ -362,12 +374,19 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION} SOURCE_DIR ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} BINARY_DIR ${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} - PATCH_COMMAND cd ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} && ${Patch_EXECUTABLE} ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/src/tests/data/gpstk_static.patch - CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=ON -DBUILD_PYTHON=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS=ON -DCMAKE_C_STANDARD=11 -DCMAKE_C_EXTENSIONS=ON + PATCH_COMMAND ${GPSTK_PATCH_COMMAND} + CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install + -DBUILD_EXT=ON + -DBUILD_PYTHON=OFF + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_CXX_STANDARD=14 + -DCMAKE_CXX_EXTENSIONS=ON + -DCMAKE_C_STANDARD=11 + -DCMAKE_C_EXTENSIONS=ON BUILD_COMMAND ${GPSTK_BUILD_COMMAND} ${GPSTK_PARALLEL_BUILD} BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_STATIC_LIBRARY_SUFFIX} UPDATE_COMMAND "" - PATCH_COMMAND "" ) endif() set(GPSTK_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers") diff --git a/src/tests/benchmarks/CMakeLists.txt b/src/tests/benchmarks/CMakeLists.txt index bb460983f..515cd7654 100644 --- a/src/tests/benchmarks/CMakeLists.txt +++ b/src/tests/benchmarks/CMakeLists.txt @@ -1,11 +1,9 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + find_package(benchmark QUIET) diff --git a/src/tests/benchmarks/benchmark_copy.cc b/src/tests/benchmarks/benchmark_copy.cc index 52473d66d..8464c4587 100644 --- a/src/tests/benchmarks/benchmark_copy.cc +++ b/src/tests/benchmarks/benchmark_copy.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/benchmarks/benchmark_detector.cc b/src/tests/benchmarks/benchmark_detector.cc index d9cfcb474..5679e9c3b 100644 --- a/src/tests/benchmarks/benchmark_detector.cc +++ b/src/tests/benchmarks/benchmark_detector.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/benchmarks/benchmark_preamble.cc b/src/tests/benchmarks/benchmark_preamble.cc index 9c90efafa..a4dd66786 100644 --- a/src/tests/benchmarks/benchmark_preamble.cc +++ b/src/tests/benchmarks/benchmark_preamble.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h index 03d5380c9..5566f59cc 100644 --- a/src/tests/common-files/gnuplot_i.h +++ b/src/tests/common-files/gnuplot_i.h @@ -18,15 +18,13 @@ * by M. Burgis (10/03/08) * 4. Some fixes and improvements for Linux and macOS * by C. Fernandez (22/10/17) + * * ----------------------------------------------------------------------------- * - * Copyright (C) 2013-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/common-files/observable_tests_flags.h b/src/tests/common-files/observable_tests_flags.h index ea2da89be..444211337 100644 --- a/src/tests/common-files/observable_tests_flags.h +++ b/src/tests/common-files/observable_tests_flags.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/common-files/signal_generator_flags.h b/src/tests/common-files/signal_generator_flags.h index 566855ad7..c43763fd3 100644 --- a/src/tests/common-files/signal_generator_flags.h +++ b/src/tests/common-files/signal_generator_flags.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/common-files/test_flags.h b/src/tests/common-files/test_flags.h index de79ebc50..814cf69e6 100644 --- a/src/tests/common-files/test_flags.h +++ b/src/tests/common-files/test_flags.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/common-files/tracking_tests_flags.h b/src/tests/common-files/tracking_tests_flags.h index d1608fb4d..8bbc4701c 100644 --- a/src/tests/common-files/tracking_tests_flags.h +++ b/src/tests/common-files/tracking_tests_flags.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc index 4f224cb51..5f8d52aab 100644 --- a/src/tests/single_test_main.cc +++ b/src/tests/single_test_main.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt index 8f7033e0d..eb936a24f 100644 --- a/src/tests/system-tests/libs/CMakeLists.txt +++ b/src/tests/system-tests/libs/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(SYSTEM_TESTING_LIB_SOURCES diff --git a/src/tests/system-tests/libs/position_test_flags.h b/src/tests/system-tests/libs/position_test_flags.h index c94c262fa..cc7e8e786 100644 --- a/src/tests/system-tests/libs/position_test_flags.h +++ b/src/tests/system-tests/libs/position_test_flags.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc index 24df960ee..493cf4dd3 100644 --- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc +++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h b/src/tests/system-tests/libs/rtklib_solver_dump_reader.h index e5a4d37d0..547e8e063 100644 --- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h +++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc index 2b97c610f..d45b41e65 100644 --- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc +++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h index 20c627ed0..00f714586 100644 --- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h +++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc index 94563bdac..b89d90bcb 100644 --- a/src/tests/system-tests/position_test.cc +++ b/src/tests/system-tests/position_test.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -94,7 +91,7 @@ private: std::string filename_rinex_obs = FLAGS_filename_rinex_obs; std::string filename_raw_data = FLAGS_filename_raw_data; - void print_results(const arma::mat& R_eb_enu); + void print_results(const arma::mat& R_eb_enu) const; std::shared_ptr config; std::shared_ptr config_f; std::string generated_kml_file; @@ -825,7 +822,7 @@ void PositionSystemTest::check_results() } -void PositionSystemTest::print_results(const arma::mat& R_eb_enu) +void PositionSystemTest::print_results(const arma::mat& R_eb_enu) const { const std::string gnuplot_executable(FLAGS_gnuplot_executable); if (gnuplot_executable.empty()) diff --git a/src/tests/system-tests/ttff.cc b/src/tests/system-tests/ttff.cc index 9d3971deb..0816e0ad2 100644 --- a/src/tests/system-tests/ttff.cc +++ b/src/tests/system-tests/ttff.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index ccbe4487d..17bf694c8 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/code_generation_test.cc b/src/tests/unit-tests/arithmetic/code_generation_test.cc index 38d241dd9..cecfb7414 100644 --- a/src/tests/unit-tests/arithmetic/code_generation_test.cc +++ b/src/tests/unit-tests/arithmetic/code_generation_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -56,10 +53,10 @@ TEST(CodeGenerationTest, CodeGenGPSL1SampledTest) signed int _prn = 1; unsigned int _chip_shift = 4; double _fs = 8000000.0; - const signed int _codeFreqBasis = 1023000; // Hz - const signed int _codeLength = 1023; - int _samplesPerCode = round(_fs / static_cast(_codeFreqBasis / _codeLength)); - std::vector> _dest(_samplesPerCode); + const signed int codeFreqBasis = 1023000; // Hz + const signed int codeLength = 1023; + int samplesPerCode = round(_fs / static_cast(codeFreqBasis / codeLength)); + std::vector> _dest(samplesPerCode); int iterations = 1000; @@ -83,10 +80,10 @@ TEST(CodeGenerationTest, ComplexConjugateTest) { double _fs = 8000000.0; double _f = 4000.0; - const signed int _codeFreqBasis = 1023000; // Hz - const signed int _codeLength = 1023; - int _samplesPerCode = round(_fs / static_cast(_codeFreqBasis / _codeLength)); - std::vector> _dest(_samplesPerCode); + const signed int codeFreqBasis = 1023000; // Hz + const signed int codeLength = 1023; + int samplesPerCode = round(_fs / static_cast(codeFreqBasis / codeLength)); + std::vector> _dest(samplesPerCode); int iterations = 1000; diff --git a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc index 756936074..88ab2d6d9 100644 --- a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc +++ b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/conjugate_test.cc b/src/tests/unit-tests/arithmetic/conjugate_test.cc index d76711390..1fadedfed 100644 --- a/src/tests/unit-tests/arithmetic/conjugate_test.cc +++ b/src/tests/unit-tests/arithmetic/conjugate_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/fft_length_test.cc b/src/tests/unit-tests/arithmetic/fft_length_test.cc index 44f08e18b..e9497d3ec 100644 --- a/src/tests/unit-tests/arithmetic/fft_length_test.cc +++ b/src/tests/unit-tests/arithmetic/fft_length_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/fft_speed_test.cc b/src/tests/unit-tests/arithmetic/fft_speed_test.cc index 6f422a218..400b4f674 100644 --- a/src/tests/unit-tests/arithmetic/fft_speed_test.cc +++ b/src/tests/unit-tests/arithmetic/fft_speed_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc index 14f546d7c..3611733f3 100644 --- a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc +++ b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/matio_test.cc b/src/tests/unit-tests/arithmetic/matio_test.cc index 82f657f45..3599df72a 100644 --- a/src/tests/unit-tests/arithmetic/matio_test.cc +++ b/src/tests/unit-tests/arithmetic/matio_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/multiply_test.cc b/src/tests/unit-tests/arithmetic/multiply_test.cc index 1149f4214..bb47dac58 100644 --- a/src/tests/unit-tests/arithmetic/multiply_test.cc +++ b/src/tests/unit-tests/arithmetic/multiply_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/arithmetic/preamble_correlator_test.cc b/src/tests/unit-tests/arithmetic/preamble_correlator_test.cc index a6bfa2548..1a49fa586 100644 --- a/src/tests/unit-tests/arithmetic/preamble_correlator_test.cc +++ b/src/tests/unit-tests/arithmetic/preamble_correlator_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/control_thread_test.cc b/src/tests/unit-tests/control-plane/control_thread_test.cc index 4804161a4..c43756128 100644 --- a/src/tests/unit-tests/control-plane/control_thread_test.cc +++ b/src/tests/unit-tests/control-plane/control_thread_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/file_configuration_test.cc b/src/tests/unit-tests/control-plane/file_configuration_test.cc index 7924d578b..5b2036234 100644 --- a/src/tests/unit-tests/control-plane/file_configuration_test.cc +++ b/src/tests/unit-tests/control-plane/file_configuration_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc b/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc index 3b8342c9c..96e6051a7 100644 --- a/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc +++ b/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc b/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc index 7203fd341..63cf9ea90 100644 --- a/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc +++ b/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc b/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc index 47580aa6b..4691bc0a0 100644 --- a/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc +++ b/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/protobuf_test.cc b/src/tests/unit-tests/control-plane/protobuf_test.cc index a6f24dd28..98d454243 100644 --- a/src/tests/unit-tests/control-plane/protobuf_test.cc +++ b/src/tests/unit-tests/control-plane/protobuf_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/control-plane/string_converter_test.cc b/src/tests/unit-tests/control-plane/string_converter_test.cc index 08a6e6c6e..77dc379b5 100644 --- a/src/tests/unit-tests/control-plane/string_converter_test.cc +++ b/src/tests/unit-tests/control-plane/string_converter_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc index 434033485..5bab76ff5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc index 17037fac3..52d4692af 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc index 8e2a7d902..e8bcafe4d 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index 7618fa4db..17d286465 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 4653dcc50..1b484212e 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 @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 9beb1c471..709854700 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 @@ -17,13 +17,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 004a63bab..a5d467a8d 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 @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc index 55c0be0ef..22e61bf2e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index dcea38a74..5a1958acc 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index cfe36f6fb..4b36e4725 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index a82599d03..1694b8d67 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 7d2f41fd3..d614f1420 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index 231ce360d..4255e54ba 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc index af6c900fe..53800d708 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 ca2014254..97e2d6531 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 @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc index 0c3365d5e..451879923 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc index 916d9a8aa..b18da4708 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 ba8373aaf..60e6ce9ee 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 @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index c40e45a36..4fd0091fa 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -143,7 +140,7 @@ protected: ~GpsL1CaPcpsAcquisitionTest() override = default; void init(); - void plot_grid(); + void plot_grid() const; gr::top_block_sptr top_block; std::shared_ptr config; @@ -183,7 +180,7 @@ void GpsL1CaPcpsAcquisitionTest::init() } -void GpsL1CaPcpsAcquisitionTest::plot_grid() +void GpsL1CaPcpsAcquisitionTest::plot_grid() const { // load the measured values std::string basename = "./tmp-acq-gps1/acquisition_G_1C"; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc index 2656d9f2c..5a2923d69 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc index 892232746..ab015e0ce 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 9c543d77b..78900eef8 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index ba2207e82..f8e10b61d 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc index c29e0581b..69dc85893 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc b/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc index 8b325dea6..f48fe1945 100644 --- a/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -42,12 +39,12 @@ class DataTypeAdapter : public ::testing::Test public: DataTypeAdapter(); ~DataTypeAdapter() override; - int run_byte_to_short_block(); - int run_ibyte_to_cbyte_block(); - int run_ibyte_to_complex_block(); - int run_ibyte_to_cshort_block(); - int run_ishort_to_complex_block(); - int run_ishort_to_cshort_block(); + int run_byte_to_short_block() const; + int run_ibyte_to_cbyte_block() const; + int run_ibyte_to_complex_block() const; + int run_ibyte_to_cshort_block() const; + int run_ishort_to_complex_block() const; + int run_ishort_to_cshort_block() const; std::string file_name_input; std::string file_name_output; std::vector input_data_bytes; @@ -73,7 +70,7 @@ DataTypeAdapter::DataTypeAdapter() DataTypeAdapter::~DataTypeAdapter() = default; -int DataTypeAdapter::run_ishort_to_cshort_block() +int DataTypeAdapter::run_ishort_to_cshort_block() const { std::shared_ptr config = std::make_shared(); config->set_property("Test.implementation", "Ishort_To_Cshort"); @@ -101,7 +98,7 @@ int DataTypeAdapter::run_ishort_to_cshort_block() } -int DataTypeAdapter::run_ishort_to_complex_block() +int DataTypeAdapter::run_ishort_to_complex_block() const { std::shared_ptr config = std::make_shared(); config->set_property("Test.implementation", "Ishort_To_Complex"); @@ -129,7 +126,7 @@ int DataTypeAdapter::run_ishort_to_complex_block() } -int DataTypeAdapter::run_ibyte_to_cshort_block() +int DataTypeAdapter::run_ibyte_to_cshort_block() const { std::shared_ptr config = std::make_shared(); config->set_property("Test.implementation", "Ibyte_To_Cshort"); @@ -157,7 +154,7 @@ int DataTypeAdapter::run_ibyte_to_cshort_block() } -int DataTypeAdapter::run_ibyte_to_complex_block() +int DataTypeAdapter::run_ibyte_to_complex_block() const { std::shared_ptr config = std::make_shared(); config->set_property("Test.implementation", "Ibyte_To_Complex"); @@ -185,7 +182,7 @@ int DataTypeAdapter::run_ibyte_to_complex_block() } -int DataTypeAdapter::run_ibyte_to_cbyte_block() +int DataTypeAdapter::run_ibyte_to_cbyte_block() const { std::shared_ptr config = std::make_shared(); config->set_property("Test.implementation", "Ibyte_To_Cbyte"); @@ -213,7 +210,7 @@ int DataTypeAdapter::run_ibyte_to_cbyte_block() } -int DataTypeAdapter::run_byte_to_short_block() +int DataTypeAdapter::run_byte_to_short_block() const { std::shared_ptr config = std::make_shared(); config->set_property("Test.implementation", "Byte_To_Short"); diff --git a/src/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc b/src/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc index 9188e877d..e2465d458 100644 --- a/src/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc index 49c1a6f58..0ae347266 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc index 75a757739..c3f19b979 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc index 1467e4daa..05818faa5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc index 6a44b1eb2..f54031eb9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 777b833e1..9a3b91e76 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause set(SIGNAL_PROCESSING_TESTING_LIB_SOURCES diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc index 882b7fd52..781dc3711 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h index 1a6c8fa22..3c6142a7d 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc index dabbde9ec..467ba82c0 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h index 10007810c..50d54c2e7 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc b/src/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc index b77ffce3b..8d131ad96 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc index c5f9fcba2..b3383b816 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h index 1af3c973e..2a36839e4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc index 75ba85d3e..d9bd24727 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h index 382b316f8..9f38eabfe 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc index 5caec37a9..2a6d0ea24 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h index 7067906f7..eb55f0e7f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc index 1b58de804..34fb4256f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h index a4dd97dbc..d7f705975 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc index c4ebbf19a..a6761e8c5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h index 036fec3bd..c761325d8 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- 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 7db35bcb0..b03fb05c1 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 @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -544,8 +541,7 @@ bool HybridObservablesTest::acquire_signal() taps = gr::filter::firdes::low_pass(1.0, baseband_sampling_freq, acq_fs / 2.1, - acq_fs / 10, - gr::filter::firdes::win_type::WIN_HAMMING); + acq_fs / 10); std::cout << "Enabled decimation low pass filter with " << taps.size() << " taps and decimation factor of " << decimation << '\n'; acquisition->set_resampler_latency((taps.size() - 1) / 2); gr::basic_block_sptr fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(decimation, taps); 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 833305e1e..7a56d1d3f 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 @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc index 59c7b2e80..53637ff42 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc index 88d8cc70c..d72b9a52b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc index 091aea3eb..44465480b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc index 4a07ecddf..5dd09b656 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc index c72c3b188..b1bfdcad8 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc index e3188e782..0242d238c 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc b/src/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc index 60e850616..9ee97f321 100644 --- a/src/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc b/src/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc index d65f8b18d..22dd7652c 100644 --- a/src/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc b/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc index b3c013a1b..76bcda022 100644 --- a/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc b/src/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc index 2032f21ce..9d99b1b74 100644 --- a/src/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc b/src/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc index 79a28e852..a95d17f99 100644 --- a/src/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc index ccd370f38..9c3f05e23 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc index 8bde9e366..0a34267f7 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc index 1d7c3e0aa..8b167706b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc index 7dc81e485..57ea5dfbe 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc index 7b0597720..773b188b0 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc index e4ca446ec..698b950a4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc index 7cb8445e3..83f976ed4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc index ae492cae8..23e095c98 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc index 3903ea0f0..9d17f703a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc index 55b8174d9..4e69dae2a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index dce8a386e..0715c0c9d 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index 8f5a968d4..b766346c3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc index 9ab27aa82..03fd87d01 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc index 9db873bdd..76b90367b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc index 1f22f9602..72c2e76db 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc index 3f2eead9d..e87d87862 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc index 31bbeaa12..d8749dc39 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc index 2268f83e6..ece22c317 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index fe44bc98e..c7a90a86e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -558,8 +555,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID) taps = gr::filter::firdes::low_pass(1.0, baseband_sampling_freq, acq_fs / 2.1, - acq_fs / 10, - gr::filter::firdes::win_type::WIN_HAMMING); + acq_fs / 10); std::cout << "Enabled decimation low pass filter with " << taps.size() << " taps and decimation factor of " << decimation << '\n'; acquisition->set_resampler_latency((taps.size() - 1) / 2); gr::basic_block_sptr fir_filter_ccf_ = gr::filter::fir_filter_ccf::make(decimation, taps); 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 3ff00b953..b10fd1b6b 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 @@ -10,13 +10,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc index ca107bc47..a4c1d8650 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc @@ -5,13 +5,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc b/src/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc index dfff5aced..88fc61e04 100644 --- a/src/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc +++ b/src/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * Copyright (C) 2020 (see AUTHORS file for a list of contributors) - * - * GNSS-SDR is a software defined Global Navigation - * Satellite Systems receiver - * + * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc b/src/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc index e9f6d4139..4bdc322bd 100644 --- a/src/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc +++ b/src/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc @@ -7,13 +7,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc b/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc index c74019ff1..1f136f48e 100644 --- a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc +++ b/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc @@ -8,13 +8,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 055430932..aef11952e 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,11 +1,9 @@ -# 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 Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + add_subdirectory(front-end-cal) diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 6be9ff8c3..45fa9c957 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -1,11 +1,8 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause if(USE_CMAKE_TARGET_SOURCES) diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc index 6fa579522..acfe00866 100644 --- a/src/utils/front-end-cal/front_end_cal.cc +++ b/src/utils/front-end-cal/front_end_cal.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/utils/front-end-cal/front_end_cal.h b/src/utils/front-end-cal/front_end_cal.h index b0f354aff..0af4f441a 100644 --- a/src/utils/front-end-cal/front_end_cal.h +++ b/src/utils/front-end-cal/front_end_cal.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 742715b02..69e721d30 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -6,17 +6,15 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- */ + #ifndef FRONT_END_CAL_VERSION #define FRONT_END_CAL_VERSION "0.0.1" #endif diff --git a/src/utils/matlab/dll_pll_veml_plot_sample.m b/src/utils/matlab/dll_pll_veml_plot_sample.m index 4f0cf72df..16d7a2ec6 100644 --- a/src/utils/matlab/dll_pll_veml_plot_sample.m +++ b/src/utils/matlab/dll_pll_veml_plot_sample.m @@ -1,16 +1,14 @@ % Reads GNSS-SDR Tracking dump binary file using the provided % function and plots some internal variables + % Javier Arribas, 2011. jarribas(at)cttc.es % Antonio Ramos, 2018. antonio.ramos(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 -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- @@ -41,7 +39,7 @@ end for N=1:1:channels trackResults(N).status = 'T'; %fake track if plot_last_outputs>0 && plot_last_outputs=0) deg=dms(1)+dms(2)/60+dms(3)/3600; %else diff --git a/src/utils/matlab/libs/geoFunctions/dms2mat.m b/src/utils/matlab/libs/geoFunctions/dms2mat.m index c1cb2ec40..58d5b2a5e 100644 --- a/src/utils/matlab/libs/geoFunctions/dms2mat.m +++ b/src/utils/matlab/libs/geoFunctions/dms2mat.m @@ -17,17 +17,17 @@ function [dout,mout,sout] = dms2mat(dms,n) % % See also MAT2DMS -% Copyright 1996-2002 Systems Planning and Analysis, Inc. and The MathWorks, Inc. -% Written by: E. Byrns, E. Brown -% Revision: 1.10 $Date: 2002/03/20 21:25:06 -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver +% Written by: E. Byrns, E. Brown +% Revision: 1.10 $Date: 2002/03/20 21:25:06 % +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: 1996-2002 Systems Planning and Analysis, Inc. and The MathWorks, Inc. % SPDX-License-Identifier: GPL-3.0-or-later + if nargin == 0 error('Incorrect number of arguments') elseif nargin == 1 diff --git a/src/utils/matlab/libs/geoFunctions/e_r_corr.m b/src/utils/matlab/libs/geoFunctions/e_r_corr.m index ce8d8b222..a9a510c7a 100644 --- a/src/utils/matlab/libs/geoFunctions/e_r_corr.m +++ b/src/utils/matlab/libs/geoFunctions/e_r_corr.m @@ -11,14 +11,10 @@ function X_sat_rot = e_r_corr(traveltime, X_sat) % Outputs: % X_sat_rot - rotated satellite's coordinates (ECEF) -% Written by Kai Borre -% Copyright (c) by Kai Borre -% -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Kai Borre % SPDX-License-Identifier: GPL-3.0-or-later %========================================================================== diff --git a/src/utils/matlab/libs/geoFunctions/findUtmZone.m b/src/utils/matlab/libs/geoFunctions/findUtmZone.m index 3cdbe8e6f..fce9f504f 100644 --- a/src/utils/matlab/libs/geoFunctions/findUtmZone.m +++ b/src/utils/matlab/libs/geoFunctions/findUtmZone.m @@ -12,14 +12,12 @@ function utmZone = findUtmZone(latitude, longitude) %-------------------------------------------------------------------------- % SoftGNSS v3.0 % -% Copyright (C) Darius Plausinaitis % Written by Darius Plausinaitis %-------------------------------------------------------------------------- -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Darius Plausinaitis % SPDX-License-Identifier: GPL-3.0-or-later %========================================================================== diff --git a/src/utils/matlab/libs/geoFunctions/geo2cart.m b/src/utils/matlab/libs/geoFunctions/geo2cart.m index bd214c464..f16068791 100644 --- a/src/utils/matlab/libs/geoFunctions/geo2cart.m +++ b/src/utils/matlab/libs/geoFunctions/geo2cart.m @@ -23,15 +23,12 @@ function [X, Y, Z] = geo2cart(phi, lambda, h, i) % Outputs: % X, Y, Z - Cartesian coordinates (meters) -% Kai Borre 10-13-98 -% Copyright (c) by Kai Borre -% -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Kai Borre, 1998 % SPDX-License-Identifier: GPL-3.0-or-later + %========================================================================== b = phi(1) + phi(2)/60 + phi(3)/3600; diff --git a/src/utils/matlab/libs/geoFunctions/leastSquarePos.m b/src/utils/matlab/libs/geoFunctions/leastSquarePos.m index a7798d494..7b0df3091 100644 --- a/src/utils/matlab/libs/geoFunctions/leastSquarePos.m +++ b/src/utils/matlab/libs/geoFunctions/leastSquarePos.m @@ -21,15 +21,14 @@ function [pos, el, az, dop] = leastSquarePos(satpos, obs, settings) %-------------------------------------------------------------------------- % SoftGNSS v3.0 %-------------------------------------------------------------------------- -%Based on Kai Borre -%Copyright (c) by Kai Borre -%Updated by Darius Plausinaitis, Peter Rinder and Nicolaj Bertelsen -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver +% Based on Kai Borre % +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Kai Borre % SPDX-License-Identifier: GPL-3.0-or-later + %========================================================================== %=== Initialization ======================================================= diff --git a/src/utils/matlab/libs/geoFunctions/mat2dms.m b/src/utils/matlab/libs/geoFunctions/mat2dms.m index 1694be170..d2df05dfc 100644 --- a/src/utils/matlab/libs/geoFunctions/mat2dms.m +++ b/src/utils/matlab/libs/geoFunctions/mat2dms.m @@ -21,14 +21,13 @@ function dmsvec = mat2dms(d,m,s,n) % % See also DMS2MAT -% Copyright 1996-2002 Systems Planning and Analysis, Inc. and The MathWorks, Inc. -% Written by: E. Byrns, E. Brown -% Revision: 1.10 Date: 2002/03/20 21:25:51 -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver +% Written by: E. Byrns, E. Brown +% Revision: 1.10 Date: 2002/03/20 21:25:51 % +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: 1996-2002 Systems Planning and Analysis, Inc. and The MathWorks, Inc. % SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/utils/matlab/libs/geoFunctions/roundn.m b/src/utils/matlab/libs/geoFunctions/roundn.m index 89c724a2b..8336a76a2 100644 --- a/src/utils/matlab/libs/geoFunctions/roundn.m +++ b/src/utils/matlab/libs/geoFunctions/roundn.m @@ -13,14 +13,13 @@ function [x,msg] = roundn(x,n) % % See also ROUND -% Copyright 1996-2002 Systems Planning and Analysis, Inc. and The MathWorks, Inc. -% Written by: E. Byrns, E. Brown -% Revision: 1.9 Date: 2002/03/20 21:26:19 -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver +% Written by: E. Byrns, E. Brown +% Revision: 1.9 Date: 2002/03/20 21:26:19 % +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: 1996-2002 Systems Planning and Analysis, Inc. and The MathWorks, Inc. % SPDX-License-Identifier: GPL-3.0-or-later msg = []; % Initialize output diff --git a/src/utils/matlab/libs/geoFunctions/satpos.m b/src/utils/matlab/libs/geoFunctions/satpos.m index 358523e83..b65004b52 100644 --- a/src/utils/matlab/libs/geoFunctions/satpos.m +++ b/src/utils/matlab/libs/geoFunctions/satpos.m @@ -19,15 +19,13 @@ function [satPositions, satClkCorr] = satpos(transmitTime, prnList, ... % SoftGNSS v3.0 %-------------------------------------------------------------------------- % Based on Kai Borre 04-09-96 -% Copyright (c) by Kai Borre -% -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver +% Updated by Darius Plausinaitis, Peter Rinder and Nicolaj Bertelsen % +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Kai Borre % SPDX-License-Identifier: GPL-3.0-or-later -% Updated by Darius Plausinaitis, Peter Rinder and Nicolaj Bertelsen %% Initialize constants =================================================== numOfSatellites = size(prnList, 2); @@ -50,68 +48,68 @@ satPositions = zeros(3, numOfSatellites); %% Process each satellite ================================================= for satNr = 1 : numOfSatellites - + prn = prnList(satNr); - + %% Find initial satellite clock correction -------------------------------- - + %--- Find time difference --------------------------------------------- dt = check_t(transmitTime - eph(prn).t_oc); - + %--- Calculate clock correction --------------------------------------- satClkCorr(satNr) = (eph(prn).a_f2 * dt + eph(prn).a_f1) * dt + ... eph(prn).a_f0 - ... eph(prn).T_GD; - + time = transmitTime - satClkCorr(satNr); - + %% Find satellite's position ---------------------------------------------- - + %Restore semi-major axis a = eph(prn).sqrtA * eph(prn).sqrtA; - + %Time correction tk = check_t(time - eph(prn).t_oe); - + %Initial mean motion n0 = sqrt(GM / a^3); %Mean motion n = n0 + eph(prn).deltan; - + %Mean anomaly M = eph(prn).M_0 + n * tk; %Reduce mean anomaly to between 0 and 360 deg M = rem(M + 2*gpsPi, 2*gpsPi); - + %Initial guess of eccentric anomaly E = M; - + %--- Iteratively compute eccentric anomaly ---------------------------- for ii = 1:10 E_old = E; E = M + eph(prn).e * sin(E); dE = rem(E - E_old, 2*gpsPi); - + if abs(dE) < 1.e-12 % Necessary precision is reached, exit from the loop break; end end - + %Reduce eccentric anomaly to between 0 and 360 deg E = rem(E + 2*gpsPi, 2*gpsPi); - + %Compute relativistic correction term dtr = F * eph(prn).e * eph(prn).sqrtA * sin(E); - + %Calculate the true anomaly nu = atan2(sqrt(1 - eph(prn).e^2) * sin(E), cos(E)-eph(prn).e); - + %Compute angle phi phi = nu + eph(prn).omega; %Reduce phi to between 0 and 360 deg phi = rem(phi, 2*gpsPi); - + %Correct argument of latitude u = phi + ... eph(prn).C_uc * cos(2*phi) + ... @@ -124,22 +122,22 @@ for satNr = 1 : numOfSatellites i = eph(prn).i_0 + eph(prn).iDot * tk + ... eph(prn).C_ic * cos(2*phi) + ... eph(prn).C_is * sin(2*phi); - + %Compute the angle between the ascending node and the Greenwich meridian Omega = eph(prn).omega_0 + (eph(prn).omegaDot - Omegae_dot)*tk - ... Omegae_dot * eph(prn).t_oe; %Reduce to between 0 and 360 deg Omega = rem(Omega + 2*gpsPi, 2*gpsPi); - + %--- Compute satellite coordinates ------------------------------------ satPositions(1, satNr) = cos(u)*r * cos(Omega) - sin(u)*r * cos(i)*sin(Omega); satPositions(2, satNr) = cos(u)*r * sin(Omega) + sin(u)*r * cos(i)*cos(Omega); satPositions(3, satNr) = sin(u)*r * sin(i); - - + + %% Include relativistic correction in clock correction -------------------- satClkCorr(satNr) = (eph(prn).a_f2 * dt + eph(prn).a_f1) * dt + ... eph(prn).a_f0 - ... eph(prn).T_GD + dtr; - + end % for satNr = 1 : numOfSatellites diff --git a/src/utils/matlab/libs/geoFunctions/togeod.m b/src/utils/matlab/libs/geoFunctions/togeod.m index b297607a9..36f872b11 100644 --- a/src/utils/matlab/libs/geoFunctions/togeod.m +++ b/src/utils/matlab/libs/geoFunctions/togeod.m @@ -20,15 +20,10 @@ function [dphi, dlambda, h] = togeod(a, finv, X, Y, Z) % dlambda - longitude % h - height above reference ellipsoid -% Copyright (C) 1987 C. Goad, Columbus, Ohio -% Reprinted with permission of author, 1996 -% Fortran code translated into MATLAB -% Kai Borre 03-30-96 -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: 1987 C. Goad, 1996 Kai Borre % SPDX-License-Identifier: GPL-3.0-or-later %========================================================================== diff --git a/src/utils/matlab/libs/geoFunctions/topocent.m b/src/utils/matlab/libs/geoFunctions/topocent.m index df3df36ed..2a16e6076 100644 --- a/src/utils/matlab/libs/geoFunctions/topocent.m +++ b/src/utils/matlab/libs/geoFunctions/topocent.m @@ -6,7 +6,7 @@ function [Az, El, D] = topocent(X, dx) % [Az, El, D] = topocent(X, dx); % % Inputs: -% X - vector origin corrdinates (in ECEF system [X; Y; Z;]) +% X - vector origin coordinates (in ECEF system [X; Y; Z;]) % dx - vector ([dX; dY; dZ;]). % % Outputs: @@ -14,15 +14,12 @@ function [Az, El, D] = topocent(X, dx) % Az - azimuth from north positive clockwise, degrees % El - elevation angle, degrees -% Kai Borre 11-24-96 -% Copyright (c) by Kai Borre -% -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Kai Borre 11-24-96 % SPDX-License-Identifier: GPL-3.0-or-later + %========================================================================== dtr = pi/180; diff --git a/src/utils/matlab/libs/geoFunctions/tropo.m b/src/utils/matlab/libs/geoFunctions/tropo.m index 86d4170ce..a65d96d8b 100644 --- a/src/utils/matlab/libs/geoFunctions/tropo.m +++ b/src/utils/matlab/libs/geoFunctions/tropo.m @@ -25,12 +25,11 @@ function ddr = tropo(sinel, hsta, p, tkel, hum, hp, htkel, hhum) % Francisco, December 12-17 % A Matlab reimplementation of a C code from driver. -% Copyright (C) Kai Borre 06-28-95 -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver % +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Kai Borre 06-28-95 % SPDX-License-Identifier: GPL-3.0-or-later %========================================================================== diff --git a/src/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m b/src/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m index 10b61763e..626dd2e86 100644 --- a/src/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m +++ b/src/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m @@ -1,22 +1,18 @@ -% Usage: gps_l1_ca_dll_pll_read_tracking_dump_64bits (filename, [count]) +% Usage: gps_l1_ca_dll_pll_read_tracking_dump (filename, [count]) % +% Read GNSS-SDR Tracking dump binary file into MATLAB. % Opens GNSS-SDR tracking binary log file .dat and returns the contents -% Read GNSS-SDR Tracking dump binary file into MATLAB. -% Javier Arribas, 2011. 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 -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Javier Arribas 2011 % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- -% + function [GNSS_tracking] = gps_l1_ca_dll_pll_read_tracking_dump (filename, count) @@ -100,9 +96,9 @@ else fseek(f,bytes_shift,'bof'); % move to next interleaved double v18 = fread (f, count, 'uint32',skip_bytes_each_read-double_size_bytes); fclose (f); - + %%%%%%%% output vars %%%%%%%% - + % // EPR % d_dump_file.write(reinterpret_cast(&tmp_E), sizeof(float)); % d_dump_file.write(reinterpret_cast(&tmp_P), sizeof(float)); @@ -158,7 +154,7 @@ else var1=v16; var2=v17; PRN=v18; - + GNSS_tracking.E=E; GNSS_tracking.P=P; GNSS_tracking.L=L; @@ -178,4 +174,3 @@ else GNSS_tracking.var2=var2; GNSS_tracking.PRN=PRN; end - diff --git a/src/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m b/src/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m index 15db32286..b8a2ff8dc 100644 --- a/src/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m +++ b/src/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m @@ -1,22 +1,18 @@ % Usage: gps_l1_ca_kf_read_tracking_dump (filename, [count]) % +% Read GNSS-SDR Tracking dump binary file into MATLAB. % Opens GNSS-SDR tracking binary log file .dat and returns the contents -% Read GNSS-SDR Tracking dump binary file into MATLAB. -% Javier Arribas, 2011. 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 -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Javier Arribas 2011 % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- -% + function [GNSS_tracking] = gps_l1_ca_kf_read_tracking_dump (filename, count) @@ -121,7 +117,7 @@ else fseek(f,bytes_shift,'bof'); % move to next unsigned int v22 = fread (f, count, 'uint', skip_bytes_each_read - unsigned_int_size_bytes); fclose (f); - + GNSS_tracking.VE = v1; GNSS_tracking.E = v2; GNSS_tracking.P = v3; @@ -144,4 +140,4 @@ else GNSS_tracking.var1 = v20; GNSS_tracking.var2 = v21; GNSS_tracking.PRN = v22; -end \ No newline at end of file +end diff --git a/src/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m b/src/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m index 4e0c968d4..4cf8a02a2 100644 --- a/src/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m +++ b/src/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m @@ -1,17 +1,12 @@ +% Read GNSS-SDR PVT lib dump binary file into MATLAB. The resulting +% structure is compatible with the K.Borre MATLAB-based receiver. % -% \file gps_l1_ca_pvt_read_pvt_dump.m -% \brief Read GNSS-SDR PVT lib dump binary file into MATLAB. The resulting -% structure is compatible with the K.Borre MATLAB-based receiver. -% \author Javier Arribas, 2011. 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 -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Javier Arribas 2011 % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- @@ -100,4 +95,3 @@ navSolutions.latitude=Lat.'; navSolutions.longitude=Long.'; navSolutions.height=Height.'; navSolutions.TransmitTime=GPS_current_time.'; - diff --git a/src/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m b/src/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m index b028d572f..3fc674b40 100644 --- a/src/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m +++ b/src/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m @@ -1,17 +1,12 @@ % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Javier Arribas 2011 % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- -% -% Javier Arribas 2011 function [pvt_raw] = gps_l1_ca_read_pvt_raw_dump (channels, filename, count) @@ -47,9 +42,9 @@ else bytes_shift=bytes_shift+double_size_bytes; fseek(f,bytes_shift,'bof'); % move to next interleaved end - + fclose (f); - + %%%%%%%% output vars %%%%%%%% % for (unsigned int i=0; i Lim2sCompl) data_bytes(k) = -Base2sCompl + data_bytes(k); end - end - + end + % take the nbits most significant bits data_bytes = floor(data_bytes/DivVal); - + % quantization correction data_bytes = data_bytes*2 + 1; @@ -67,11 +63,11 @@ while do if (data_bytes(k) < 0) data_bytes(k) = Base2sCompl + data_bytes(k); end - end - + end + % write result fwrite(fileID2, data_bytes); - + if (size(data_bytes) < BlockSize) do = false; else @@ -81,4 +77,4 @@ end % close files fclose(fileID); -fclose(fileID2); \ No newline at end of file +fclose(fileID2); diff --git a/src/utils/matlab/libs/read_complex_binary.m b/src/utils/matlab/libs/read_complex_binary.m index eab9ac1ca..e096afc18 100644 --- a/src/utils/matlab/libs/read_complex_binary.m +++ b/src/utils/matlab/libs/read_complex_binary.m @@ -6,13 +6,10 @@ % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- diff --git a/src/utils/matlab/libs/read_complex_char_binary.m b/src/utils/matlab/libs/read_complex_char_binary.m index 0ae6caa6c..f10dbf199 100644 --- a/src/utils/matlab/libs/read_complex_char_binary.m +++ b/src/utils/matlab/libs/read_complex_char_binary.m @@ -6,13 +6,10 @@ % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- diff --git a/src/utils/matlab/libs/read_complex_short_binary.m b/src/utils/matlab/libs/read_complex_short_binary.m index 575891356..4fd92b6de 100644 --- a/src/utils/matlab/libs/read_complex_short_binary.m +++ b/src/utils/matlab/libs/read_complex_short_binary.m @@ -6,13 +6,10 @@ % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- diff --git a/src/utils/matlab/libs/read_hybrid_observables_dump.m b/src/utils/matlab/libs/read_hybrid_observables_dump.m index 6410fddb1..a513f097b 100644 --- a/src/utils/matlab/libs/read_hybrid_observables_dump.m +++ b/src/utils/matlab/libs/read_hybrid_observables_dump.m @@ -1,22 +1,15 @@ -% Usage: read_tracking_dat (filename, [count]) -% % Opens GNSS-SDR tracking binary log file .dat and returns the contents % % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Javier Arribas 2011 % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- -% -% Javier Arribas 2011 function [observables] = read_hybrid_observables_dump (channels, filename, count) @@ -59,9 +52,9 @@ else bytes_shift=bytes_shift+double_size_bytes; fseek(f,bytes_shift,'bof'); % move to next interleaved end - + fclose (f); - + %%%%%%%% output vars %%%%%%%% % double tmp_double; % for (unsigned int i = 0; i < d_nchannels; i++) @@ -82,4 +75,3 @@ else % d_dump_file.write((char*)&tmp_double, sizeof(double)); % } end - diff --git a/src/utils/matlab/libs/read_true_sim_observables_dump.m b/src/utils/matlab/libs/read_true_sim_observables_dump.m index 70f15aa86..c9add167d 100644 --- a/src/utils/matlab/libs/read_true_sim_observables_dump.m +++ b/src/utils/matlab/libs/read_true_sim_observables_dump.m @@ -5,18 +5,14 @@ % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Javier Arribas 2011 % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- -% -% Javier Arribas 2011 + function [observables] = read_true_sim_observables_dump (filename, count) @@ -61,9 +57,9 @@ else bytes_shift=bytes_shift+double_size_bytes; fseek(f,bytes_shift,'bof'); % move to next interleaved end - + fclose (f); - + % %%%%%%%% output vars %%%%%%%% % for(int i=0;i<12;i++) % { @@ -76,4 +72,3 @@ else % d_dump_file.read((char *) &prn[i], sizeof(double)); % } end - diff --git a/src/utils/matlab/plotTrackingE5a.m b/src/utils/matlab/plotTrackingE5a.m index 6935a56f3..9156ab1c3 100644 --- a/src/utils/matlab/plotTrackingE5a.m +++ b/src/utils/matlab/plotTrackingE5a.m @@ -11,14 +11,12 @@ function plotTracking(channelList, trackResults, settings) %-------------------------------------------------------------------------- % SoftGNSS v3.0 % -% Copyright (C) Darius Plausinaitis % Written by Darius Plausinaitis %-------------------------------------------------------------------------- -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % +% SPDX-FileCopyrightText: Darius Plausinaitis % SPDX-License-Identifier: GPL-3.0-or-later %-------------------------------------------------------------------------- diff --git a/src/utils/matlab/plot_acq_grid.m b/src/utils/matlab/plot_acq_grid.m index 33479405c..ad4d3e060 100644 --- a/src/utils/matlab/plot_acq_grid.m +++ b/src/utils/matlab/plot_acq_grid.m @@ -3,13 +3,10 @@ % Antonio Ramos, 2017. antonio.ramos(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 -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. -% +% +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- @@ -80,7 +77,7 @@ switch(signal_type) case 9 n_chips = 10230; system = 'C'; - signal = 'B3'; + signal = 'B3'; case 10 n_chips = 10230; system = 'C'; diff --git a/src/utils/matlab/plot_acq_grid_gsoc.m b/src/utils/matlab/plot_acq_grid_gsoc.m index 71b62c2e8..b885684d2 100644 --- a/src/utils/matlab/plot_acq_grid_gsoc.m +++ b/src/utils/matlab/plot_acq_grid_gsoc.m @@ -8,13 +8,10 @@ % Luis Esteve, 2012. luis(at)epsilon-formacion.com % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. -% +% +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- @@ -80,4 +77,4 @@ surf(X,Y,acq_grid'); xlabel('Doppler(Hz)');ylabel('Code Delay(samples)');title(['GLRT statistic of Galileo Parallel Code Phase Search Acquisition. Local replica: E1C cboc PRN ' num2str(sat)]); -end \ No newline at end of file +end diff --git a/src/utils/matlab/plot_acq_grid_gsoc_e5.m b/src/utils/matlab/plot_acq_grid_gsoc_e5.m index 53fea0cf9..228baf4fd 100644 --- a/src/utils/matlab/plot_acq_grid_gsoc_e5.m +++ b/src/utils/matlab/plot_acq_grid_gsoc_e5.m @@ -7,17 +7,14 @@ % of the Google Summer of Code (GSoC) 2014, with the collaboration of Luis Esteve, Javier Arribas % and Carles Fernandez, related to the extension of GNSS-SDR to Galileo. % -% Marc Sales marcsales92(at)gmail.com, +% Marc Sales marcsales92(at)gmail.com, % Luis Esteve, 2014. luis(at)epsilon-formacion.com % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. -% +% +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- @@ -122,4 +119,3 @@ for k=1:num_samples end end - diff --git a/src/utils/matlab/plot_acq_grid_gsoc_glonass.m b/src/utils/matlab/plot_acq_grid_gsoc_glonass.m index 45dbfc162..958551cfc 100644 --- a/src/utils/matlab/plot_acq_grid_gsoc_glonass.m +++ b/src/utils/matlab/plot_acq_grid_gsoc_glonass.m @@ -7,13 +7,10 @@ % % ------------------------------------------------------------------------- % -% 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 Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. -% +% +% Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) % SPDX-License-Identifier: GPL-3.0-or-later % % ------------------------------------------------------------------------- diff --git a/src/utils/matlab/plot_tracking_quality_indicators.m b/src/utils/matlab/plot_tracking_quality_indicators.m index 12764de4c..5d3329a68 100644 --- a/src/utils/matlab/plot_tracking_quality_indicators.m +++ b/src/utils/matlab/plot_tracking_quality_indicators.m @@ -1,8 +1,6 @@ % plot tracking quality indicators -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % % SPDX-FileCopyrightText: Javier Arribas diff --git a/src/utils/reproducibility/ieee-access18/plot_dump.m b/src/utils/reproducibility/ieee-access18/plot_dump.m index 480c51029..4733cfbe2 100644 --- a/src/utils/reproducibility/ieee-access18/plot_dump.m +++ b/src/utils/reproducibility/ieee-access18/plot_dump.m @@ -1,8 +1,6 @@ % ------------------------------------------------------------------------- % -% GNSS-SDR is a software defined Global Navigation -% Satellite Systems receiver -% +% GNSS-SDR is a Global Navigation Satellite System software-defined receiver. % This file is part of GNSS-SDR. % % SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/utils/rinex-tools/CMakeLists.txt b/src/utils/rinex-tools/CMakeLists.txt index 569c48732..3b54880e0 100644 --- a/src/utils/rinex-tools/CMakeLists.txt +++ b/src/utils/rinex-tools/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND) OR ENABLE_OWN_ARMADILLO) # requires back(), introduced in Armadillo 9.800 message(STATUS "The obsdiff utility tool will be built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'") diff --git a/src/utils/rinex-tools/obsdiff.cc b/src/utils/rinex-tools/obsdiff.cc index 7d892cb31..489b88e6a 100644 --- a/src/utils/rinex-tools/obsdiff.cc +++ b/src/utils/rinex-tools/obsdiff.cc @@ -9,13 +9,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- @@ -140,7 +137,7 @@ std::map ReadRinexObs(const std::string& rinex_file, char system std::cout << "Reading RINEX OBS file " << rinex_file << " ...\n"; while (r_base >> r_base_data) { - for (auto& prn_it : PRN_set) + for (const auto& prn_it : PRN_set) { prn.id = prn_it; gpstk::CommonTime time = r_base_data.time; @@ -1555,7 +1552,7 @@ void RINEX_doublediff(bool remove_rx_clock_error) std::set PRN_set = available_gps_prn; double min_range = std::numeric_limits::max(); int reference_sat_id = 1; - for (auto& base_prn_it : PRN_set) + for (const auto& base_prn_it : PRN_set) { if (base_obs.find(base_prn_it) != base_obs.end() and rover_obs.find(base_prn_it) != rover_obs.end()) { @@ -1571,7 +1568,7 @@ void RINEX_doublediff(bool remove_rx_clock_error) if (base_obs.find(reference_sat_id) != base_obs.end() and rover_obs.find(reference_sat_id) != rover_obs.end()) { std::cout << "Using reference satellite SV " << reference_sat_id << " with minimum range of " << min_range << " [meters]\n"; - for (auto& current_sat_id : PRN_set) + for (const auto& current_sat_id : PRN_set) { if (current_sat_id != reference_sat_id) { @@ -1671,7 +1668,7 @@ void RINEX_singlediff() // compute single differences std::set PRN_set = available_gps_prn; std::cout << "Computing Code Pseudorange rate vs. Carrier phase rate difference...\n"; - for (auto& current_sat_id : PRN_set) + for (const auto& current_sat_id : PRN_set) { if (rover_obs.find(current_sat_id) != rover_obs.end()) { diff --git a/src/utils/rinex-tools/obsdiff_flags.h b/src/utils/rinex-tools/obsdiff_flags.h index 8a6403b06..961ae9536 100644 --- a/src/utils/rinex-tools/obsdiff_flags.h +++ b/src/utils/rinex-tools/obsdiff_flags.h @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * ----------------------------------------------------------------------------- diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt index 4cfa92350..e665d95a9 100644 --- a/src/utils/rinex2assist/CMakeLists.txt +++ b/src/utils/rinex2assist/CMakeLists.txt @@ -1,11 +1,9 @@ -# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) -# -# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver -# +# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-License-Identifier: GPL-3.0-or-later -# +# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-License-Identifier: BSD-3-Clause + find_package(GPSTK QUIET) if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) diff --git a/src/utils/rinex2assist/main.cc b/src/utils/rinex2assist/main.cc index 1198f9e39..2b9dc17d9 100644 --- a/src/utils/rinex2assist/main.cc +++ b/src/utils/rinex2assist/main.cc @@ -6,13 +6,10 @@ * * ----------------------------------------------------------------------------- * - * 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 Global Navigation Satellite System software-defined receiver. * This file is part of GNSS-SDR. * + * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * SPDX-License-Identifier: GPL-3.0-or-later * * -----------------------------------------------------------------------------