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

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into normalize-discriminator

Browse Source
This commit is contained in:
Carles Fernandez 2020-02-13 11:09:16 +01:00
commit b8f2182a01
231 changed files with 970 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -1,5 +1,7 @@
# Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
@ -1737,6 +1739,29 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
message(FATAL_ERROR "aclocal is required to build matio from source") message(FATAL_ERROR "aclocal is required to build matio from source")
endif() endif()
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if((NOT EXISTS /usr/local/bin/glibtoolize AND NOT EXISTS /opt/local/bin/glibtoolize) OR
(NOT EXISTS /usr/local/bin/aclocal AND NOT EXISTS /opt/local/bin/aclocal))
message(" libtool/automake tools have not been found.")
message(" You can try to install them by typing:")
message(" 'sudo port install libtool automake', if you use Macports, or 'brew install libtool automake', if you use Homebrew")
message(FATAL_ERROR "libtool/automake tools are required to build matio from source")
endif()
if(CMAKE_GENERATOR STREQUAL Xcode)
if(EXISTS /opt/local/bin/glibtoolize OR EXISTS /opt/local/bin/aclocal)
if(NOT EXISTS /usr/local/bin/glibtoolize OR NOT EXISTS /usr/local/bin/aclocal)
message(" WARNING: libtool/atomake binaries cannot be found by Xcode. Please do:")
message("sudo ln -s /opt/local/bin/glibtoolize /usr/local/bin/")
message("sudo ln -s /opt/local/bin/aclocal /usr/local/bin/")
message("sudo ln -s /opt/local/bin/autom4te /usr/local/bin/")
message("sudo ln -s /opt/local/bin/automake /usr/local/bin/")
message("sudo ln -s /opt/local/bin/autoconf /usr/local/bin/")
message("sudo ln -s /opt/local/bin/autoreconf /usr/local/bin/") # not needed by Matio, but by Protocol Buffers
message(FATAL_ERROR "libtool/automake tools cannot be found by Xcode")
endif()
endif()
endif()
endif()
find_package(HDF5) find_package(HDF5)
set_package_properties(HDF5 PROPERTIES set_package_properties(HDF5 PROPERTIES
URL "https://support.hdfgroup.org/HDF5/" URL "https://support.hdfgroup.org/HDF5/"
@ -2083,6 +2108,29 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI
message(FATAL_ERROR "aclocal is required to build Protocol Buffers from source") message(FATAL_ERROR "aclocal is required to build Protocol Buffers from source")
endif() endif()
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if((NOT EXISTS /usr/local/bin/glibtoolize AND NOT EXISTS /opt/local/bin/glibtoolize) OR
(NOT EXISTS /usr/local/bin/aclocal AND NOT EXISTS /opt/local/bin/aclocal))
message(" libtool/automake tools have not been found.")
message(" You can try to install them by typing:")
message(" 'sudo port install libtool automake', if you use Macports, or 'brew install libtool automake', if you use Homebrew")
message(FATAL_ERROR "libtool/automake tools are required to build Protocol Buffers from source")
endif()
if(CMAKE_GENERATOR STREQUAL Xcode)
if(EXISTS /opt/local/bin/glibtoolize OR EXISTS /opt/local/bin/aclocal)
if(NOT EXISTS /usr/local/bin/glibtoolize OR NOT EXISTS /usr/local/bin/aclocal)
message(" WARNING: libtool/automake binaries cannot be found by Xcode. Please do:")
message("sudo ln -s /opt/local/bin/glibtoolize /usr/local/bin/")
message("sudo ln -s /opt/local/bin/aclocal /usr/local/bin/")
message("sudo ln -s /opt/local/bin/autom4te /usr/local/bin/")
message("sudo ln -s /opt/local/bin/automake /usr/local/bin/")
message("sudo ln -s /opt/local/bin/autoconf /usr/local/bin/")
message("sudo ln -s /opt/local/bin/autoreconf /usr/local/bin/")
message(FATAL_ERROR "libtool/automake tools cannot be found by Xcode")
endif()
endif()
endif()
endif()
set(PROTOBUF_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}) set(PROTOBUF_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
if(PROTOBUF_MAKE_PROGRAM MATCHES "ninja" OR CMAKE_GENERATOR STREQUAL Xcode) if(PROTOBUF_MAKE_PROGRAM MATCHES "ninja" OR CMAKE_GENERATOR STREQUAL Xcode)

4
cmake/Modules/AvoidAccelerate.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

2
cmake/Modules/DetectLinuxDistro.cmake
View File

@ -1,5 +1,7 @@
# Copyright (C) 2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

2
cmake/Modules/DetectMacOSVersion.cmake
View File

@ -1,5 +1,7 @@
# Copyright (C) 2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

2
cmake/Modules/FindFILESYSTEM.cmake
View File

@ -1,5 +1,7 @@
# Copyright (C) 2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2019 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

4
cmake/Modules/FindGFLAGS.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGFORTRAN.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGLOG.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGNSSSIMULATOR.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGNURADIO.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGOOGLETEST.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGPERFTOOLS.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGPSTK.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGRDBFCTTC.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGRGN3S.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGRIIO.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindGROSMOSDR.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindLIBAD9361.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindLIBIIO.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindLOG4CPP.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindMATIO.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindOPENCL.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindORC.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindPUGIXML.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindTELEORBIT.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/FindUHD.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

5
cmake/Modules/FindVOLK.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -84,6 +86,7 @@ if(NOT VOLK_VERSION)
list(GET VOLK_LIBRARIES 0 FIRST_DIR) list(GET VOLK_LIBRARIES 0 FIRST_DIR)
get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY) get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY)
if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake) if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake)
set(PACKAGE_FIND_VERSION_MAJOR 0)
include(${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake) include(${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake)
endif() endif()
if(PACKAGE_VERSION) if(PACKAGE_VERSION)

4
cmake/Modules/FindVOLKGNSSSDR.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/GnsssdrBuildTypes.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/SetupPython.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Modules/TestForARM.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/aarch64-linux-gnu.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm-linux-gnueabihf.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm_cortex_a15_hardfp_native.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm_cortex_a53_hardfp_native.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm_cortex_a72_hardfp_native.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm_cortex_a8_hardfp_native.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm_cortex_a8_softfp_native.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/arm_cortex_a9_hardfp_native.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/oe-sdk_cross.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/raspi3.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/raspi4.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/Toolchains/zynq-7000.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
cmake/cmake_uninstall.cmake.in
View File

@ -1,4 +1,6 @@
# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2011-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

5
docs/changelog
View File

@ -81,6 +81,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
- All constructors callable with one argument are marked with the keyword explicit. See MISRA C++:2008, 12-1-3 - All constructors that are callable with a single argument of fundamental type shall be declared explicit. - All constructors callable with one argument are marked with the keyword explicit. See MISRA C++:2008, 12-1-3 - All constructors that are callable with a single argument of fundamental type shall be declared explicit.
### Improvements in Repeatability:
- Added the option to apply carrier smoothing of code pseudoranges with new Observables parameter enable_carrier_smoothing.
### Improvements in Testability: ### Improvements in Testability:
- Add receiver runtime to position_test report. - Add receiver runtime to position_test report.

2
docs/doxygen/other/main_page.dox
View File

@ -1,5 +1,7 @@
# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

2
docs/doxygen/other/reference_docs.dox
View File

@ -1,5 +1,7 @@
# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

2
docs/doxygen/other/signal_model.dox
View File

@ -1,5 +1,7 @@
# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

4
src/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/PVT/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

6
src/algorithms/PVT/adapters/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -22,9 +24,9 @@ target_link_libraries(pvt_adapters
PUBLIC PUBLIC
pvt_gr_blocks pvt_gr_blocks
algorithms_libs_rtklib algorithms_libs_rtklib
core_system_parameters
PRIVATE PRIVATE
gnss_sdr_flags gnss_sdr_flags
Glog::glog
pvt_libs pvt_libs
) )

5
src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -36,7 +38,6 @@ target_link_libraries(pvt_gr_blocks
Gnuradio::runtime Gnuradio::runtime
PRIVATE PRIVATE
pvt_libs pvt_libs
algorithms_libs
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Boost::serialization Boost::serialization

16
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
View File

@ -1895,14 +1895,15 @@ std::map<int, Gnss_Synchro> rtklib_pvt_gs::interpolate_observables(std::map<int,
return interp_observables_map; return interp_observables_map;
} }
void rtklib_pvt_gs::initialize_and_apply_carrier_phase_offset() void rtklib_pvt_gs::initialize_and_apply_carrier_phase_offset()
{ {
//we have a valid PVT. First check if we need to reset the initial carrier phase offsets to match their pseudoranges // we have a valid PVT. First check if we need to reset the initial carrier phase offsets to match their pseudoranges
std::map<int, Gnss_Synchro>::iterator observables_iter; std::map<int, Gnss_Synchro>::iterator observables_iter;
for (observables_iter = gnss_observables_map.begin(); observables_iter != gnss_observables_map.end(); observables_iter++) for (observables_iter = gnss_observables_map.begin(); observables_iter != gnss_observables_map.end(); observables_iter++)
{ {
//check if an initialization is required (new satellite or loss of lock) // check if an initialization is required (new satellite or loss of lock)
//it is set to false by the work function if the gnss_synchro is not valid // it is set to false by the work function if the gnss_synchro is not valid
if (channel_initialized.at(observables_iter->second.Channel_ID) == false) if (channel_initialized.at(observables_iter->second.Channel_ID) == false)
{ {
double wavelength_m = 0; double wavelength_m = 0;
@ -1948,11 +1949,12 @@ void rtklib_pvt_gs::initialize_and_apply_carrier_phase_offset()
channel_initialized.at(observables_iter->second.Channel_ID) = true; channel_initialized.at(observables_iter->second.Channel_ID) = true;
DLOG(INFO) << "initialized carrier phase at channel " << observables_iter->second.Channel_ID; DLOG(INFO) << "initialized carrier phase at channel " << observables_iter->second.Channel_ID;
} }
//apply the carrier phase offset to this satellite // apply the carrier phase offset to this satellite
observables_iter->second.Carrier_phase_rads = observables_iter->second.Carrier_phase_rads + initial_carrier_phase_offset_estimation_rads.at(observables_iter->second.Channel_ID); observables_iter->second.Carrier_phase_rads = observables_iter->second.Carrier_phase_rads + initial_carrier_phase_offset_estimation_rads.at(observables_iter->second.Channel_ID);
} }
} }
int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_items, int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items __attribute__((unused))) gr_vector_void_star& output_items __attribute__((unused)))
{ {
@ -2075,7 +2077,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
} }
else else
{ {
channel_initialized.at(i) = false; //the current channel is not reporting valid observable channel_initialized.at(i) = false; // the current channel is not reporting valid observable
} }
} }
@ -2159,8 +2161,8 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
if (flag_pvt_valid == true) if (flag_pvt_valid == true)
{ {
//initialize (if needed) the accumulated phase offset and apply it to the active channels // initialize (if needed) the accumulated phase offset and apply it to the active channels
//required to report accumulated phase cycles comparable to pseudoranges // required to report accumulated phase cycles comparable to pseudoranges
initialize_and_apply_carrier_phase_offset(); initialize_and_apply_carrier_phase_offset();
double Rx_clock_offset_s = d_user_pvt_solver->get_time_offset_s(); double Rx_clock_offset_s = d_user_pvt_solver->get_time_offset_s();

4
src/algorithms/PVT/libs/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
@ -65,10 +67,10 @@ target_link_libraries(pvt_libs
Armadillo::armadillo Armadillo::armadillo
Boost::date_time Boost::date_time
protobuf::libprotobuf protobuf::libprotobuf
algorithms_libs_rtklib
core_system_parameters core_system_parameters
PRIVATE PRIVATE
algorithms_libs algorithms_libs
algorithms_libs_rtklib
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Matio::matio Matio::matio

4
src/algorithms/acquisition/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

16
src/algorithms/acquisition/adapters/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -85,21 +87,27 @@ add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
target_link_libraries(acquisition_adapters target_link_libraries(acquisition_adapters
PUBLIC PUBLIC
algorithms_libs algorithms_libs
gnss_sdr_flags
acquisition_gr_blocks acquisition_gr_blocks
acquisition_libs acquisition_libs
channel_libs channel_libs
core_system_parameters core_system_parameters
Gnuradio::blocks Gnuradio::blocks
Volk::volk
PRIVATE PRIVATE
gnss_sdr_flags
Boost::headers Boost::headers
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Gnuradio::fft Gnuradio::fft
Volkgnsssdr::volkgnsssdr
) )
if(ENABLE_FPGA)
target_link_libraries(acquisition_adapters
PRIVATE
Volk::volk
Volkgnsssdr::volkgnsssdr
)
endif()
target_include_directories(acquisition_adapters target_include_directories(acquisition_adapters
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces ${CMAKE_SOURCE_DIR}/src/core/interfaces

1
src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
View File

@ -29,7 +29,6 @@
#include "pcps_acquisition.h" #include "pcps_acquisition.h"
#include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/blocks/float_to_complex.h>
#include <gnuradio/blocks/stream_to_vector.h> #include <gnuradio/blocks/stream_to_vector.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <string> #include <string>

1
src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h
View File

@ -28,7 +28,6 @@
#include "pcps_acquisition.h" #include "pcps_acquisition.h"
#include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/blocks/float_to_complex.h>
#include <gnuradio/blocks/stream_to_vector.h> #include <gnuradio/blocks/stream_to_vector.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <string> #include <string>

1
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
View File

@ -27,7 +27,6 @@
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include "pcps_acquisition.h" #include "pcps_acquisition.h"
#include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/blocks/float_to_complex.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>

1
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
View File

@ -31,7 +31,6 @@
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include "pcps_acquisition.h" #include "pcps_acquisition.h"
#include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/blocks/float_to_complex.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>

1
src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
View File

@ -28,7 +28,6 @@
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include "pcps_acquisition.h" #include "pcps_acquisition.h"
#include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/blocks/float_to_complex.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>

3
src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
View File

@ -26,7 +26,6 @@
#include "channel_fsm.h" #include "channel_fsm.h"
#include "pcps_acquisition_fpga.h" #include "pcps_acquisition_fpga.h"
#include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr #include <gnuradio/runtime_types.h> // for basic_block_sptr, top_block_sptr
#include <volk/volk_complex.h> // for lv_16sc_t
#include <cstddef> // for size_t #include <cstddef> // for size_t
#include <memory> // for weak_ptr #include <memory> // for weak_ptr
#include <string> // for string #include <string> // for string
@ -64,7 +63,7 @@ public:
inline size_t item_size() override inline size_t item_size() override
{ {
return sizeof(lv_16sc_t); return sizeof(float);
} }
void connect(gr::top_block_sptr top_block) override; void connect(gr::top_block_sptr top_block) override;

1
src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
View File

@ -28,7 +28,6 @@
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include "pcps_acquisition.h" #include "pcps_acquisition.h"
#include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/blocks/float_to_complex.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>

4
src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

18
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
View File

@ -119,11 +119,11 @@ pcps_acquisition::pcps_acquisition(const Acq_Conf& conf_) : gr::block("pcps_acqu
// //
// We can avoid this by doing linear correlation, effectively doubling the // We can avoid this by doing linear correlation, effectively doubling the
// size of the input buffer and padding the code with zeros. // size of the input buffer and padding the code with zeros.
//if (acq_parameters.bit_transition_flag) // if (acq_parameters.bit_transition_flag)
//{ // {
//d_fft_size = d_consumed_samples * 2; // d_fft_size = d_consumed_samples * 2;
//acq_parameters.max_dwells = 1; // Activation of acq_parameters.bit_transition_flag invalidates the value of acq_parameters.max_dwells // acq_parameters.max_dwells = 1; // Activation of acq_parameters.bit_transition_flag invalidates the value of acq_parameters.max_dwells
//} // }
d_tmp_buffer = volk_gnsssdr::vector<float>(d_fft_size); d_tmp_buffer = volk_gnsssdr::vector<float>(d_fft_size);
d_fft_codes = volk_gnsssdr::vector<std::complex<float>>(d_fft_size); d_fft_codes = volk_gnsssdr::vector<std::complex<float>>(d_fft_size);
@ -239,13 +239,13 @@ bool pcps_acquisition::is_fdma()
if (strcmp(d_gnss_synchro->Signal, "1G") == 0) if (strcmp(d_gnss_synchro->Signal, "1G") == 0)
{ {
d_doppler_bias = static_cast<int32_t>(DFRQ1_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN)); d_doppler_bias = static_cast<int32_t>(DFRQ1_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN));
LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; DLOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl;
return true; return true;
} }
if (strcmp(d_gnss_synchro->Signal, "2G") == 0) if (strcmp(d_gnss_synchro->Signal, "2G") == 0)
{ {
d_doppler_bias += static_cast<int32_t>(DFRQ2_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN)); d_doppler_bias += static_cast<int32_t>(DFRQ2_GLO * GLONASS_PRN.at(d_gnss_synchro->PRN));
LOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl; DLOG(INFO) << "Trying to acquire SV PRN " << d_gnss_synchro->PRN << " with freq " << d_doppler_bias << " in Glonass Channel " << GLONASS_PRN.at(d_gnss_synchro->PRN) << std::endl;
return true; return true;
} }
return false; return false;
@ -363,7 +363,7 @@ void pcps_acquisition::send_positive_acquisition()
{ {
// Declare positive acquisition using a message port // Declare positive acquisition using a message port
// 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL
LOG(INFO) << "positive acquisition" DLOG(INFO) << "positive acquisition"
<< ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN
<< ", sample_stamp " << d_sample_counter << ", sample_stamp " << d_sample_counter
<< ", test statistics value " << d_test_statistics << ", test statistics value " << d_test_statistics
@ -391,7 +391,7 @@ void pcps_acquisition::send_negative_acquisition()
{ {
// Declare negative acquisition using a message port // Declare negative acquisition using a message port
// 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL
LOG(INFO) << "negative acquisition" DLOG(INFO) << "negative acquisition"
<< ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN
<< ", sample_stamp " << d_sample_counter << ", sample_stamp " << d_sample_counter
<< ", test statistics value " << d_test_statistics << ", test statistics value " << d_test_statistics

6
src/algorithms/acquisition/libs/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -24,8 +26,6 @@ add_library(acquisition_libs
) )
target_link_libraries(acquisition_libs target_link_libraries(acquisition_libs
PUBLIC
Volk::volk
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog

4
src/algorithms/channel/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/channel/adapters/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/channel/libs/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/conditioner/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/conditioner/adapters/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/data_type_adapter/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# #
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

6
src/algorithms/data_type_adapter/adapters/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -38,8 +40,6 @@ target_link_libraries(data_type_adapters
PUBLIC PUBLIC
Gnuradio::blocks Gnuradio::blocks
data_type_gr_blocks data_type_gr_blocks
algorithms_libs
core_system_parameters
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog

1
src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
View File

@ -22,7 +22,6 @@
#include "conjugate_cc.h" #include "conjugate_cc.h"
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include "gnss_synchro.h"
#include <gnuradio/blocks/file_sink.h> #include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/interleaved_char_to_complex.h> #include <gnuradio/blocks/interleaved_char_to_complex.h>
#include <string> #include <string>

5
src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -32,7 +34,6 @@ target_link_libraries(data_type_gr_blocks
PUBLIC PUBLIC
Gnuradio::runtime Gnuradio::runtime
Boost::headers Boost::headers
algorithms_libs
PRIVATE PRIVATE
Volk::volk Volk::volk
) )

1
src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h
View File

@ -20,7 +20,6 @@
#ifndef GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H #ifndef GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H
#define GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H #define GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gnuradio/sync_decimator.h> #include <gnuradio/sync_decimator.h>

4
src/algorithms/input_filter/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

5
src/algorithms/input_filter/adapters/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -38,7 +40,6 @@ target_link_libraries(input_filter_adapters
Gnuradio::blocks Gnuradio::blocks
Gnuradio::filter Gnuradio::filter
input_filter_gr_blocks input_filter_gr_blocks
algorithms_libs
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog

6
src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -33,8 +35,8 @@ target_link_libraries(input_filter_gr_blocks
PUBLIC PUBLIC
Gnuradio::blocks Gnuradio::blocks
Gnuradio::filter Gnuradio::filter
Volkgnsssdr::volkgnsssdr
PRIVATE PRIVATE
Volk::volk
Log4cpp::log4cpp Log4cpp::log4cpp
) )

6
src/algorithms/libs/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -92,13 +94,13 @@ target_link_libraries(algorithms_libs
PUBLIC PUBLIC
Armadillo::armadillo Armadillo::armadillo
Boost::headers Boost::headers
Gflags::gflags
Gnuradio::runtime Gnuradio::runtime
Gnuradio::blocks Gnuradio::blocks
PRIVATE PRIVATE
core_system_parameters core_system_parameters
Volk::volk ${ORC_LIBRARIES} Volk::volk ${ORC_LIBRARIES}
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
Gflags::gflags
Glog::glog Glog::glog
) )

17
src/algorithms/libs/gnss_sdr_flags.cc
View File

@ -19,7 +19,6 @@
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include <cstdint>
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -71,6 +70,7 @@ DEFINE_double(dll_bw_hz, 0.0, "If defined, bandwidth of the DLL low pass filter,
DEFINE_double(pll_bw_hz, 0.0, "If defined, bandwidth of the PLL low pass filter, in Hz (overrides the configuration file)."); DEFINE_double(pll_bw_hz, 0.0, "If defined, bandwidth of the PLL low pass filter, in Hz (overrides the configuration file).");
DEFINE_int32(carrier_smoothing_factor, DEFAULT_CARRIER_SMOOTHING_FACTOR, "Sets carrier smoothing factor M (overrides the configuration file)");
#if GFLAGS_GREATER_2_0 #if GFLAGS_GREATER_2_0
@ -214,6 +214,19 @@ static bool ValidatePllBw(const char* flagname, double value)
return false; return false;
} }
static bool ValidateCarrierSmoothingFactor(const char* flagname, int32_t value)
{
const int32_t min_value = 1;
if (value >= min_value)
{ // value is ok
return true;
}
std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 1 <= " << flagname << "." << std::endl;
std::cout << "GNSS-SDR program ended." << std::endl;
return false;
}
DEFINE_validator(c, &ValidateC); DEFINE_validator(c, &ValidateC);
DEFINE_validator(config_file, &ValidateConfigFile); DEFINE_validator(config_file, &ValidateConfigFile);
DEFINE_validator(s, &ValidateS); DEFINE_validator(s, &ValidateS);
@ -226,6 +239,6 @@ DEFINE_validator(max_lock_fail, &ValidateMaxLockFail);
DEFINE_validator(carrier_lock_th, &ValidateCarrierLockTh); DEFINE_validator(carrier_lock_th, &ValidateCarrierLockTh);
DEFINE_validator(dll_bw_hz, &ValidateDllBw); DEFINE_validator(dll_bw_hz, &ValidateDllBw);
DEFINE_validator(pll_bw_hz, &ValidatePllBw); DEFINE_validator(pll_bw_hz, &ValidatePllBw);
DEFINE_validator(carrier_smoothing_factor, &ValidateCarrierSmoothingFactor);
#endif #endif

5
src/algorithms/libs/gnss_sdr_flags.h
View File

@ -22,6 +22,7 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <cstdint>
DECLARE_string(c); //!< Path to the configuration file. DECLARE_string(c); //!< Path to the configuration file.
DECLARE_string(config_file); //!< Path to the configuration file. DECLARE_string(config_file); //!< Path to the configuration file.
@ -46,6 +47,10 @@ DECLARE_double(carrier_lock_th); //!< Carrier lock threshold (in rad).
DECLARE_double(dll_bw_hz); //!< Bandwidth of the DLL low pass filter, in Hz (overrides the configuration file). DECLARE_double(dll_bw_hz); //!< Bandwidth of the DLL low pass filter, in Hz (overrides the configuration file).
DECLARE_double(pll_bw_hz); //!< Bandwidth of the PLL low pass filter, in Hz (overrides the configuration file). DECLARE_double(pll_bw_hz); //!< Bandwidth of the PLL low pass filter, in Hz (overrides the configuration file).
// Declare flags for observables block
DECLARE_int32(carrier_smoothing_factor); //!< Sets carrier smoothing factor M (overrides the configuration file).
const int32_t DEFAULT_CARRIER_SMOOTHING_FACTOR = 200;
// Declare flags for PVT // Declare flags for PVT
DECLARE_string(RINEX_version); //!< If defined, specifies the RINEX version (2.11 or 3.02). Overrides the configuration file. DECLARE_string(RINEX_version); //!< If defined, specifies the RINEX version (2.11 or 3.02). Overrides the configuration file.

4
src/algorithms/libs/rtklib/CMakeLists.txt
View File

@ -1,4 +1,6 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# #
# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# #
# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/plot_best_vs_generic.py
View File

@ -1,5 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
View File

@ -1,4 +1,6 @@
/* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
*
* GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
* *
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc
View File

@ -1,4 +1,6 @@
/* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
*
* GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
* *
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h
View File

@ -1,4 +1,6 @@
/* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
*
* GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
* *
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
View File

@ -1,4 +1,6 @@
/* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) /* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
*
* GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
* *
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *

3
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h
View File

@ -6,8 +6,7 @@
* *
* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors) * Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
* *
* GNSS-SDR is a software defined Global Navigation * GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
* Satellite Systems receiver
* *
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake
View File

@ -1,5 +1,7 @@
# Copyright (C) 2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2019 (see AUTHORS file for a list of contributors)
# #
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
#
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindORC.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2015-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkAddTest.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2015-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBuildTypes.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2014-2019 (see AUTHORS file for a list of contributors) # Copyright (C) 2014-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in
View File

@ -1,4 +1,6 @@
# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

13
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in
View File

@ -1,4 +1,6 @@
# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -8,12 +10,11 @@ set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@)
set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@) set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@)
set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@) set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@)
set(PACKAGE_VERSION set(PACKAGE_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${MAINT_VERSION})
${MAJOR_VERSION}.${MINOR_VERSION}.${MAINT_VERSION})
if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL ${MAJOR_VERSION}) if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL ${MAJOR_VERSION})
if(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${MINOR_VERSION}) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL ${MINOR_VERSION})
if(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MAINT_VERSION}) if(NOT "${PACKAGE_FIND_VERSION_PATCH}" GREATER ${MAINT_VERSION})
set(PACKAGE_VERSION_EXACT 1) # exact match for API version set(PACKAGE_VERSION_EXACT 1) # exact match for API version
set(PACKAGE_VERSION_COMPATIBLE 1) # compat for minor/patch version set(PACKAGE_VERSION_COMPATIBLE 1) # compat for minor/patch version
endif() endif()

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
View File

@ -1,4 +1,6 @@
# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
#
# GNSS-SDR is a software-defined Global Navigation Satellite Systems receiver
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #

Some files were not shown because too many files have changed in this diff Show More