diff --git a/CMakeLists.txt b/CMakeLists.txt index 18032be21..9867f24e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,6 +318,7 @@ set(GNSSSDR_BOOST_MIN_VERSION "1.45") set(GNSSSDR_PYTHON_MIN_VERSION "2.7") set(GNSSSDR_MAKO_MIN_VERSION "0.4.2") set(GNSSSDR_ARMADILLO_MIN_VERSION "4.200.0") +set(GNSSSDR_MATIO_MIN_VERSION "1.5.3") @@ -823,9 +824,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c # Ensure that aclocal and libtool are present if(OS_IS_LINUX) if(EXISTS "/usr/bin/libtoolize") - if(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") + if(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") # Everything ok, we can move on - else(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") + else(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") message(" aclocal has not been found.") message(" You can try to install it by typing:") if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") @@ -836,7 +837,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c message(" sudo apt-get install automake") endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") message(FATAL_ERROR "aclocal is required to build glog from source") - endif(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") + endif(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") else(EXISTS "/usr/bin/libtoolize") message(" libtool has not been found.") message(" You can try to install it by typing:") @@ -1095,10 +1096,43 @@ endif(NOT GNUTLS_OPENSSL_LIBRARY) # Matio - https://github.com/tbeu/matio ######################################################################## find_package(MATIO) -if(NOT MATIO_FOUND) +if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERSION}) + if(MATIO_FOUND) + message(STATUS " Matio installed version (${MATIO_VERSION_STRING}) is too old (>= ${GNSSSDR_MATIO_MIN_VERSION} is required).") + endif(MATIO_FOUND) + message(STATUS " Matio will be downloaded and built automatically") + message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ") find_package(ZLIB) if(ZLIB_FOUND) get_filename_component(ZLIB_BASE_DIR ${ZLIB_INCLUDE_DIRS} DIRECTORY) + if(OS_IS_LINUX) + if(NOT EXISTS "/usr/bin/libtoolize") + message(" libtool has not been found.") + message(" You can try to install it by typing:") + if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") + message(" sudo yum groupinstall 'Development Tools'") + elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE") + message(" sudo zypper install libtoool") + else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") + message(" sudo apt-get install libtool") + endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") + message(FATAL_ERROR "libtool is required to build matio from source") + endif(NOT EXISTS "/usr/bin/libtoolize") + if(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") + message(STATUS "Automake found.") + else(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") + message(" aclocal has not been found.") + message(" You can try to install it by typing:") + if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") + message(" sudo yum groupinstall 'Development Tools'") + elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE") + message(" sudo zypper install automake") + else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") + message(" sudo apt-get install automake") + endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") + message(FATAL_ERROR "aclocal is required to build matio from source") + endif(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") + endif(OS_IS_LINUX) find_package(HDF5) if(HDF5_FOUND) list(GET HDF5_LIBRARIES 0 HDF5_FIRST_DIR) @@ -1155,7 +1189,7 @@ if(NOT MATIO_FOUND) else(ZLIB_FOUND) message(FATAL_ERROR "*** The zlib library is required to build gnss-sdr") endif(ZLIB_FOUND) -endif(NOT MATIO_FOUND) +endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERSION}) diff --git a/README.md b/README.md index 4f153bd5f..cfd214cb0 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,7 @@ This section describes how to set up the compilation environment in GNU/Linux or GNU/Linux ---------- - * Tested distributions: Ubuntu 14.04 LTS and [above](http://packages.ubuntu.com/search?keywords=gnss-sdr), Debian 8.0 "jessie" and [above](https://packages.debian.org/search?searchon=names&keywords=gnss-sdr), Linaro 15.03 - * Known to work but not continually tested: Arch Linux, Fedora, and openSUSE + * Tested distributions: Ubuntu 14.04 LTS and above; Debian 8.0 "jessie" and above; Fedora 26 and above; CentOS 7; Arch Linux. * Supported microprocessor architectures: * i386: Intel x86 instruction set (32-bit microprocessors). * amd64: also known as x86-64, the 64-bit version of the x86 instruction set, originally created by AMD and implemented by AMD, Intel, VIA and others. @@ -53,7 +52,11 @@ Before building GNSS-SDR, you need to install all the required dependencies. The ### Alternative 1: Install dependencies using software packages -If you want to start building and running GNSS-SDR as quick and easy as possible, the best option is to install all the required dependencies as binary packages. If you are using Debian 8, Ubuntu 14.10 or above, this can be done by copying and pasting the following line in a terminal: +If you want to start building and running GNSS-SDR as quick and easy as possible, the best option is to install all the required dependencies as binary packages. + +#### Debian / Ubuntu + +If you are using Debian 8, Ubuntu 14.10 or above, this can be done by copying and pasting the following line in a terminal: ~~~~~~ $ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time-dev \ @@ -63,26 +66,57 @@ $ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time libgnutls-openssl-dev python-mako python-six libmatio-dev googletest ~~~~~~ -Please note that `googletest` was named `libgtest-dev` in distributions older than Debian 9 Stretch and Ubuntu 17.04 Zesty. +Please note that `googletest` was named `libgtest-dev` in distributions older than Debian 9 "stretch" and Ubuntu 17.04 "zesty". -Alternatively, and starting from Ubuntu 16.04 LTS, you can install all the required dependencies by adding the line +**Note for Ubuntu 14.04 LTS "trusty" users:** you will need to build from source and install GNU Radio manually, as explained below, since GNSS-SDR requires `gnuradio-dev` >= 3.7.3, and Ubuntu 14.04 came with 3.7.2. Install all the packages above BUT EXCEPT `libuhd-dev`, `gnuradio-dev` and `gr-osmosdr` (and remove them if they are already installed in your machine), and install those dependencies using PyBOMBS. The same applies to `libmatio-dev`: Ubuntu 14.04 came with 1.5.2 and the minimum required version is 1.5.3. Please do not install the `libmatio-dev` package and install `libtool`, `automake` and `libhdf5-dev` instead. A recent version of the library will be downloaded and built automatically if CMake does not find it installed. + +**Note for Debian 8 "jessie" users:** please see the note about `libmatio-dev` above. Install `libtool`, `automake` and `libhdf5-dev` instead. + +Once you have installed these packages, you can jump directly to [download the source code and build GNSS-SDR](#download-and-build-linux). + + +#### Fedora + +If you are using Fedora 26 or above, the required software dependencies can be installed by doing: ~~~~~~ -deb-src http://us.archive.ubuntu.com/ubuntu/ xenial universe +$ sudo yum install make automake gcc gcc-c++ kernel-devel cmake git boost-devel \ + boost-date-time boost-system boost-filesystem boost-thread boost-chrono \ + boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel \ + blas-devel lapack-devel matio-devel armadillo-devel gflags-devel \ + glog-devel gnutls-devel openssl-devel python-mako python-six ~~~~~~ -to your ```/etc/apt/sources.list``` file and doing: +Once you have installed these packages, you can jump directly to [download the source code and build GNSS-SDR](#download-and-build-linux). + +#### CentOS + +If you are using CentOS 7, you can install the dependencies via Extra Packages for Enterprise Linux ([EPEL](https://fedoraproject.org/wiki/EPEL)): ~~~~~~ -$ sudo apt-get update -$ sudo apt-get build-dep gnss-sdr +$ sudo yum install wget +$ wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +$ sudo rpm -Uvh epel-release-latest-7.noarch.rpm +$ sudo yum install make automake gcc gcc-c++ kernel-devel libtool automake \ + hdf5-devel cmake git boost-devel boost-date-time boost-system \ + boost-filesystem boost-thread boost-chrono boost-serialization \ + log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel \ + armadillo-devel gnutls-devel openssl-devel python-mako python-six ~~~~~~ +Once you have installed these packages, you can jump directly to [download the source code and build GNSS-SDR](#download-and-build-linux). -Once you have installed these packages, you can jump directly to [how to download the source code and build GNSS-SDR](#download-and-build-linux). +#### Arch Linux -Note for Ubuntu 14.04 LTS "trusty" users: you will need to build from source and install GNU Radio manually, as explained below, since GNSS-SDR requires gnuradio-dev >= 3.7.3, and Ubuntu 14.04 came with 3.7.2. Install all the packages above BUT EXCEPT ```libuhd-dev```, ```gnuradio-dev``` and ```gr-osmosdr``` (and remove them if they are already installed in your machine), and install those dependencies using PyBOMBS. +If you are using Arch Linux (with base-devel group installed): +~~~~~~ +$ pacman -S cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr \ + blas lapack gflags google-glog gnutls openssl python2-mako python2-six \ + libmatio gtest +~~~~~~ + +Once you have installed these packages, you can jump directly to [download the source code and build GNSS-SDR](#download-and-build-linux). ### Alternative 2: Install dependencies using PyBOMBS diff --git a/conf/gnss-sdr_GPS_L1_bladeRF.conf b/conf/gnss-sdr_GPS_L1_bladeRF.conf new file mode 100644 index 000000000..84fe13d8b --- /dev/null +++ b/conf/gnss-sdr_GPS_L1_bladeRF.conf @@ -0,0 +1,110 @@ +[GNSS-SDR] + +;######### GLOBAL OPTIONS ################## +GNSS-SDR.internal_fs_sps=2000000 + +;######### SIGNAL_SOURCE CONFIG ############ +SignalSource.implementation=Osmosdr_Signal_Source +SignalSource.item_type=gr_complex +SignalSource.sampling_frequency=2000000 +SignalSource.freq=1575420000 +;# RF Gain: LNA Gain {0, 3, 6} +SignalSource.gain=6 +;# IF Gain: N/A +SignalSource.rf_gain=40 +;# BB Gain: RX VGA1 + VGA2 [5, 60] +SignalSource.if_gain=48 +SignalSource.AGC_enabled=false +SignalSource.samples=0 +SignalSource.repeat=false +;# Next line enables the bladeRF +SignalSource.osmosdr_args=bladerf=0 +SignalSource.enable_throttle_control=false +SignalSource.dump=false +SignalSource.dump_filename=./signal_source.dat + +;######### SIGNAL_CONDITIONER CONFIG ############ +SignalConditioner.implementation=Signal_Conditioner + +;######### DATA_TYPE_ADAPTER CONFIG ############ +DataTypeAdapter.implementation=Pass_Through + +;######### INPUT_FILTER CONFIG ############ +InputFilter.implementation=Freq_Xlating_Fir_Filter +InputFilter.decimation_factor=1 +InputFilter.input_item_type=gr_complex +InputFilter.output_item_type=gr_complex +InputFilter.taps_item_type=float +InputFilter.number_of_taps=5 +InputFilter.number_of_bands=2 +InputFilter.band1_begin=0.0 +InputFilter.band1_end=0.85 +InputFilter.band2_begin=0.9 +InputFilter.band2_end=1.0 +InputFilter.ampl1_begin=1.0 +InputFilter.ampl1_end=1.0 +InputFilter.ampl2_begin=0.0 +InputFilter.ampl2_end=0.0 +InputFilter.band1_error=1.0 +InputFilter.band2_error=1.0 +InputFilter.filter_type=bandpass +InputFilter.grid_density=16 +InputFilter.dump=false +InputFilter.dump_filename=../data/input_filter.dat + +;######### RESAMPLER CONFIG ############ +Resampler.implementation=Pass_Through + +;######### CHANNELS GLOBAL CONFIG ############ +Channels_1C.count=8 +Channels.in_acquisition=1 +Channel.signal=1C + +;######### ACQUISITION GLOBAL CONFIG ############ +Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler +Acquisition_1C.item_type=gr_complex +Acquisition_1C.if=0 +Acquisition_1C.sampled_ms=1 +Acquisition_1C.threshold=0.015 +Acquisition_1C.doppler_max=10000 +Acquisition_1C.doppler_min=-10000 +Acquisition_1C.doppler_step=500 +Acquisition_1C.max_dwells=15 +Acquisition_1C.dump=false +Acquisition_1C.dump_filename=./acq_dump.dat + +;######### TRACKING GLOBAL CONFIG ############ +Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking +Tracking_1C.item_type=gr_complex +Tracking_1C.if=0 +Tracking_1C.pll_bw_hz=40.0; +Tracking_1C.dll_bw_hz=2.0; +Tracking_1C.order=3; +Tracking_1C.early_late_space_chips=0.5; +Tracking_1C.dump=false +Tracking_1C.dump_filename=./tracking_ch_ + +;######### TELEMETRY DECODER GPS CONFIG ############ +TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder +TelemetryDecoder_1C.dump=false + +;######### OBSERVABLES CONFIG ############ +#Observables.implementation=GPS_L1_CA_Observables +Observables.implementation=Hybrid_Observables +Observables.dump=false +Observables.dump_filename=./observables.dat + +;######### PVT CONFIG ############ +;PVT.implementation=RTKLIB_PVT +PVT.positioning_mode=Single +PVT.output_rate_ms=100 +PVT.display_rate_ms=500 +PVT.iono_model=Broadcast +PVT.trop_model=Saastamoinen +PVT.flag_rtcm_server=false +PVT.flag_rtcm_tty_port=false +PVT.rtcm_dump_devname=/dev/pts/1 +PVT.rtcm_tcp_port=2101 +PVT.rtcm_MT1019_rate_ms=5000 +PVT.rtcm_MT1077_rate_ms=1000 +PVT.rinex_version=2 diff --git a/docs/manpage/gnss-sdr-manpage b/docs/manpage/gnss-sdr-manpage index f7a9c17f6..997df725d 100644 --- a/docs/manpage/gnss-sdr-manpage +++ b/docs/manpage/gnss-sdr-manpage @@ -1,42 +1,70 @@ .\" Manpage for gnss\-sdr. .\" Contact carles.fernandez@cttc.es to correct errors or typos. -.TH gnss\-sdr 1 "05 Feb 2017" "0.0.9" "gnss\-sdr man page" +.TH gnss\-sdr 1 "24 Feb 2018" "0.0.9" "gnss\-sdr man page" .SH NAME \fBgnss\-sdr\fR \- GNSS Software Defined Receiver. .SH SYNOPSIS -\fBgnss\-sdr \-config_file=\fR\fI\fR [OPTION]... +\fBgnss\-sdr \-c=\fR\fI\fR [OPTION]... .SH DESCRIPTION \fBgnss\-sdr\fR is a Global Navigation Satellite Systems Software Defined Receiver written in C++. It implements all the signal processing chain, taking as input raw samples coming from the output of an Analog\-to\-Digital Converter, and processing them up to the computation of the Position\-Velocity\-Time solution, including the generation of code and phase measurements. \.TP \fBgnss\-sdr\fR is able to work with raw data files or, if there is computational power enough, in real time with suitable radio frequency front\-ends. The whole receiver is defined in a single configuration file, and therefore users can define theirs. +\.TP +There is some flexibility in how flags may be specified. The following examples are equivalent: +\.RS 8 +\.TP +gnss\-sdr \-c=/home/user/rx.conf +\.TP +gnss\-sdr \-\-c=/home/user/rx.conf +\.TP +gnss\-sdr \-c /home/user/rx.conf +\.TP +gnss\-sdr \-\-c /home/user/rx.conf +\.RE .SH OPTIONS \fBgnss\-sdr\fR takes the following options: .TP -\fB\-config_file=\fR\fI\fR Set the configuration file. +\fB\-c=\fR\fI\fR or \fB\-config_file=\fR\fI\fR +Set the configuration file. This flag is mandatory. .TP -\fB\-signal_source=\fR\fI\fR If defined, path to the file containing the signal samples (overrides the data file specified in the configuration file). +\fB\-s=\fR\fI\fR or \fB\-signal_source=\fR\fI\fR +If defined, path to the file containing the signal samples (overrides the data file specified in the configuration file). .TP -\fB\-log_dir=\fR\fI\fR If defined, overrides the default directory where logs are saved. +\fB\-log_dir=\fR\fI\fR +If defined, overrides the default directory where logs are saved. .TP -\fB\-doppler_max=\fR\fIdoppler\fR If defined, maximum Doppler value in the search grid, in Hz (overrides the configuration file), +\fB\-doppler_max=\fR\fI\fR +If defined, maximum Doppler value in the search grid, in Hz (overrides the configuration file). .TP -\fB\-cn0_samples=\fR\fIsamples\fR Number of correlator outputs used for CN0 estimation. +\fB\-doppler_step=\fR\fI\fR +If defined, sets the frequency step in the search grid, in Hz (overrides the configuration file). .TP -\fB\-cn0_min=\fR\fIcn0_min\fR Minimum valid CN0 (in dB-Hz). +\fB\-cn0_samples=\fR\fI\fR +Number of correlators outputs (one per integration time) used for CN0 estimation. It defaults to 20 outputs. .TP -\fB\-max_lock_fail=\fR\fImax_lock_fail\fR Number number of lock failures before dropping satellite. +\fB\-cn0_min=\fR\fI\fR +Minimum valid CN0 (in dB-Hz). It defaults to 25 dB-Hz. .TP -\fB\-carrier_lock_th=\fR\fIcarrier_lock_th\fR Carrier lock threshold (in rad). +\fB\-max_lock_fail=\fR\fI\fR +Number of lock failures before dropping satellite. It defaults to 50 failures. .TP -\fB\-dll_bw_hz=\fR\fIdll_bw_hz\fR If defined, bandwidth of the DLL low pass filter, in Hz (overrides the configuration file). +\fB\-carrier_lock_th=\fR\fI\fR +Carrier lock error threshold (in rad). It defaults to 0.85 rad (48.7 degrees). .TP -\fB\-pll_bw_hz=\fR\fIpll_bw_hz\fR If defined, bandwidth of the PLL low pass filter, in Hz (overrides the configuration file). +\fB\-dll_bw_hz=\fR\fI\fR +If defined, bandwidth of the DLL low pass filter, in Hz (overrides the configuration file). .TP -\fB\-RINEX_version=\fI\fR Specifies the RINEX version (2.11 or 3.02). Default: "3.02". +\fB\-pll_bw_hz=\fR\fI\fR +If defined, bandwidth of the PLL low pass filter, in Hz (overrides the configuration file). .TP -\fB\-version\fR Print program version and exit. +\fB\-RINEX_version=\fI\fR +If defined, specifies the RINEX version (2.11 or 3.02). Default: "3.02". Overrides the configuration file. .TP -\fB\-help\fR Print all the available commandline flags and exit. +\fB\-version\fR +Print program version and exit. +.TP +\fB\-help\fR +Print all the available commandline flags and exit. .SH SEE ALSO .BR volk_gnsssdr_profile (1) \.TP diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index baf58e507..71568cf88 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/src/algorithms/PVT/adapters/CMakeLists.txt @@ -28,6 +28,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib + ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${ARMADILLO_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc index c21303ab3..1ba2bd509 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.cc +++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc @@ -30,12 +30,13 @@ #include "rtklib_pvt.h" -#include +#include "configuration_interface.h" +#include "gnss_sdr_flags.h" #include #include #include #include -#include "configuration_interface.h" +#include using google::LogMessage; @@ -70,11 +71,30 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration, // RINEX version int rinex_version = configuration->property(role + ".rinex_version", 3); - if( (rinex_version < 2) || (rinex_version > 3) ) + if ( FLAGS_RINEX_version.compare("3.01") == 0 ) { - //warn user and set the default rinex_version = 3; } + else if ( FLAGS_RINEX_version.compare("3.02") == 0 ) + { + rinex_version = 3; + } + else if ( FLAGS_RINEX_version.compare("3") == 0 ) + { + rinex_version = 3; + } + else if ( FLAGS_RINEX_version.compare("2.11") == 0 ) + { + rinex_version = 2; + } + else if ( FLAGS_RINEX_version.compare("2.10") == 0 ) + { + rinex_version = 2; + } + else if ( FLAGS_RINEX_version.compare("2") == 0 ) + { + rinex_version = 2; + } // RTCM Printer settings bool flag_rtcm_tty_port = configuration->property(role + ".flag_rtcm_tty_port", false); diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h index f37515323..f0b4238b4 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.h +++ b/src/algorithms/PVT/adapters/rtklib_pvt.h @@ -33,9 +33,9 @@ #ifndef GNSS_SDR_RTKLIB_PVT_H_ #define GNSS_SDR_RTKLIB_PVT_H_ -#include #include "pvt_interface.h" #include "rtklib_pvt_cc.h" +#include class ConfigurationInterface; diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc index c6af2e47a..bf5099f4a 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc @@ -29,18 +29,19 @@ */ #include "rtklib_pvt_cc.h" -#include -#include -#include #include #include #include #include #include +#include #include #include -#include #include "display.h" +#include +#include +#include + using google::LogMessage; diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h index 7e71b21a0..635dfb7d7 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h @@ -31,20 +31,21 @@ #ifndef GNSS_SDR_RTKLIB_PVT_CC_H #define GNSS_SDR_RTKLIB_PVT_CC_H -#include -#include -#include -#include -#include -#include -#include -#include + #include "nmea_printer.h" #include "kml_printer.h" #include "geojson_printer.h" #include "rinex_printer.h" #include "rtcm_printer.h" #include "rtklib_solver.h" +#include +#include +#include +#include +#include +#include +#include +#include class rtklib_pvt_cc; diff --git a/src/algorithms/PVT/libs/geojson_printer.cc b/src/algorithms/PVT/libs/geojson_printer.cc index b1062f65f..5820778d4 100644 --- a/src/algorithms/PVT/libs/geojson_printer.cc +++ b/src/algorithms/PVT/libs/geojson_printer.cc @@ -31,10 +31,11 @@ #include "geojson_printer.h" -#include -#include #include #include +#include +#include + GeoJSON_Printer::GeoJSON_Printer() { diff --git a/src/algorithms/PVT/libs/geojson_printer.h b/src/algorithms/PVT/libs/geojson_printer.h index b286e164a..17e080975 100644 --- a/src/algorithms/PVT/libs/geojson_printer.h +++ b/src/algorithms/PVT/libs/geojson_printer.h @@ -33,10 +33,10 @@ #ifndef GNSS_SDR_GEOJSON_PRINTER_H_ #define GNSS_SDR_GEOJSON_PRINTER_H_ +#include "pvt_solution.h" #include #include #include -#include "pvt_solution.h" /*! diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc index 2deb7c05b..202f01709 100644 --- a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc +++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc @@ -30,10 +30,10 @@ */ #include "hybrid_ls_pvt.h" -#include #include "Galileo_E1.h" #include "GPS_L1_CA.h" #include "GPS_L2C.h" +#include using google::LogMessage; diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.h b/src/algorithms/PVT/libs/hybrid_ls_pvt.h index 1a658793b..37fb6e15d 100644 --- a/src/algorithms/PVT/libs/hybrid_ls_pvt.h +++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.h @@ -32,16 +32,15 @@ #ifndef GNSS_SDR_HYBRID_LS_PVT_H_ #define GNSS_SDR_HYBRID_LS_PVT_H_ -#include -#include -#include -#include #include "ls_pvt.h" #include "galileo_navigation_message.h" #include "gps_navigation_message.h" #include "gps_cnav_navigation_message.h" #include "gnss_synchro.h" #include "rtklib_rtkcmn.h" +#include +#include +#include /*! * \brief This class implements a simple PVT Least Squares solution diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc index 1db4f6f61..7e6e53ae5 100644 --- a/src/algorithms/PVT/libs/kml_printer.cc +++ b/src/algorithms/PVT/libs/kml_printer.cc @@ -30,9 +30,9 @@ */ #include "kml_printer.h" -#include #include #include +#include using google::LogMessage; diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h index 7a08a9166..9a0ca8a2f 100644 --- a/src/algorithms/PVT/libs/kml_printer.h +++ b/src/algorithms/PVT/libs/kml_printer.h @@ -33,11 +33,11 @@ #ifndef GNSS_SDR_KML_PRINTER_H_ #define GNSS_SDR_KML_PRINTER_H_ -#include +#include "pvt_solution.h" #include #include #include -#include "pvt_solution.h" + /*! * \brief Prints PVT information to OGC KML format file (can be viewed with Google Earth) diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc index 91620e8ce..daef8f3f2 100644 --- a/src/algorithms/PVT/libs/ls_pvt.cc +++ b/src/algorithms/PVT/libs/ls_pvt.cc @@ -30,10 +30,10 @@ */ #include "ls_pvt.h" -#include -#include #include "GPS_L1_CA.h" #include +#include +#include using google::LogMessage; diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc index 5398af18b..f2fcda3e8 100644 --- a/src/algorithms/PVT/libs/nmea_printer.cc +++ b/src/algorithms/PVT/libs/nmea_printer.cc @@ -34,10 +34,10 @@ */ #include "nmea_printer.h" -#include -#include #include #include +#include +#include using google::LogMessage; diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h index 8e594547e..0e378ca8b 100644 --- a/src/algorithms/PVT/libs/nmea_printer.h +++ b/src/algorithms/PVT/libs/nmea_printer.h @@ -36,11 +36,9 @@ #ifndef GNSS_SDR_NMEA_PRINTER_H_ #define GNSS_SDR_NMEA_PRINTER_H_ - -#include +#include "pvt_solution.h" #include #include -#include "pvt_solution.h" /*! diff --git a/src/algorithms/PVT/libs/pvt_solution.cc b/src/algorithms/PVT/libs/pvt_solution.cc index 5e53dc9d0..5872d5ba7 100644 --- a/src/algorithms/PVT/libs/pvt_solution.cc +++ b/src/algorithms/PVT/libs/pvt_solution.cc @@ -30,9 +30,9 @@ */ #include "pvt_solution.h" -#include #include "GPS_L1_CA.h" #include +#include using google::LogMessage; diff --git a/src/algorithms/PVT/libs/pvt_solution.h b/src/algorithms/PVT/libs/pvt_solution.h index 0a7cc451d..cf209004e 100644 --- a/src/algorithms/PVT/libs/pvt_solution.h +++ b/src/algorithms/PVT/libs/pvt_solution.h @@ -33,9 +33,9 @@ #define GNSS_SDR_PVT_SOLUTION_H_ +#include #include #include -#include const unsigned int PVT_MAX_CHANNELS = 90; const unsigned int PVT_MAX_PRN = 127; // 126 is SBAS diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index b2dfa2a68..7d4990a77 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -29,6 +29,11 @@ */ #include "rinex_printer.h" +#include +#include +#include +#include +#include #include // for getlogin_r() #include // for min and max #include // for floor @@ -38,12 +43,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include "gnss_sdr_flags.h" using google::LogMessage; @@ -143,57 +142,17 @@ Rinex_Printer::Rinex_Printer(int conf_version) observationCode["GPS_L1_CA_v2"] = "1"; observationCode["GLONASS_G1_CA_v2"] = "1"; - if ( FLAGS_RINEX_version.compare("3.01") == 0 ) - { - version = 3; - stringVersion = "3.01"; - } - else if ( FLAGS_RINEX_version.compare("3.02") == 0 ) - { - version = 3; - stringVersion = "3.02"; - } - else if ( FLAGS_RINEX_version.compare("3") == 0 ) - { - version = 3; - stringVersion = "3.02"; - } - else if ( FLAGS_RINEX_version.compare("2.11") == 0 ) - { - version = 2; - stringVersion = "2.11"; - } - else if ( FLAGS_RINEX_version.compare("2.10") == 0 ) - { - version = 2; - stringVersion = "2.10"; - } - else if ( FLAGS_RINEX_version.compare("2") == 0 ) + if(conf_version == 2) { version = 2; stringVersion = "2.11"; } else { - LOG(WARNING) << "Unknown RINEX version " << FLAGS_RINEX_version << " (must be 2.11 or 3.02). Using 3.02"; version = 3; stringVersion = "3.02"; } - if(conf_version != 0) - { - if(conf_version == 2) - { - version = 2; - stringVersion = "2.11"; - } - if(conf_version == 3) - { - version = 3; - stringVersion = "3.02"; - } - } - numberTypesObservations = 4; // Number of available types of observable in the system fake_cnav_iode = 1; } diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h index 8f4580208..69ffe24e5 100644 --- a/src/algorithms/PVT/libs/rinex_printer.h +++ b/src/algorithms/PVT/libs/rinex_printer.h @@ -51,13 +51,6 @@ #ifndef GNSS_SDR_RINEX_PRINTER_H_ #define GNSS_SDR_RINEX_PRINTER_H_ -#include -#include -#include -#include // for stringstream -#include // for setprecision -#include -#include #include "gps_navigation_message.h" #include "gps_cnav_navigation_message.h" #include "galileo_navigation_message.h" @@ -66,6 +59,12 @@ #include "Galileo_E1.h" #include "GLONASS_L1_CA.h" #include "gnss_synchro.h" +#include +#include +#include +#include // for stringstream +#include // for setprecision +#include class Sbas_Raw_Msg; diff --git a/src/algorithms/PVT/libs/rtcm_printer.cc b/src/algorithms/PVT/libs/rtcm_printer.cc index 3d6a1e56b..4766ad480 100644 --- a/src/algorithms/PVT/libs/rtcm_printer.cc +++ b/src/algorithms/PVT/libs/rtcm_printer.cc @@ -32,12 +32,12 @@ */ #include "rtcm_printer.h" -#include +#include +#include #include #include // for O_RDWR #include // for tcgetattr -#include -#include + using google::LogMessage; diff --git a/src/algorithms/PVT/libs/rtcm_printer.h b/src/algorithms/PVT/libs/rtcm_printer.h index 21fdaeddf..8568273bf 100644 --- a/src/algorithms/PVT/libs/rtcm_printer.h +++ b/src/algorithms/PVT/libs/rtcm_printer.h @@ -34,10 +34,10 @@ #ifndef GNSS_SDR_RTCM_PRINTER_H_ #define GNSS_SDR_RTCM_PRINTER_H_ -#include // std::ofstream -#include // std::cout -#include // std::shared_ptr #include "rtcm.h" +#include // std::ofstream +#include // std::shared_ptr + /*! * \brief This class provides a implementation of a subset of the RTCM Standard 10403.2 messages diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 24bd8f163..2067e42f8 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -52,11 +52,11 @@ * -----------------------------------------------------------------------*/ #include "rtklib_solver.h" -#include #include "rtklib_conversions.h" #include "GPS_L1_CA.h" #include "Galileo_E1.h" #include "GLONASS_L1_CA.h" +#include using google::LogMessage; diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h index d8703548e..af53b4811 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.h +++ b/src/algorithms/PVT/libs/rtklib_solver.h @@ -54,10 +54,7 @@ #ifndef GNSS_SDR_RTKLIB_SOLVER_H_ #define GNSS_SDR_RTKLIB_SOLVER_H_ -#include -#include -#include -#include + #include "rtklib_rtkpos.h" #include "galileo_navigation_message.h" #include "gps_navigation_message.h" @@ -65,6 +62,10 @@ #include "glonass_gnav_navigation_message.h" #include "gnss_synchro.h" #include "pvt_solution.h" +#include +#include +#include + /*! * \brief This class implements a simple PVT Least Squares solution diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 9dde86c6a..bf0c1428d 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -54,6 +54,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS} + ${ARMADILLO_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GNURADIO_BLOCKS_INCLUDE_DIRS} ${VOLK_GNSSSDR_INCLUDE_DIRS} 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 17ef914e0..c3ada5ef3 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -30,13 +30,14 @@ */ #include "galileo_e1_pcps_ambiguous_acquisition.h" +#include "configuration_interface.h" +#include "galileo_e1_signal_processing.h" +#include "Galileo_E1.h" +#include "gnss_sdr_flags.h" #include #include #include -#include "galileo_e1_signal_processing.h" -#include "Galileo_E1.h" -#include "configuration_interface.h" -#include "gnss_sdr_flags.h" + using google::LogMessage; 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 c08db5b7c..41ed6e7ca 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -32,14 +32,14 @@ #ifndef GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_ #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_ -#include -#include -#include -#include "gnss_synchro.h" #include "acquisition_interface.h" +#include "gnss_synchro.h" #include "pcps_acquisition.h" #include "complex_byte_to_float_x2.h" +#include +#include #include +#include class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc index d3df351e5..1bcb950a8 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc @@ -29,14 +29,15 @@ */ #include "galileo_e5a_pcps_acquisition.h" +#include "configuration_interface.h" +#include "galileo_e5_signal_processing.h" +#include "Galileo_E5a.h" +#include "gnss_sdr_flags.h" #include #include #include #include -#include "galileo_e5_signal_processing.h" -#include "Galileo_E5a.h" -#include "configuration_interface.h" -#include "gnss_sdr_flags.h" + using google::LogMessage; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h index bfbc08a95..db6023160 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h @@ -31,11 +31,12 @@ #ifndef GALILEO_E5A_PCPS_ACQUISITION_H_ #define GALILEO_E5A_PCPS_ACQUISITION_H_ -#include -#include -#include "gnss_synchro.h" + #include "acquisition_interface.h" +#include "gnss_synchro.h" #include "pcps_acquisition.h" +#include +#include class ConfigurationInterface; 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 5ce79503c..06dac08ee 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc @@ -32,12 +32,12 @@ */ #include "glonass_l1_ca_pcps_acquisition.h" -#include -#include +#include "configuration_interface.h" #include "glonass_l1_signal_processing.h" #include "GLONASS_L1_CA.h" -#include "configuration_interface.h" #include "gnss_sdr_flags.h" +#include +#include using google::LogMessage; 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 874e928b5..9251eb71d 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -34,14 +34,13 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_ #define GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_ -#include -#include -#include -#include "gnss_synchro.h" #include "acquisition_interface.h" +#include "gnss_synchro.h" #include "pcps_acquisition.h" #include "complex_byte_to_float_x2.h" - +#include +#include +#include class ConfigurationInterface; 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 c1f62ace7..5010c224c 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -34,12 +34,13 @@ */ #include "gps_l1_ca_pcps_acquisition.h" -#include -#include +#include "configuration_interface.h" #include "gps_sdr_signal_processing.h" #include "GPS_L1_CA.h" -#include "configuration_interface.h" #include "gnss_sdr_flags.h" +#include +#include + using google::LogMessage; 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 9b692fb6c..104911ff1 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -36,15 +36,14 @@ #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_ #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_ -#include -#include -#include -#include "gnss_synchro.h" #include "acquisition_interface.h" +#include "gnss_synchro.h" #include "pcps_acquisition.h" #include "complex_byte_to_float_x2.h" +#include +#include #include - +#include class ConfigurationInterface; 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 595f64d82..a8c2bab9e 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -32,12 +32,12 @@ */ #include "gps_l2_m_pcps_acquisition.h" -#include -#include +#include "configuration_interface.h" #include "gps_l2c_signal.h" #include "GPS_L2C.h" -#include "configuration_interface.h" #include "gnss_sdr_flags.h" +#include +#include using google::LogMessage; 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 cf410b6b3..5fa3e1a0b 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -34,14 +34,14 @@ #ifndef GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_ #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_ -#include -#include -#include -#include "gnss_synchro.h" #include "acquisition_interface.h" +#include "gnss_synchro.h" #include "pcps_acquisition.h" #include "complex_byte_to_float_x2.h" +#include +#include #include +#include diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index 9c0d8ef51..4d72ad74b 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -32,12 +32,12 @@ */ #include "gps_l5i_pcps_acquisition.h" -#include -#include +#include "configuration_interface.h" #include "gps_l5_signal.h" #include "GPS_L5.h" -#include "configuration_interface.h" #include "gnss_sdr_flags.h" +#include +#include using google::LogMessage; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 1c1891045..977b70c60 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -34,15 +34,14 @@ #ifndef GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_ #define GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_ -#include -#include -#include -#include "gnss_synchro.h" #include "acquisition_interface.h" +#include "gnss_synchro.h" #include "pcps_acquisition.h" #include "complex_byte_to_float_x2.h" +#include +#include #include - +#include class ConfigurationInterface; diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt index 0d5d1d907..ca02bb952 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt @@ -45,6 +45,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${GLOG_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS} + ${ARMADILLO_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_GNSSSDR_INCLUDE_DIRS} ${MATIO_INCLUDE_DIRS} @@ -54,7 +55,7 @@ include_directories( if(OPENCL_FOUND) include_directories( ${OPENCL_INCLUDE_DIRS} ) if(OS_IS_MACOSX) - set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") + set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") else(OS_IS_MACOSX) set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) endif(OS_IS_MACOSX) @@ -64,13 +65,13 @@ file(GLOB ACQ_GR_BLOCKS_HEADERS "*.h") list(SORT ACQ_GR_BLOCKS_HEADERS) add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS}) source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) -#target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} -#target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES}) + if(ENABLE_FPGA) target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES}) else(ENABLE_FPGA) target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES} ${MATIO_LIBRARIES}) endif(ENABLE_FPGA) + if(NOT VOLK_GNSSSDR_FOUND) add_dependencies(acq_gr_blocks volk_gnsssdr_module) endif(NOT VOLK_GNSSSDR_FOUND) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index affd45952..3c261cd07 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -34,14 +34,13 @@ */ #include "pcps_acquisition.h" -#include +#include "GPS_L1_CA.h" // for GPS_TWO_PI +#include "GLONASS_L1_CA.h" // for GLONASS_TWO_PI #include #include #include #include -#include "GPS_L1_CA.h" //GPS_TWO_PI -#include "GLONASS_L1_CA.h" //GLONASS_TWO_PI - +#include using google::LogMessage; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h index b9e88c79b..c8ba1ef1b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h @@ -52,13 +52,12 @@ #ifndef GNSS_SDR_PCPS_ACQUISITION_H_ #define GNSS_SDR_PCPS_ACQUISITION_H_ - -#include +#include "gnss_synchro.h" #include #include #include #include -#include "gnss_synchro.h" +#include class pcps_acquisition; 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 0aa8f1410..12520a89e 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 @@ -31,16 +31,16 @@ */ #include "pcps_acquisition_fine_doppler_cc.h" -#include // std::rotate -#include +#include "gps_sdr_signal_processing.h" +#include "control_message_factory.h" +#include "GPS_L1_CA.h" #include #include #include #include -#include "concurrent_map.h" -#include "gps_sdr_signal_processing.h" -#include "control_message_factory.h" -#include "GPS_L1_CA.h" +#include // std::rotate, std::fill_n +#include + using google::LogMessage; @@ -331,7 +331,7 @@ int pcps_acquisition_fine_doppler_cc::estimate_Doppler(gr_vector_const_void_star gr::fft::fft_complex *fft_operator = new gr::fft::fft_complex(fft_size_extended, true); //zero padding the entire vector - memset(fft_operator->get_inbuf(), 0, fft_size_extended * sizeof(gr_complex)); + std::fill_n(fft_operator->get_inbuf(), fft_size_extended, gr_complex(0.0, 0.0)); //1. generate local code aligned with the acquisition code phase estimation gr_complex *code_replica = static_cast(volk_gnsssdr_malloc(d_fft_size * sizeof(gr_complex), volk_gnsssdr_get_alignment())); @@ -366,7 +366,7 @@ int pcps_acquisition_fine_doppler_cc::estimate_Doppler(gr_vector_const_void_star int counter = 0; float fftFreqBins[fft_size_extended]; - memset(fftFreqBins, 0, fft_size_extended * sizeof(float)); + std::fill_n(fftFreqBins, fft_size_extended, 0.0); for (int k = 0; k < (fft_size_extended / 2); k++) { 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 cd3d75e5f..f174efdc7 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 @@ -48,12 +48,12 @@ #ifndef GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_ #define GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_ -#include -#include +#include "gnss_synchro.h" #include #include #include -#include "gnss_synchro.h" +#include +#include class pcps_acquisition_fine_doppler_cc; 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 cbc541c33..3a6a8c319 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -29,14 +29,14 @@ */ #include "pcps_quicksync_acquisition_cc.h" -#include -#include +#include "control_message_factory.h" +#include "GPS_L1_CA.h" #include #include #include #include -#include "control_message_factory.h" -#include "GPS_L1_CA.h" +#include +#include using google::LogMessage; 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 1196e6821..5840e3442 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -51,15 +51,15 @@ #ifndef GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_ #define GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_ +#include "gnss_synchro.h" +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include "gnss_synchro.h" +#include class pcps_quicksync_acquisition_cc; 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 676705a23..28e28abf6 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -49,13 +49,13 @@ */ #include "pcps_tong_acquisition_cc.h" -#include +#include "control_message_factory.h" +#include "GPS_L1_CA.h" // for GPS_TWO_PI #include #include #include #include -#include "control_message_factory.h" -#include "GPS_L1_CA.h" //GPS_TWO_PI +#include using google::LogMessage; 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 7174f2a88..4afb487fe 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -51,12 +51,13 @@ #ifndef GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_ #define GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_ -#include -#include +#include "gnss_synchro.h" #include #include #include -#include "gnss_synchro.h" +#include +#include + class pcps_tong_acquisition_cc; diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt index e7c1c8660..b2d74748e 100644 --- a/src/algorithms/channel/adapters/CMakeLists.txt +++ b/src/algorithms/channel/adapters/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/core/interfaces ${CMAKE_SOURCE_DIR}/src/core/receiver ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs + ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${GLOG_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} @@ -34,4 +35,4 @@ file(GLOB CHANNEL_ADAPTER_HEADERS "*.h") list(SORT CHANNEL_ADAPTER_HEADERS) add_library(channel_adapters ${CHANNEL_ADAPTER_SOURCES} ${CHANNEL_ADAPTER_HEADERS}) source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS}) -target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES}) +target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES} gnss_sdr_flags) diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index e66074b7a..5cfb237f6 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -30,9 +30,11 @@ */ #include "channel.h" +#include "configuration_interface.h" +#include "gnss_sdr_flags.h" #include #include -#include "configuration_interface.h" + using google::LogMessage; @@ -74,8 +76,9 @@ Channel::Channel(ConfigurationInterface *configuration, unsigned int channel, // IMPORTANT: Do not change the order between set_doppler_step and set_threshold - unsigned int doppler_step = configuration->property("Acquisition_" + implementation_ + boost::lexical_cast(channel_) + ".doppler_step" ,0); - if(doppler_step == 0) doppler_step = configuration->property("Acquisition_" + implementation_+".doppler_step", 500); + unsigned int doppler_step = configuration->property("Acquisition_" + implementation_ + boost::lexical_cast(channel_) + ".doppler_step", 0); + if(doppler_step == 0) doppler_step = configuration->property("Acquisition_" + implementation_ + ".doppler_step", 500); + if(FLAGS_doppler_step != 0) doppler_step = static_cast(FLAGS_doppler_step); DLOG(INFO) << "Channel "<< channel_ << " Doppler_step = " << doppler_step; acq_->set_doppler_step(doppler_step); diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 8740b5ad9..d9ec7b9fe 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -35,15 +35,15 @@ #ifndef GNSS_SDR_CHANNEL_H_ #define GNSS_SDR_CHANNEL_H_ -#include -#include -#include -#include -#include #include "channel_interface.h" #include "channel_fsm.h" #include "gnss_synchro.h" #include "channel_msg_receiver_cc.h" +#include +#include +#include +#include +#include class ConfigurationInterface; class AcquisitionInterface; diff --git a/src/algorithms/channel/libs/channel_fsm.cc b/src/algorithms/channel/libs/channel_fsm.cc index b6f23cbeb..4a96029b5 100644 --- a/src/algorithms/channel/libs/channel_fsm.cc +++ b/src/algorithms/channel/libs/channel_fsm.cc @@ -30,8 +30,9 @@ */ #include "channel_fsm.h" -#include #include "control_message_factory.h" +#include + ChannelFsm::ChannelFsm() diff --git a/src/algorithms/channel/libs/channel_fsm.h b/src/algorithms/channel/libs/channel_fsm.h index 23b92c394..37e57a326 100644 --- a/src/algorithms/channel/libs/channel_fsm.h +++ b/src/algorithms/channel/libs/channel_fsm.h @@ -32,12 +32,13 @@ #ifndef GNSS_SDR_CHANNEL_FSM_H #define GNSS_SDR_CHANNEL_FSM_H -#include -#include -#include #include "acquisition_interface.h" #include "tracking_interface.h" #include "telemetry_decoder_interface.h" +#include +#include +#include + /*! * \brief This class implements a State Machine for channel diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h index 77a91379a..63997f25f 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h @@ -31,8 +31,8 @@ #ifndef GNSS_SDR_CHANNEL_MSG_RECEIVER_CC_H #define GNSS_SDR_CHANNEL_MSG_RECEIVER_CC_H -#include #include "channel_fsm.h" +#include class channel_msg_receiver_cc; diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index 815bf7cec..940bba0da 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -32,9 +32,8 @@ #ifndef GNSS_SDR_SIGNAL_CONDITIONER_H_ #define GNSS_SDR_SIGNAL_CONDITIONER_H_ -#include #include "gnss_block_interface.h" - +#include class ConfigurationInterface; class AcquisitionInterface; 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 75df4f1e3..edce62562 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -29,8 +29,9 @@ */ #include "byte_to_short.h" -#include #include "configuration_interface.h" +#include + using google::LogMessage; 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 85870ba43..25420efc3 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h @@ -31,11 +31,10 @@ #ifndef GNSS_SDR_BYTE_TO_SHORT_H_ #define GNSS_SDR_BYTE_TO_SHORT_H_ -#include +#include "gnss_block_interface.h" #include #include -#include "gnss_block_interface.h" - +#include class ConfigurationInterface; 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 e91455a23..542632542 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -30,9 +30,9 @@ */ #include "ibyte_to_cbyte.h" -#include -#include #include "configuration_interface.h" +#include +#include using google::LogMessage; 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 c40d85286..c3d3866c3 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h @@ -32,12 +32,11 @@ #ifndef GNSS_SDR_IBYTE_TO_CBYTE_H_ #define GNSS_SDR_IBYTE_TO_CBYTE_H_ -#include -#include #include "conjugate_ic.h" #include "gnss_block_interface.h" #include "interleaved_byte_to_complex_byte.h" - +#include +#include class ConfigurationInterface; 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 83b6fd6c5..61023d212 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -29,8 +29,8 @@ */ #include "ibyte_to_complex.h" -#include #include "configuration_interface.h" +#include using google::LogMessage; 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 3c379d7ba..47edf5b3d 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h @@ -31,13 +31,12 @@ #ifndef GNSS_SDR_IBYTE_TO_COMPLEX_H_ #define GNSS_SDR_IBYTE_TO_COMPLEX_H_ -#include -#include -#include #include "conjugate_cc.h" #include "gnss_block_interface.h" #include "gnss_synchro.h" - +#include +#include +#include class ConfigurationInterface; 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 59ac82042..35755564f 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -30,9 +30,10 @@ */ #include "ibyte_to_cshort.h" +#include "configuration_interface.h" #include #include -#include "configuration_interface.h" + using google::LogMessage; 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 2de7089ac..33c861945 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h @@ -31,12 +31,11 @@ #ifndef GNSS_SDR_IBYTE_TO_CSHORT_H_ #define GNSS_SDR_IBYTE_TO_CSHORT_H_ -#include -#include -#include "gnss_block_interface.h" #include "conjugate_sc.h" #include "interleaved_byte_to_complex_short.h" - +#include "gnss_block_interface.h" +#include +#include class ConfigurationInterface; 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 cb9d3c6df..55cc24974 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -29,8 +29,8 @@ */ #include "ishort_to_complex.h" -#include #include "configuration_interface.h" +#include using google::LogMessage; 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 57cf7283e..3319163fb 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h @@ -31,12 +31,11 @@ #ifndef GNSS_SDR_ISHORT_TO_COMPLEX_H_ #define GNSS_SDR_ISHORT_TO_COMPLEX_H_ -#include -#include -#include #include "conjugate_cc.h" #include "gnss_block_interface.h" - +#include +#include +#include class ConfigurationInterface; 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 96a87abe2..740c4baf5 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -30,9 +30,9 @@ */ #include "ishort_to_cshort.h" +#include "configuration_interface.h" #include #include -#include "configuration_interface.h" using google::LogMessage; 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 685373a6a..a996f7fd9 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h @@ -31,12 +31,11 @@ #ifndef GNSS_SDR_ISHORT_TO_CSHORT_H_ #define GNSS_SDR_ISHORT_TO_CSHORT_H_ -#include -#include #include "conjugate_sc.h" #include "gnss_block_interface.h" #include "interleaved_short_to_complex_short.h" - +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index 8b1797f0e..b621310f3 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -29,10 +29,10 @@ */ #include "beamformer_filter.h" -#include -#include #include "beamformer.h" #include "configuration_interface.h" +#include +#include using google::LogMessage; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h index fce549ebf..1af6a13e5 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.h +++ b/src/algorithms/input_filter/adapters/beamformer_filter.h @@ -32,9 +32,9 @@ #ifndef GNSS_SDR_BEAMFORMER_FILTER_H_ #define GNSS_SDR_BEAMFORMER_FILTER_H_ -#include -#include #include "gnss_block_interface.h" +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index 8112251b4..3b1b613c1 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -30,11 +30,12 @@ */ #include "fir_filter.h" +#include "configuration_interface.h" #include #include #include #include -#include "configuration_interface.h" + using google::LogMessage; diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h index 9a5fdc8a1..0ea7faf39 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.h +++ b/src/algorithms/input_filter/adapters/fir_filter.h @@ -33,9 +33,11 @@ #ifndef GNSS_SDR_FIR_FILTER_H_ #define GNSS_SDR_FIR_FILTER_H_ -#include -#include -#include +#include "gnss_block_interface.h" +#include "complex_byte_to_float_x2.h" +#include "byte_x2_to_complex_byte.h" +#include "short_x2_to_cshort.h" +#include "cshort_to_float_x2.h" #include #include #include @@ -43,11 +45,9 @@ #include #include #include -#include "gnss_block_interface.h" -#include "complex_byte_to_float_x2.h" -#include "byte_x2_to_complex_byte.h" -#include "short_x2_to_cshort.h" -#include "cshort_to_float_x2.h" +#include +#include +#include class ConfigurationInterface; 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 a62d179f1..dfab552c5 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -30,13 +30,13 @@ */ #include "freq_xlating_fir_filter.h" +#include "configuration_interface.h" #include #include #include #include #include #include -#include "configuration_interface.h" using google::LogMessage; 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 baaf47c10..c304c3226 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h @@ -33,8 +33,9 @@ #ifndef GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_ #define GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_ -#include -#include +#include "gnss_block_interface.h" +#include "short_x2_to_cshort.h" +#include "complex_float_to_complex_byte.h" #include #include #include @@ -42,9 +43,8 @@ #include #include #include -#include "gnss_block_interface.h" -#include "short_x2_to_cshort.h" -#include "complex_float_to_complex_byte.h" +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc index ed13c84d4..ae209f3f2 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.cc +++ b/src/algorithms/input_filter/adapters/notch_filter.cc @@ -30,10 +30,11 @@ */ #include "notch_filter.h" -#include -#include #include "configuration_interface.h" #include "notch_cc.h" +#include +#include + using google::LogMessage; diff --git a/src/algorithms/input_filter/adapters/notch_filter.h b/src/algorithms/input_filter/adapters/notch_filter.h index a8ab2136b..9e2a11f26 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.h +++ b/src/algorithms/input_filter/adapters/notch_filter.h @@ -33,12 +33,11 @@ #ifndef GNSS_SDR_NOTCH_FILTER_H_ #define GNSS_SDR_NOTCH_FILTER_H_ +#include "notch_cc.h" +#include "gnss_block_interface.h" +#include #include #include -#include -#include "gnss_block_interface.h" -#include "notch_cc.h" - class ConfigurationInterface; diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc index 4273c65fa..86c11e114 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc @@ -30,11 +30,11 @@ */ #include "notch_filter_lite.h" -#include -#include -#include #include "configuration_interface.h" #include "notch_lite_cc.h" +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.h b/src/algorithms/input_filter/adapters/notch_filter_lite.h index f9088db52..0333d76c1 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.h +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.h @@ -33,12 +33,11 @@ #ifndef GNSS_SDR_NOTCH_FILTER_LITE_H_ #define GNSS_SDR_NOTCH_FILTER_LITE_H_ -#include -#include -#include #include "gnss_block_interface.h" #include "notch_lite_cc.h" - +#include +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index 07c543a92..5f92ecf94 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -28,13 +28,13 @@ * ------------------------------------------------------------------------- */ +#include "pulse_blanking_filter.h" +#include "configuration_interface.h" #include -#include -#include #include #include -#include "configuration_interface.h" -#include "pulse_blanking_filter.h" +#include +#include using google::LogMessage; diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h index 8c5211c64..fb8f82515 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h @@ -32,11 +32,11 @@ #ifndef GNSS_SDR_PULSE_BLANKING_FILTER_H_ #define GNSS_SDR_PULSE_BLANKING_FILTER_H_ -#include -#include -#include #include "gnss_block_interface.h" #include "pulse_blanking_cc.h" +#include +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc b/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc index 697d33362..7fa3fc68a 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc @@ -30,9 +30,9 @@ #include "beamformer.h" -#include -#include #include +#include + #define GNSS_SDR_BEAMFORMER_CHANNELS 8 @@ -53,7 +53,7 @@ beamformer::beamformer() for (int i = 0; i< GNSS_SDR_BEAMFORMER_CHANNELS; i++) { - weight_vector[i]=gr_complex(1,0); + weight_vector[i] = gr_complex(1,0); } } diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc index 03855f454..26dd1f1af 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc @@ -29,13 +29,12 @@ */ #include "notch_cc.h" -#include -#include #include #include #include #include - +#include +#include using google::LogMessage; 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 178d0cb6b..091a67a7d 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc @@ -29,14 +29,12 @@ */ #include "notch_lite_cc.h" - -#include -#include #include #include #include #include - +#include +#include using google::LogMessage; 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 41bc815a9..badcd00d9 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc +++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc @@ -29,12 +29,11 @@ */ #include "pulse_blanking_cc.h" -#include #include #include #include #include - +#include using google::LogMessage; diff --git a/src/algorithms/libs/complex_float_to_complex_byte.cc b/src/algorithms/libs/complex_float_to_complex_byte.cc index a6934d5b9..fc26ead1a 100644 --- a/src/algorithms/libs/complex_float_to_complex_byte.cc +++ b/src/algorithms/libs/complex_float_to_complex_byte.cc @@ -31,9 +31,7 @@ #include "complex_float_to_complex_byte.h" #include -#include -#include "volk_gnsssdr/volk_gnsssdr.h" - +#include complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte() @@ -47,7 +45,7 @@ complex_float_to_complex_byte::complex_float_to_complex_byte() : sync_block("com gr::io_signature::make (1, 1, sizeof(gr_complex)), gr::io_signature::make (1, 1, sizeof(lv_8sc_t))) // lv_8sc_t is a Volk's typedef for std::complex { - const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t); + const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_8sc_t); set_alignment(std::max(1, alignment_multiple)); } diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc index 2ea720ec8..49ce4d0f6 100644 --- a/src/algorithms/libs/galileo_e1_signal_processing.cc +++ b/src/algorithms/libs/galileo_e1_signal_processing.cc @@ -31,9 +31,9 @@ */ #include "galileo_e1_signal_processing.h" -#include #include "Galileo_E1.h" #include "gnss_signal_processing.h" +#include void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn) diff --git a/src/algorithms/libs/galileo_e5_signal_processing.cc b/src/algorithms/libs/galileo_e5_signal_processing.cc index ba2677aae..4f1f116bb 100644 --- a/src/algorithms/libs/galileo_e5_signal_processing.cc +++ b/src/algorithms/libs/galileo_e5_signal_processing.cc @@ -32,9 +32,9 @@ */ #include "galileo_e5_signal_processing.h" -#include #include "Galileo_E5a.h" #include "gnss_signal_processing.h" +#include diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc index ea3d0dfbd..96ce9a705 100644 --- a/src/algorithms/libs/gnss_sdr_flags.cc +++ b/src/algorithms/libs/gnss_sdr_flags.cc @@ -29,33 +29,35 @@ */ -#include +#include "gnss_sdr_flags.h" #include #include -DEFINE_string(c, "-", "Path to the configuration file (if set, overrides --config_file)"); +DEFINE_string(c, "-", "Path to the configuration file (if set, overrides --config_file)."); DEFINE_string(s, "-", - "If defined, path to the file containing the signal samples (overrides the configuration file and --signal_source)"); + "If defined, path to the file containing the signal samples (overrides the configuration file and --signal_source)."); DEFINE_string(signal_source, "-", - "If defined, path to the file containing the signal samples (overrides the configuration file)"); + "If defined, path to the file containing the signal samples (overrides the configuration file)."); -DEFINE_int32(doppler_max, 0, "If defined, maximum Doppler value in the search grid, in Hz (overrides the configuration file)"); +DEFINE_int32(doppler_max, 0, "If defined, sets the maximum Doppler value in the search grid, in Hz (overrides the configuration file)."); -DEFINE_int32(cn0_samples, 20, "Number of correlator outputs used for CN0 estimation"); +DEFINE_int32(doppler_step, 0, "If defined, sets the frequency step in the search grid, in Hz (overrides the configuration file)."); -DEFINE_int32(cn0_min, 25, "Minimum valid CN0 (in dB-Hz)"); +DEFINE_int32(cn0_samples, 20, "Number of correlator outputs used for CN0 estimation."); -DEFINE_int32(max_lock_fail, 50, "Number number of lock failures before dropping satellite"); +DEFINE_int32(cn0_min, 25, "Minimum valid CN0 (in dB-Hz)."); -DEFINE_double(carrier_lock_th, 0.85, "Carrier lock threshold (in rad)"); +DEFINE_int32(max_lock_fail, 50, "Number number of lock failures before dropping satellite."); -DEFINE_string(RINEX_version, "3.02", "Specifies the RINEX version (2.11 or 3.02)"); +DEFINE_double(carrier_lock_th, 0.85, "Carrier lock threshold (in rad)."); -DEFINE_double(dll_bw_hz, 0.0, "If defined, bandwidth of the DLL low pass filter, in Hz (overrides the configuration file)"); +DEFINE_string(RINEX_version, "-", "If defined, specifies the RINEX version (2.11 or 3.02). 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_double(dll_bw_hz, 0.0, "If defined, bandwidth of the DLL 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)."); #if GFLAGS_GREATER_2_0 @@ -68,6 +70,14 @@ static bool ValidateDopplerMax(const char* flagname, int32_t value) return false; } +static bool ValidateDopplerStep(const char* flagname, int32_t value) +{ + if (value >= 0 && value < 10000) // value is ok + return true; + std::cout << "Invalid value for " << flagname << ": " << value << std::endl; + return false; +} + static bool ValidateCn0Samples(const char* flagname, int32_t value) { if (value > 0 && value < 10000) // value is ok @@ -118,6 +128,7 @@ static bool ValidatePllBw(const char* flagname, double value) DEFINE_validator(doppler_max, &ValidateDopplerMax); +DEFINE_validator(doppler_step, &ValidateDopplerStep); DEFINE_validator(cn0_samples, &ValidateCn0Samples); DEFINE_validator(cn0_min, &ValidateCn0Min); DEFINE_validator(max_lock_fail, &ValidateMaxLockFail); diff --git a/src/algorithms/libs/gnss_sdr_flags.h b/src/algorithms/libs/gnss_sdr_flags.h index 6d36ac087..7ccbdabe5 100644 --- a/src/algorithms/libs/gnss_sdr_flags.h +++ b/src/algorithms/libs/gnss_sdr_flags.h @@ -34,28 +34,29 @@ #include -DECLARE_string(c); // // for min -#include // for memcpy -#include #include "control_message_factory.h" #include +#include +#include // for min +#include // for memcpy gnss_sdr_valve::gnss_sdr_valve (size_t sizeof_stream_item, unsigned long long nitems, diff --git a/src/algorithms/libs/gnss_signal_processing.cc b/src/algorithms/libs/gnss_signal_processing.cc index 9666b1d0d..ba624ea9b 100644 --- a/src/algorithms/libs/gnss_signal_processing.cc +++ b/src/algorithms/libs/gnss_signal_processing.cc @@ -32,8 +32,8 @@ */ #include "gnss_signal_processing.h" -#include #include "GPS_L1_CA.h" +#include auto auxCeil2 = [](float x){ return static_cast(static_cast((x)+1)); }; diff --git a/src/algorithms/libs/gps_l2c_signal.cc b/src/algorithms/libs/gps_l2c_signal.cc index 4bd44a994..590c5751c 100644 --- a/src/algorithms/libs/gps_l2c_signal.cc +++ b/src/algorithms/libs/gps_l2c_signal.cc @@ -30,10 +30,10 @@ * ------------------------------------------------------------------------- */ -#include +#include "gps_l2c_signal.h" +#include "GPS_L2C.h" #include #include -#include "GPS_L2C.h" int32_t gps_l2c_m_shift(int32_t x) diff --git a/src/algorithms/libs/gps_l5_signal.cc b/src/algorithms/libs/gps_l5_signal.cc index 5aa15b96c..46b5d9430 100644 --- a/src/algorithms/libs/gps_l5_signal.cc +++ b/src/algorithms/libs/gps_l5_signal.cc @@ -30,12 +30,12 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include +#include "gps_l5_signal.h" #include "GPS_L5.h" +#include +#include +#include +#include std::deque l5i_xa_shift(std::deque xa) diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index 87f2b1be6..584d06886 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -31,11 +31,10 @@ */ #include "pass_through.h" -#include -#include +#include "configuration_interface.h" #include #include -#include "configuration_interface.h" +#include using google::LogMessage; diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h index 39d4c5468..105ec9f78 100644 --- a/src/algorithms/libs/pass_through.h +++ b/src/algorithms/libs/pass_through.h @@ -33,13 +33,13 @@ #ifndef GNSS_SDR_PASS_THROUGH_H_ #define GNSS_SDR_PASS_THROUGH_H_ -#include -#include -#include -#include "gnss_block_interface.h" #include "conjugate_cc.h" #include "conjugate_sc.h" #include "conjugate_ic.h" +#include "gnss_block_interface.h" +#include +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h index 7aa7ddf5f..8d172b171 100644 --- a/src/algorithms/libs/rtklib/rtklib.h +++ b/src/algorithms/libs/rtklib/rtklib.h @@ -53,6 +53,9 @@ #ifndef GNSS_SDR_RTKLIB_H_ #define GNSS_SDR_RTKLIB_H_ +#include "MATH_CONSTANTS.h" +#include "gnss_frequencies.h" +#include "gnss_obs_codes.h" #include #include #include @@ -60,9 +63,6 @@ #include #include #include -#include "MATH_CONSTANTS.h" -#include "gnss_frequencies.h" -#include "gnss_obs_codes.h" /* macros --------------------------------------------------------------------*/ 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 97a42c8c7..3a2c7c39f 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 @@ -20,10 +20,11 @@ #include #endif -#include -#include "volk_gnsssdr/volk_gnsssdr.h" -#include -#include "volk_gnsssdr_option_helpers.h" +#include "volk_gnsssdr/volk_gnsssdr.h" // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine +#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t +#include // for volk_gnsssdr_available_machines, volk_gnsssdr_c_compiler ... +#include // for operator<<, endl, cout, ostream +#include // for string void print_alignment() { 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 298bb062f..61e085423 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 @@ -17,8 +17,14 @@ */ #include "volk_gnsssdr_option_helpers.h" +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // for exception +#include // for operator<<, endl, basic_ostream, cout, ostream +#include // for pair + -#include /* * Option type 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 10bde4586..30cb98210 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 @@ -19,9 +19,13 @@ #ifndef VOLK_VOLK_OPTION_HELPERS_H #define VOLK_VOLK_OPTION_HELPERS_H +#include +#include +#include #include #include + typedef enum { VOID_CALLBACK, 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 eff989ef5..5b9a1a653 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors) +/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) * * This file is part of GNSS-SDR. * @@ -16,19 +16,24 @@ * along with GNSS-SDR. If not, see . */ -#include "qa_utils.h" -#include "kernel_tests.h" -#include "volk_gnsssdr_option_helpers.h" +#include "kernel_tests.h" // for init_test_list +#include "qa_utils.h" // for volk_gnsssdr_test_results_t +#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t +#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t #include "volk_gnsssdr_profile.h" +#include "volk_gnsssdr/volk_gnsssdr_prefs.h" // for volk_gnsssdr_get_config_path +#include // for create_directories, exists +#include // for path, operator<< +#include // for filesystem +#include // for stat +#include // for size_t +#include // for operator<<, basic_ostream +#include // IWYU pragma: keep +#include // for map, map<>::iterator +#include // for pair +#include // for vector, vector<>::const_.. -#include -#include -#include -#include -#include -#include -#include namespace fs = boost::filesystem; @@ -222,7 +227,7 @@ void write_results(const std::vector *results, bool const fs::path config_path(path); // Until we can update the config on a kernel by kernel basis // do not overwrite volk_gnsssdr_config when using a regex. - if (not fs::exists(config_path.branch_path())) + if (! fs::exists(config_path.branch_path())) { std::cout << "Creating " << config_path.branch_path() << " ..." << std::endl; fs::create_directories(config_path.branch_path()); 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 4530c6be7..26ff1249b 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 @@ -27,6 +27,12 @@ * ------------------------------------------------------------------------- */ +#include // for bool +#include // for ofstream +#include // for string +#include // for vector + +class volk_test_results_t; void read_results(std::vector *results); 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 3d60c2714..35e60b2f4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors) +/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) * * This file is part of GNSS-SDR. * @@ -17,13 +17,25 @@ */ #include "qa_utils.h" -#include -#include -#include -#include -#include -#include -#include +#include "volk_gnsssdr/volk_gnsssdr.h" // for volk_gnsssdr_func_desc_t +#include "volk_gnsssdr/volk_gnsssdr_malloc.h" // for volk_gnsssdr_free, volk_gnsssdr_malloc +#include // for auto_any_base +#include // for lexical_cast +#include // for char_separator +#include // for token_iterator +#include // for tokenizer +#include // for assert +#include // for system_clock, duration,... +#include // for sqrt, fabs, abs +#include // for uint16_t, uint64_t,int16_t, int32_t +#include // for memcpy, memset +#include // for operator<< +#include // for cout, cerr +#include // for numeric_limits +#include // for map +#include // for random_device, default_random_engine, uniform_real_distribution +#include // for vector + float uniform() { std::random_device r; 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 8188529b0..ad4d7e6b9 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors) +/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) * * This file is part of GNSS-SDR. * @@ -23,13 +23,14 @@ #define _DARWIN_C_SOURCE #endif -#include -#include -#include -#include -#include -#include -#include +#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t +#include "volk_gnsssdr/volk_gnsssdr.h" // for volk_gnsssdr_func_desc_t +#include // for bool, false +#include // for NULL +#include // for map +#include // for string, basic_string +#include // for vector + /************************************************ * VOLK QA type definitions * 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 659b111c4..6e1f0fb61 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,5 +1,5 @@ /* - * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) * * This file is part of GNSS-SDR. * @@ -18,15 +18,16 @@ */ -#include "qa_utils.h" -#include "kernel_tests.h" - -#include - -#include -#include -#include -#include +#include "kernel_tests.h" // for init_test_list +#include "qa_utils.h" // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t +#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t +#include // for bool, false, true +#include // for operator<<, basic_ostream, endl, char... +#include // IWYU pragma: keep +#include // for map, map<>::iterator, _Rb_tree_iterator +#include // for string, operator<< +#include // for pair +#include // for vector void print_qa_xml(std::vector results, unsigned int nfails); diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index d93b82598..c95866a09 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -32,9 +32,10 @@ #include "hybrid_observables.h" #include "configuration_interface.h" -#include -#include "GPS_L1_CA.h" #include "Galileo_E1.h" +#include "GPS_L1_CA.h" +#include + using google::LogMessage; diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h index d986ebb14..567c7b5ba 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.h +++ b/src/algorithms/observables/adapters/hybrid_observables.h @@ -34,10 +34,9 @@ #ifndef GNSS_SDR_HYBRID_OBSERVABLES_H_ #define GNSS_SDR_HYBRID_OBSERVABLES_H_ -#include -#include "observables_interface.h" #include "hybrid_observables_cc.h" - +#include "observables_interface.h" +#include class ConfigurationInterface; diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc index 2f3d7f5c6..f26b6d294 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc @@ -30,17 +30,19 @@ */ #include "hybrid_observables_cc.h" +#include "Galileo_E1.h" +#include "GPS_L1_CA.h" +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include "Galileo_E1.h" -#include "GPS_L1_CA.h" + using google::LogMessage; diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h index 024e1b4c0..dc5085cd3 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h @@ -34,6 +34,8 @@ #ifndef GNSS_SDR_HYBRID_OBSERVABLES_CC_H #define GNSS_SDR_HYBRID_OBSERVABLES_CC_H +#include "gnss_synchro.h" +#include #include #include #include //std::pair diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index c69eeb43b..5c3071981 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -30,15 +30,15 @@ */ #include "direct_resampler_conditioner.h" -#include -#include -#include -#include -#include #include "direct_resampler_conditioner_cc.h" #include "direct_resampler_conditioner_cs.h" #include "direct_resampler_conditioner_cb.h" #include "configuration_interface.h" +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h index 8a188d506..8ffa4d4b4 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h @@ -33,9 +33,9 @@ #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_ #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_ -#include -#include #include "gnss_block_interface.h" +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index 340fc5cea..170215618 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -30,11 +30,11 @@ */ #include "mmse_resampler_conditioner.h" -#include -#include +#include "configuration_interface.h" #include #include -#include "configuration_interface.h" +#include +#include using google::LogMessage; diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h index 57aae1906..c5ce652dc 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h @@ -33,13 +33,13 @@ #ifndef GNSS_SDR_MMSE_RESAMPLER_CONDITIONER_H_ #define GNSS_SDR_MMSE_RESAMPLER_CONDITIONER_H_ -#include +#include "gnss_block_interface.h" #ifdef GR_GREATER_38 #include #else #include #endif -#include "gnss_block_interface.h" +#include class ConfigurationInterface; 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 bfda13b4e..386968791 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc @@ -33,8 +33,6 @@ #include "direct_resampler_conditioner_cb.h" -#include -#include #include #include 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 569f3fc14..e05f887d5 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc @@ -33,11 +33,10 @@ #include "direct_resampler_conditioner_cc.h" -#include -#include #include #include + using google::LogMessage; direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc( diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc index e0e808e0c..e362a1dde 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc @@ -33,8 +33,6 @@ #include "direct_resampler_conditioner_cs.h" -#include -#include #include #include diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc index 57e3c0aa0..439e3c3ca 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.cc +++ b/src/algorithms/signal_generator/adapters/signal_generator.cc @@ -31,12 +31,12 @@ #include "signal_generator.h" -#include #include "configuration_interface.h" #include "Galileo_E1.h" #include "GPS_L1_CA.h" #include "Galileo_E5a.h" #include "GLONASS_L1_CA.h" +#include using google::LogMessage; diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h index 97815b393..16104062d 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.h +++ b/src/algorithms/signal_generator/adapters/signal_generator.h @@ -33,15 +33,14 @@ #ifndef GNSS_SDR_SIGNAL_GENERATOR_H_ #define GNSS_SDR_SIGNAL_GENERATOR_H_ - -#include -#include +#include "gnss_block_interface.h" +#include "signal_generator_c.h" #include #include #include #include -#include "gnss_block_interface.h" -#include "signal_generator_c.h" +#include +#include class ConfigurationInterface; 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 6d84c3084..8bc43795e 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc @@ -29,10 +29,6 @@ */ #include "signal_generator_c.h" -#include -#include -#include -#include #include "gps_sdr_signal_processing.h" #include "glonass_l1_signal_processing.h" #include "galileo_e1_signal_processing.h" @@ -41,6 +37,9 @@ #include "Galileo_E5a.h" #include "GPS_L1_CA.h" #include "GLONASS_L1_CA.h" +#include +#include +#include /* * Create a new instance of signal_generator_c and return 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 01357e08c..93a938347 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h @@ -31,13 +31,14 @@ #ifndef GNSS_SDR_SIGNAL_GENERATOR_C_H #define GNSS_SDR_SIGNAL_GENERATOR_C_H -#include -#include -#include +#include "gnss_signal.h" #include #include #include -#include "gnss_signal.h" +#include +#include +#include + class signal_generator_c; diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index aa2c18244..f05d5b1bd 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -31,14 +31,14 @@ */ #include "file_signal_source.h" -#include -#include -#include -#include -#include #include "configuration_interface.h" #include "gnss_sdr_flags.h" #include "gnss_sdr_valve.h" +#include +#include // for std::cerr +#include +#include +#include diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index 85c9104db..850c73e93 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -35,14 +35,13 @@ #ifndef GNSS_SDR_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_FILE_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include #include #include -#include "gnss_block_interface.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc index e21126506..ee5f7411a 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc @@ -29,11 +29,11 @@ */ #include "flexiband_signal_source.h" +#include "configuration_interface.h" #include #include #include #include -#include "configuration_interface.h" using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h index 5949f8cb0..b071a5b75 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h @@ -33,14 +33,14 @@ #ifndef FLEXIBAND_SIGNAL_SOURCE_H_ #define FLEXIBAND_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include #include #include +#include #include -#include "gnss_block_interface.h" class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc index 52916a19e..14c3a1386 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc @@ -30,11 +30,12 @@ */ #include "fmcomms2_signal_source.h" -#include -#include #include "configuration_interface.h" #include "gnss_sdr_valve.h" #include "GPS_L1_CA.h" +#include +#include + using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h index 78f3ebb58..a359c8cfe 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h @@ -33,12 +33,12 @@ #ifndef GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_ #define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include #include -#include "gnss_block_interface.h" +#include class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.cc b/src/algorithms/signal_source/adapters/gen_signal_source.cc index bede41061..f709e419d 100644 --- a/src/algorithms/signal_source/adapters/gen_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gen_signal_source.cc @@ -31,13 +31,12 @@ */ #include "gen_signal_source.h" -#include -#include #include #include #include #include #include +#include using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h index 034155bf0..1fcbc15a7 100644 --- a/src/algorithms/signal_source/adapters/gen_signal_source.h +++ b/src/algorithms/signal_source/adapters/gen_signal_source.h @@ -33,10 +33,10 @@ #ifndef GNSS_SDR_GEN_SIGNAL_SOURCE_H_ #define GNSS_SDR_GEN_SIGNAL_SOURCE_H_ -#include -#include -#include "gnss_block_interface.h" +#include "gnss_block_interface.h" +#include +#include /*! * \brief This class wraps blocks that generates synthesized GNSS signal and diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc index 17ac8513c..438723ff9 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc @@ -29,11 +29,11 @@ */ #include "gn3s_signal_source.h" +#include "configuration_interface.h" #include #include #include #include -#include "configuration_interface.h" using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index b8b61cbdb..146a5aaec 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -32,11 +32,11 @@ #ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H_ #define GNSS_SDR_GN3S_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include -#include "gnss_block_interface.h" +#include class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc index ddd0805c2..3a5fb9175 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc @@ -29,9 +29,10 @@ */ #include "labsat_signal_source.h" -#include -#include "labsat23_source.h" #include "configuration_interface.h" +#include "labsat23_source.h" +#include + using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h index 43821e8e8..71942f90b 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.h +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h @@ -32,12 +32,11 @@ #ifndef GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_ #define GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include -#include "gnss_block_interface.h" - +#include class ConfigurationInterface; 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 00d374d55..2208d15e7 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -31,14 +31,14 @@ */ #include "nsr_file_signal_source.h" +#include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" +#include #include #include #include #include -#include -#include "configuration_interface.h" -#include "gnss_sdr_flags.h" -#include "gnss_sdr_valve.h" using google::LogMessage; 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 8ca419c91..7be4ea775 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -35,15 +35,14 @@ #ifndef GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" +#include "unpack_byte_2bit_samples.h" #include #include #include #include #include -#include "gnss_block_interface.h" -#include "unpack_byte_2bit_samples.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc index c3c1da374..4bb665ffa 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc @@ -30,13 +30,14 @@ */ #include "osmosdr_signal_source.h" -#include -#include -#include -#include #include "configuration_interface.h" #include "gnss_sdr_valve.h" #include "GPS_L1_CA.h" +#include +#include +#include +#include + using google::LogMessage; @@ -78,13 +79,13 @@ OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration, // 1. Make the driver instance OsmosdrSignalSource::driver_instance(); - // For LimeSDR: Set RX antenna - if (!antenna_.empty()) - { - osmosdr_source_->set_antenna(antenna_, 0); - std::cout << boost::format("Set RX Antenna : %s") % (osmosdr_source_->get_antenna(0)) << std::endl ; - LOG(INFO) << boost::format("Set RX Antenna : %s") % (osmosdr_source_->get_antenna(0)); - } + // For LimeSDR: Set RX antenna + if (!antenna_.empty()) + { + osmosdr_source_->set_antenna(antenna_, 0); + std::cout << boost::format("Set RX Antenna : %s") % (osmosdr_source_->get_antenna(0)) << std::endl ; + LOG(INFO) << boost::format("Set RX Antenna : %s") % (osmosdr_source_->get_antenna(0)); + } // 2 set sampling rate osmosdr_source_->set_sample_rate(sample_rate_); @@ -97,7 +98,7 @@ OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration, LOG(INFO) << boost::format("Actual RX Freq: %f [Hz]...") % (osmosdr_source_->get_center_freq()); // TODO: Assign the remnant IF from the PLL tune error - std::cout << boost::format("PLL Frequency tune error %f [Hz]...") % (osmosdr_source_->get_center_freq() - freq_) ; + std::cout << boost::format("PLL Frequency tune error %f [Hz]...") % (osmosdr_source_->get_center_freq() - freq_) << std::endl; LOG(INFO) << boost::format("PLL Frequency tune error %f [Hz]...") % (osmosdr_source_->get_center_freq() - freq_) ; // 4. set rx gain @@ -113,9 +114,22 @@ OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration, osmosdr_source_->set_gain(gain_, 0); osmosdr_source_->set_if_gain(rf_gain_, 0); osmosdr_source_->set_bb_gain(if_gain_, 0); - std::cout << boost::format("Actual RX Gain: %f dB...") % osmosdr_source_->get_gain() << std::endl; - LOG(INFO) << boost::format("Actual RX Gain: %f dB...") % osmosdr_source_->get_gain(); + if (!osmosdr_args_.empty() && (osmosdr_args_.find("bladerf") != std::string::npos)) + { + std::cout << boost::format("Actual LNA Gain: %f dB...") % osmosdr_source_->get_gain("LNA",0) << std::endl; + std::cout << boost::format("Actual VGA1 Gain: %f dB...") % osmosdr_source_->get_gain("VGA1",0) << std::endl; + std::cout << boost::format("Actual VGA2 Gain: %f dB...") % osmosdr_source_->get_gain("VGA2",0) << std::endl; + + } + else + { + std::cout << boost::format("Actual RX Gain: %f dB...") % osmosdr_source_->get_gain() << std::endl; + LOG(INFO) << boost::format("Actual RX Gain: %f dB...") % osmosdr_source_->get_gain(); + } } + + // Get actual bandwidth + std::cout << boost::format("Actual Bandwidth: %f [Hz]...") % osmosdr_source_->get_bandwidth(0) << std::endl; } else { diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h index bed05d358..7e69aec81 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h @@ -33,13 +33,13 @@ #ifndef GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_ #define GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_ -#include -#include +#include "gnss_block_interface.h" #include #include #include #include -#include "gnss_block_interface.h" +#include +#include class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc index 4e7e37b3e..3f3e6f171 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc @@ -29,11 +29,11 @@ */ #include "plutosdr_signal_source.h" -#include -#include #include "configuration_interface.h" #include "gnss_sdr_valve.h" #include "GPS_L1_CA.h" +#include +#include using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h index 56c2334c8..535f50939 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h @@ -32,12 +32,13 @@ #ifndef GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_ #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include #include -#include "gnss_block_interface.h" +#include + class ConfigurationInterface; 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 d203901e8..ba96b0460 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc @@ -29,11 +29,11 @@ */ #include "raw_array_signal_source.h" +#include "configuration_interface.h" +#include #include #include #include -#include -#include "configuration_interface.h" using google::LogMessage; 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 fe813aa8f..eaabd84e2 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h @@ -32,12 +32,11 @@ #ifndef RAW_ARRAY_SIGNAL_SOURCE_H_ #define RAW_ARRAY_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" #include #include #include -#include "gnss_block_interface.h" - +#include class ConfigurationInterface; 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 38da90196..1e2e86c3b 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -31,12 +31,13 @@ */ #include "rtl_tcp_signal_source.h" -#include -#include -#include #include "configuration_interface.h" #include "gnss_sdr_valve.h" #include "GPS_L1_CA.h" +#include +#include +#include + using google::LogMessage; 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 283f84ae9..e8cf81393 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h @@ -32,15 +32,16 @@ #ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H #define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H -#include -#include +#include "rtl_tcp_signal_source_c.h" +#include "gnss_block_interface.h" #include #include #include #include #include -#include "rtl_tcp_signal_source_c.h" -#include "gnss_block_interface.h" +#include +#include + class ConfigurationInterface; 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 3446406bb..0293f5805 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -30,14 +30,14 @@ */ #include "spir_file_signal_source.h" +#include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" +#include #include #include #include #include -#include -#include "configuration_interface.h" -#include "gnss_sdr_flags.h" -#include "gnss_sdr_valve.h" using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h index f620a40c9..bb73cd013 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h @@ -32,15 +32,14 @@ #ifndef GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" +#include "unpack_intspir_1bit_samples.h" #include #include #include #include #include -#include "gnss_block_interface.h" -#include "unpack_intspir_1bit_samples.h" - +#include class ConfigurationInterface; 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 75d30b9f5..512ec6678 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 @@ -30,13 +30,13 @@ */ #include "spir_gss6450_file_signal_source.h" +#include "configuration_interface.h" +#include #include #include #include #include -#include -#include -#include "configuration_interface.h" + using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h index 05985b36c..cc07a9747 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h @@ -32,8 +32,9 @@ #ifndef GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_ -#include -#include +#include "gnss_block_interface.h" +#include "gnss_sdr_valve.h" +#include "unpack_spir_gss6450_samples.h" #include #include #include @@ -42,9 +43,8 @@ #include #include #include -#include "gnss_block_interface.h" -#include "gnss_sdr_valve.h" -#include "unpack_spir_gss6450_samples.h" +#include +#include class ConfigurationInterface; 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 4aa79fb12..ea5f715c7 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 @@ -30,14 +30,14 @@ */ #include "two_bit_cpx_file_signal_source.h" +#include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" +#include #include #include #include #include -#include -#include "gnss_sdr_flags.h" -#include "gnss_sdr_valve.h" -#include "configuration_interface.h" using google::LogMessage; 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 674bb24de..405bd1a68 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 @@ -34,16 +34,15 @@ #ifndef GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" +#include "unpack_byte_2bit_cpx_samples.h" #include #include #include #include #include #include -#include "gnss_block_interface.h" -#include "unpack_byte_2bit_cpx_samples.h" - +#include class ConfigurationInterface; 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 3e0712c8a..829c8941b 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 @@ -31,16 +31,15 @@ */ #include "two_bit_packed_file_signal_source.h" +#include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" +#include +#include #include #include #include #include -#include -#include -#include "gnss_sdr_flags.h" -#include "gnss_sdr_valve.h" -#include "configuration_interface.h" - using google::LogMessage; 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 397010311..72af7696a 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 @@ -35,16 +35,15 @@ #ifndef GNSS_SDR_TWO_BIT_PACKED_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_TWO_BIT_PACKED_FILE_SIGNAL_SOURCE_H_ -#include +#include "gnss_block_interface.h" +#include "unpack_2bit_samples.h" #include #include #include #include #include #include -#include "gnss_block_interface.h" -#include "unpack_2bit_samples.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc index 8a3658281..7d4057c8a 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc @@ -29,14 +29,15 @@ */ #include "uhd_signal_source.h" -#include -#include -#include -#include -#include #include "configuration_interface.h" #include "gnss_sdr_valve.h" #include "GPS_L1_CA.h" +#include +#include +#include +#include +#include + using google::LogMessage; diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index 94a622218..969a44819 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -31,14 +31,15 @@ #ifndef GNSS_SDR_UHD_SIGNAL_SOURCE_H_ #define GNSS_SDR_UHD_SIGNAL_SOURCE_H_ -#include -#include +#include "gnss_block_interface.h" #include #include #include #include #include -#include "gnss_block_interface.h" +#include +#include + class ConfigurationInterface; diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc index fe9a9c4f7..03b35b2be 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc @@ -34,6 +34,7 @@ #include "labsat23_source.h" #include +#include #include diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h index ffc1b440b..2444087c1 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h @@ -32,10 +32,10 @@ #define GNSS_SDR_LABSAT23_SOURCE_H #include -#include -#include +#include #include -#include +#include + class labsat23_source; 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 d73a40509..7ad2e7827 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 @@ -40,12 +40,12 @@ #include "rtl_tcp_dongle_info.h" #include -#include -#include #include #include #include #include +#include +#include class rtl_tcp_signal_source_c; 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 0e8a73da3..dbb97e583 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h @@ -68,9 +68,8 @@ #ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H #define GNSS_SDR_UNPACK_2BIT_SAMPLES_H -#include #include - +#include class unpack_2bit_samples; 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 ad736a0cc..1f28b0004 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc +++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc @@ -32,8 +32,8 @@ */ #include "rtl_tcp_dongle_info.h" -#include #include +#include using boost::asio::ip::tcp; 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 5de974a85..15d52e856 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -32,14 +32,14 @@ #include "galileo_e1b_telemetry_decoder.h" -#include -#include #include "configuration_interface.h" -#include "concurrent_queue.h" #include "galileo_ephemeris.h" #include "galileo_almanac.h" #include "galileo_iono.h" #include "galileo_utc_model.h" +#include +#include + using google::LogMessage; @@ -47,9 +47,9 @@ GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* c std::string role, unsigned int in_streams, unsigned int out_streams) : - role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + role_(role), + in_streams_(in_streams), + out_streams_(out_streams) { std::string default_dump_filename = "./navigation.dat"; DLOG(INFO) << "role " << role; @@ -58,7 +58,6 @@ GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* c // make telemetry decoder object telemetry_decoder_ = galileo_e1b_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; - channel_ = 0; } 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 571fd09b8..6f3d2837c 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -34,11 +34,11 @@ #ifndef GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_H_ #define GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_H_ -#include + #include "telemetry_decoder_interface.h" #include "galileo_e1b_telemetry_decoder_cc.h" #include "gnss_satellite.h" - +#include class ConfigurationInterface; 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 24f72a4ac..8b862e7e3 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -35,14 +35,14 @@ */ #include "galileo_e5a_telemetry_decoder.h" -#include -#include -#include "concurrent_queue.h" +#include "configuration_interface.h" #include "galileo_ephemeris.h" #include "galileo_almanac.h" #include "galileo_iono.h" #include "galileo_utc_model.h" -#include "configuration_interface.h" +#include +#include + using google::LogMessage; @@ -51,9 +51,9 @@ GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* c std::string role, unsigned int in_streams, unsigned int out_streams) : - role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + role_(role), + in_streams_(in_streams), + out_streams_(out_streams) { std::string default_dump_filename = "./navigation.dat"; DLOG(INFO) << "role " << role; @@ -62,7 +62,6 @@ GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* c // make telemetry decoder object telemetry_decoder_ = galileo_e5a_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; - DLOG(INFO) << "global navigation message queue assigned to telemetry_decoder ("<< telemetry_decoder_->unique_id() << ")"; channel_ = 0; } 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 9b7bb7713..cf2d0aae6 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h @@ -37,10 +37,9 @@ #ifndef GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_H_ #define GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_H_ -#include -#include "telemetry_decoder_interface.h" #include "galileo_e5a_telemetry_decoder_cc.h" - +#include "telemetry_decoder_interface.h" +#include class ConfigurationInterface; 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 5e4b5a4bc..0ff8facef 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 @@ -32,13 +32,13 @@ #include "glonass_l1_ca_telemetry_decoder.h" -#include -#include -#include "concurrent_queue.h" +#include "configuration_interface.h" #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_almanac.h" #include "glonass_gnav_utc_model.h" -#include "configuration_interface.h" +#include +#include + using google::LogMessage; @@ -46,9 +46,9 @@ GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface* std::string role, unsigned int in_streams, unsigned int out_streams) : - role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + role_(role), + in_streams_(in_streams), + out_streams_(out_streams) { std::string default_dump_filename = "./navigation.dat"; DLOG(INFO) << "role " << role; @@ -57,8 +57,6 @@ GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface* // make telemetry decoder object telemetry_decoder_ = glonass_l1_ca_make_telemetry_decoder_cc(satellite_, dump_); DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; - - DLOG(INFO) << "global navigation message queue assigned to telemetry_decoder ("<< telemetry_decoder_->unique_id() << ")"; channel_ = 0; } 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 6eef6e858..a2f413302 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 @@ -34,10 +34,9 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_H_ #define GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_H_ -#include #include "telemetry_decoder_interface.h" #include "glonass_l1_ca_telemetry_decoder_cc.h" - +#include class ConfigurationInterface; 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 72deeafd6..cb285e9b9 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 @@ -31,14 +31,14 @@ #include "gps_l1_ca_telemetry_decoder.h" -#include -#include -#include "concurrent_queue.h" +#include "configuration_interface.h" #include "gps_ephemeris.h" #include "gps_almanac.h" #include "gps_iono.h" #include "gps_utc_model.h" -#include "configuration_interface.h" +#include +#include + using google::LogMessage; @@ -46,9 +46,9 @@ GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configu std::string role, unsigned int in_streams, unsigned int out_streams) : - role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + role_(role), + in_streams_(in_streams), + out_streams_(out_streams) { std::string default_dump_filename = "./navigation.dat"; DLOG(INFO) << "role " << role; @@ -57,8 +57,6 @@ GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configu // make telemetry decoder object telemetry_decoder_ = gps_l1_ca_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; - - DLOG(INFO) << "global navigation message queue assigned to telemetry_decoder ("<< telemetry_decoder_->unique_id() << ")"; channel_ = 0; } 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 fdefb78d5..2d115fc5e 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 @@ -33,10 +33,9 @@ #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_ #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_ -#include -#include "telemetry_decoder_interface.h" #include "gps_l1_ca_telemetry_decoder_cc.h" - +#include "telemetry_decoder_interface.h" +#include class ConfigurationInterface; 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 205b34395..d93569211 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -31,14 +31,13 @@ #include "gps_l2c_telemetry_decoder.h" -#include -#include -#include "concurrent_queue.h" +#include "configuration_interface.h" #include "gps_cnav_ephemeris.h" #include "gps_almanac.h" #include "gps_cnav_iono.h" #include "gps_cnav_utc_model.h" -#include "configuration_interface.h" +#include +#include using google::LogMessage; @@ -47,9 +46,9 @@ GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configura std::string role, unsigned int in_streams, unsigned int out_streams) : - role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + role_(role), + in_streams_(in_streams), + out_streams_(out_streams) { std::string default_dump_filename = "./navigation.dat"; DLOG(INFO) << "role " << role; @@ -58,8 +57,6 @@ GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configura // make telemetry decoder object telemetry_decoder_ = gps_l2c_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; - - LOG(INFO) << "global navigation message queue assigned to telemetry_decoder (" << telemetry_decoder_->unique_id() << ")" << "role " << role; channel_ = 0; } 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 c98d724cf..753478bae 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h @@ -33,10 +33,9 @@ #ifndef GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H_ #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H_ -#include -#include "telemetry_decoder_interface.h" #include "gps_l2c_telemetry_decoder_cc.h" - +#include "telemetry_decoder_interface.h" +#include class ConfigurationInterface; 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 fe4f356f1..8b57e81cf 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc @@ -31,10 +31,9 @@ #include "gps_l5_telemetry_decoder.h" +#include "configuration_interface.h" #include #include -#include "concurrent_queue.h" -#include "configuration_interface.h" using google::LogMessage; @@ -43,9 +42,9 @@ GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configurati std::string role, unsigned int in_streams, unsigned int out_streams) : - role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + role_(role), + in_streams_(in_streams), + out_streams_(out_streams) { std::string default_dump_filename = "./navigation.dat"; DLOG(INFO) << "role " << role; @@ -54,8 +53,6 @@ GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configurati // make telemetry decoder object telemetry_decoder_ = gps_l5_make_telemetry_decoder_cc(satellite_, dump_); DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; - - LOG(INFO) << "global navigation message queue assigned to telemetry_decoder (" << telemetry_decoder_->unique_id() << ")" << "role " << role; channel_ = 0; } 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 4041e253e..d25405cf3 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h @@ -33,10 +33,11 @@ #ifndef GNSS_SDR_GPS_L5_TELEMETRY_DECODER_H_ #define GNSS_SDR_GPS_L5_TELEMETRY_DECODER_H_ -#include + #include "telemetry_decoder_interface.h" #include "gps_l5_telemetry_decoder_cc.h" #include "gnss_satellite.h" +#include class ConfigurationInterface; 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 bf9e45e74..755419bd7 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -31,12 +31,12 @@ #include "sbas_l1_telemetry_decoder.h" +#include "configuration_interface.h" +#include "sbas_ephemeris.h" +#include "sbas_l1_telemetry_decoder_cc.h" #include #include -#include "concurrent_queue.h" -#include "sbas_ephemeris.h" -#include "configuration_interface.h" -#include "sbas_l1_telemetry_decoder_cc.h" + using google::LogMessage; 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 47325cad7..eae3bf32f 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -33,10 +33,10 @@ #ifndef GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_ #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_ -#include + #include "telemetry_decoder_interface.h" #include "sbas_l1_telemetry_decoder_cc.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc index 53ad564e8..40d737246 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc @@ -31,13 +31,13 @@ #include "galileo_e1b_telemetry_decoder_cc.h" -#include +#include "control_message_factory.h" +#include "convolutional.h" +#include "gnss_synchro.h" #include #include #include -#include "control_message_factory.h" -#include "gnss_synchro.h" -#include "convolutional.h" +#include #define CRC_ERROR_LIMIT 6 diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h index 95a618c7a..7e6fb0374 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h @@ -32,19 +32,18 @@ #ifndef GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_CC_H #define GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_CC_H -#include -#include -#include + #include "Galileo_E1.h" -#include "concurrent_queue.h" -#include "gnss_satellite.h" #include "galileo_navigation_message.h" #include "galileo_ephemeris.h" #include "galileo_almanac.h" #include "galileo_iono.h" #include "galileo_utc_model.h" +#include "gnss_satellite.h" #include "gnss_synchro.h" - +#include +#include +#include class galileo_e1b_telemetry_decoder_cc; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc index 174d6754d..928f14ac6 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc @@ -35,13 +35,13 @@ */ #include "galileo_e5a_telemetry_decoder_cc.h" -#include +#include "control_message_factory.h" +#include "convolutional.h" #include #include #include #include -#include "control_message_factory.h" -#include "convolutional.h" +#include #define GALILEO_E5a_CRC_ERROR_LIMIT 6 diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h index 4390b3181..af1d3f15d 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h @@ -37,12 +37,7 @@ #ifndef GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_CC_H_ #define GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_CC_H_ -#include -#include -#include -#include #include "Galileo_E5a.h" -#include "concurrent_queue.h" #include "gnss_satellite.h" #include "galileo_fnav_message.h" #include "galileo_ephemeris.h" @@ -50,6 +45,11 @@ #include "galileo_iono.h" #include "galileo_utc_model.h" #include "gnss_synchro.h" +#include +#include +#include +#include + class galileo_e5a_telemetry_decoder_cc; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h index 8973d7d95..5acf0aa22 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h @@ -33,18 +33,17 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_CC_H #define GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_CC_H -#include -#include -#include + #include "GLONASS_L1_CA.h" -#include "concurrent_queue.h" -#include "gnss_satellite.h" #include "glonass_gnav_navigation_message.h" #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_almanac.h" #include "glonass_gnav_utc_model.h" +#include "gnss_satellite.h" #include "gnss_synchro.h" - +#include +#include +#include class glonass_l1_ca_telemetry_decoder_cc; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc index ae303a20f..ccbd17d9e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc @@ -30,11 +30,11 @@ */ #include "gps_l1_ca_telemetry_decoder_cc.h" -#include +#include "control_message_factory.h" #include #include #include -#include "control_message_factory.h" + #ifndef _rotl #define _rotl(X,N) ((X << N) ^ (X >> (32-N))) // Used in the parity check algorithm diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h index 49ae8e1d0..28c006adf 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h @@ -31,16 +31,14 @@ #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H -#include -#include -#include -#include #include "GPS_L1_CA.h" #include "gps_l1_ca_subframe_fsm.h" -#include "concurrent_queue.h" #include "gnss_satellite.h" #include "gnss_synchro.h" - +#include +#include +#include +#include class gps_l1_ca_telemetry_decoder_cc; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc index 4e046f1c4..f4a64d06f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc @@ -29,14 +29,16 @@ * ------------------------------------------------------------------------- */ + +#include "gps_l2c_telemetry_decoder_cc.h" +#include "gnss_synchro.h" +#include +#include +#include #include #include #include -#include -#include -#include -#include "gnss_synchro.h" -#include "gps_l2c_telemetry_decoder_cc.h" + using google::LogMessage; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h index 240eac538..d5613fd73 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h @@ -31,18 +31,19 @@ #ifndef GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_CC_H #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_CC_H + +#include "gnss_satellite.h" +#include "gps_cnav_navigation_message.h" +#include "gps_cnav_ephemeris.h" +#include "gps_cnav_iono.h" +#include #include // for copy #include #include #include #include // for pair #include -#include -#include "gnss_satellite.h" -#include "gps_cnav_navigation_message.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" -#include "concurrent_queue.h" + extern "C" { #include "cnav_msg.h" diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc index 04c0890a6..eb8e4a976 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc @@ -29,16 +29,18 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include + +#include "gps_l5_telemetry_decoder_cc.h" +#include "gnss_synchro.h" +#include "gps_cnav_ephemeris.h" +#include "gps_cnav_iono.h" #include #include #include -#include "gnss_synchro.h" -#include "gps_l5_telemetry_decoder_cc.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" +#include +#include +#include + using google::LogMessage; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h index 3d60b95ce..f3452b78f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h @@ -31,16 +31,16 @@ #ifndef GNSS_SDR_GPS_L5_TELEMETRY_DECODER_CC_H #define GNSS_SDR_GPS_L5_TELEMETRY_DECODER_CC_H + +#include "gnss_satellite.h" +#include "gps_cnav_navigation_message.h" +#include #include #include #include #include #include #include -#include -#include "gnss_satellite.h" -#include "gps_cnav_navigation_message.h" -#include "concurrent_queue.h" extern "C" { #include "cnav_msg.h" diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc index f06cf16fd..dab50ea9f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc @@ -28,14 +28,14 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include +#include "sbas_l1_telemetry_decoder_cc.h" #include "control_message_factory.h" #include "gnss_synchro.h" -#include "sbas_l1_telemetry_decoder_cc.h" +#include +#include +#include +#include + using google::LogMessage; @@ -46,7 +46,6 @@ using google::LogMessage; #define LMORE 5 // - sbas_l1_telemetry_decoder_cc_sptr sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) { diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h index ee0b2f732..8f31cf4e5 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h @@ -31,16 +31,17 @@ #ifndef GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_CC_H #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_CC_H +#include "gnss_satellite.h" +#include "viterbi_decoder.h" +#include +#include #include // for copy #include #include #include #include // for pair #include -#include -#include -#include "gnss_satellite.h" -#include "viterbi_decoder.h" + class sbas_l1_telemetry_decoder_cc; diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc index 68d286822..5a464f6d3 100644 --- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc +++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc @@ -29,13 +29,13 @@ */ #include "gps_l1_ca_subframe_fsm.h" -#include +#include "gnss_satellite.h" #include #include #include #include #include -#include "gnss_satellite.h" +#include //************ GPS WORD TO SUBFRAME DECODER STATE MACHINE ********** diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h index 34e40043f..84a388eda 100644 --- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h +++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h @@ -32,14 +32,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_SUBFRAME_FSM_H_ #define GNSS_SDR_GPS_L1_CA_SUBFRAME_FSM_H_ -#include -#include "concurrent_queue.h" #include "GPS_L1_CA.h" #include "gps_navigation_message.h" #include "gps_ephemeris.h" #include "gps_iono.h" #include "gps_almanac.h" #include "gps_utc_model.h" +#include namespace sc = boost::statechart; namespace mpl = boost::mpl; diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc index 1fbcb558b..f7509b1dd 100644 --- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc +++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc @@ -30,7 +30,6 @@ */ #include "viterbi_decoder.h" -#include #include // logging 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 5f4248f96..838bd75a8 100755 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc @@ -35,10 +35,10 @@ */ #include "galileo_e1_dll_pll_veml_tracking.h" -#include -#include "Galileo_E1.h" #include "configuration_interface.h" +#include "Galileo_E1.h" #include "gnss_sdr_flags.h" +#include using google::LogMessage; 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 4b478f666..22c94322f 100755 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h @@ -37,10 +37,9 @@ #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_ #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_ - -#include #include "tracking_interface.h" #include "galileo_e1_dll_pll_veml_tracking_cc.h" +#include class ConfigurationInterface; 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 6ede1ca91..bdafc43a1 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc @@ -37,11 +37,10 @@ */ #include "galileo_e5a_dll_pll_tracking.h" -#include -#include "Galileo_E5a.h" #include "configuration_interface.h" +#include "Galileo_E5a.h" #include "gnss_sdr_flags.h" - +#include using google::LogMessage; 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 a49aab785..bedab2a21 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h @@ -39,10 +39,9 @@ #ifndef GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_ #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_ -#include #include "tracking_interface.h" #include "galileo_e5a_dll_pll_tracking_cc.h" - +#include class ConfigurationInterface; 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 5c76267ce..0d5a00433 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 @@ -38,10 +38,10 @@ */ #include "glonass_l1_ca_dll_pll_c_aid_tracking.h" -#include -#include "GLONASS_L1_CA.h" #include "configuration_interface.h" +#include "GLONASS_L1_CA.h" #include "gnss_sdr_flags.h" +#include using google::LogMessage; 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 b62729a5f..3d6f390e0 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 @@ -40,11 +40,10 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_H_ #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_H_ -#include #include "tracking_interface.h" #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h" #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h" - +#include class ConfigurationInterface; 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 6f824144d..7e2047862 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 @@ -37,10 +37,10 @@ */ #include "glonass_l1_ca_dll_pll_tracking.h" -#include -#include "GLONASS_L1_CA.h" #include "configuration_interface.h" +#include "GLONASS_L1_CA.h" #include "gnss_sdr_flags.h" +#include using google::LogMessage; 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 ba476948a..2268cfaae 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 @@ -39,10 +39,9 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_H_ #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_H_ -#include #include "tracking_interface.h" #include "glonass_l1_ca_dll_pll_tracking_cc.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc index ae01c924e..38144e43c 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc @@ -37,10 +37,10 @@ #include "gps_l1_ca_dll_pll_c_aid_tracking.h" -#include #include "GPS_L1_CA.h" #include "configuration_interface.h" #include "gnss_sdr_flags.h" +#include using google::LogMessage; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h index d3b01a87c..ac3a1e745 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h @@ -38,10 +38,10 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_ #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_ -#include #include "tracking_interface.h" #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h" #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h" +#include class ConfigurationInterface; 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 3c810ed3d..a9d4d2f3f 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 @@ -37,11 +37,10 @@ #include "gps_l1_ca_dll_pll_tracking.h" -#include -#include "GPS_L1_CA.h" #include "configuration_interface.h" +#include "GPS_L1_CA.h" #include "gnss_sdr_flags.h" - +#include using google::LogMessage; 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 495594a1f..c3be7a8d4 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 @@ -38,10 +38,9 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_ #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_ -#include #include "tracking_interface.h" #include "gps_l1_ca_dll_pll_tracking_cc.h" - +#include class ConfigurationInterface; 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 c3e84030a..70f6f9410 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 @@ -36,10 +36,10 @@ #include "gps_l2_m_dll_pll_tracking.h" -#include -#include "GPS_L2C.h" #include "configuration_interface.h" +#include "GPS_L2C.h" #include "gnss_sdr_flags.h" +#include using google::LogMessage; 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 80b214811..b065185ee 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 @@ -38,10 +38,9 @@ #ifndef GNSS_SDR_gps_l2_m_dll_pll_tracking_H_ #define GNSS_SDR_gps_l2_m_dll_pll_tracking_H_ -#include #include "tracking_interface.h" #include "gps_l2_m_dll_pll_tracking_cc.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc index 0869c39b7..bf379716d 100644 --- a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc @@ -36,10 +36,10 @@ #include "gps_l5i_dll_pll_tracking.h" -#include -#include "GPS_L5.h" #include "configuration_interface.h" +#include "GPS_L5.h" #include "gnss_sdr_flags.h" +#include using google::LogMessage; diff --git a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h index 681ddca42..b3be3cdbc 100644 --- a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h @@ -37,10 +37,9 @@ #ifndef GNSS_SDR_gps_l5i_dll_pll_tracking_H_ #define GNSS_SDR_gps_l5i_dll_pll_tracking_H_ -#include #include "tracking_interface.h" #include "gps_l5i_dll_pll_tracking_cc.h" - +#include class ConfigurationInterface; diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc index fd54e96b7..8359f0e77 100755 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc @@ -35,21 +35,21 @@ */ #include "galileo_e1_dll_pll_veml_tracking_cc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "galileo_e1_signal_processing.h" #include "tracking_discriminators.h" #include "lock_detectors.h" #include "Galileo_E1.h" #include "control_message_factory.h" #include "gnss_sdr_flags.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h index f02c51b8e..66be54e89 100755 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h @@ -32,14 +32,15 @@ #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include "cpu_multicorrelator_real_codes.h" +#include +#include +#include +#include + class galileo_e1_dll_pll_veml_tracking_cc; diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc index 08e33480c..c7f30d867 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc @@ -35,14 +35,6 @@ */ #include "galileo_e5a_dll_pll_tracking_cc.h" -#include -#include -#include -#include -#include -#include -#include -#include #include "galileo_e5_signal_processing.h" #include "tracking_discriminators.h" #include "lock_detectors.h" @@ -50,6 +42,14 @@ #include "Galileo_E1.h" #include "control_message_factory.h" #include "gnss_sdr_flags.h" +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h index 0894b79ef..2e1fcfed8 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h @@ -37,14 +37,14 @@ #ifndef GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_CC_H_ #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_CC_H_ -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include "cpu_multicorrelator.h" +#include +#include +#include +#include class Galileo_E5a_Dll_Pll_Tracking_cc; 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 4067f5cb6..8b8a707ea 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 @@ -37,10 +37,12 @@ */ #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h" -#include -#include -#include -#include +#include "glonass_l1_signal_processing.h" +#include "tracking_discriminators.h" +#include "lock_detectors.h" +#include "GLONASS_L1_CA.h" +#include "gnss_sdr_flags.h" +#include "control_message_factory.h" #include #include #include @@ -48,12 +50,10 @@ #include #include #include -#include "glonass_l1_signal_processing.h" -#include "tracking_discriminators.h" -#include "lock_detectors.h" -#include "GLONASS_L1_CA.h" -#include "gnss_sdr_flags.h" -#include "control_message_factory.h" +#include +#include +#include +#include using google::LogMessage; 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 d928beb29..50b936eff 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 @@ -39,17 +39,17 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H -#include -#include -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_FLL_PLL_filter.h" //#include "tracking_loop_filter.h" #include "cpu_multicorrelator.h" +#include +#include +#include +#include +#include +#include class glonass_l1_ca_dll_pll_c_aid_tracking_cc; 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 b379b0630..6d0534737 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 @@ -37,17 +37,6 @@ */ #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "gnss_synchro.h" #include "glonass_l1_signal_processing.h" #include "tracking_discriminators.h" @@ -55,6 +44,17 @@ #include "GLONASS_L1_CA.h" #include "gnss_sdr_flags.h" #include "control_message_factory.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; 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 e9424f9c7..8bc0a1c5e 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 @@ -39,18 +39,18 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H -#include -#include -#include -#include -#include -#include -#include #include "glonass_l1_signal_processing.h" #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_FLL_PLL_filter.h" #include "cpu_multicorrelator_16sc.h" +#include +#include +#include +#include +#include +#include +#include class glonass_l1_ca_dll_pll_c_aid_tracking_sc; 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 13d16ee46..0989d3e5c 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 @@ -37,21 +37,21 @@ */ #include "glonass_l1_ca_dll_pll_tracking_cc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "glonass_l1_signal_processing.h" #include "tracking_discriminators.h" #include "lock_detectors.h" #include "GLONASS_L1_CA.h" #include "gnss_sdr_flags.h" #include "control_message_factory.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; 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 641c6f04e..eeec2309c 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 @@ -39,14 +39,14 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_CC_H #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_CC_H -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include "cpu_multicorrelator.h" +#include +#include +#include +#include class Glonass_L1_Ca_Dll_Pll_Tracking_cc; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc index 97176b088..b895ee48f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -29,10 +29,12 @@ */ #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h" -#include -#include -#include -#include +#include "gps_sdr_signal_processing.h" +#include "tracking_discriminators.h" +#include "lock_detectors.h" +#include "gnss_sdr_flags.h" +#include "GPS_L1_CA.h" +#include "control_message_factory.h" #include #include #include @@ -40,12 +42,10 @@ #include #include #include -#include "gps_sdr_signal_processing.h" -#include "tracking_discriminators.h" -#include "lock_detectors.h" -#include "gnss_sdr_flags.h" -#include "GPS_L1_CA.h" -#include "control_message_factory.h" +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h index cf6f31b5f..5be897069 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -37,17 +37,17 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H -#include -#include -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_FLL_PLL_filter.h" //#include "tracking_loop_filter.h" #include "cpu_multicorrelator.h" +#include +#include +#include +#include +#include +#include class gps_l1_ca_dll_pll_c_aid_tracking_cc; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc index 1391d1c44..a8e0d0428 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc @@ -30,17 +30,6 @@ */ #include "gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "gnss_synchro.h" #include "gps_sdr_signal_processing.h" #include "tracking_discriminators.h" @@ -48,6 +37,17 @@ #include "GPS_L1_CA.h" #include "gnss_sdr_flags.h" #include "control_message_factory.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h index 9dded8939..d1a3db6d5 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h @@ -38,18 +38,18 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_FPGA_SC_H #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_FPGA_SC_H -#include -#include -#include -#include -#include -#include -#include #include "gps_sdr_signal_processing.h" #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_FLL_PLL_filter.h" #include "fpga_multicorrelator_8sc.h" +#include +#include +#include +#include +#include +#include +#include class gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc index cd2890bab..e2d57bbf6 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc @@ -29,17 +29,6 @@ */ #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "gnss_synchro.h" #include "gps_sdr_signal_processing.h" #include "tracking_discriminators.h" @@ -47,6 +36,17 @@ #include "GPS_L1_CA.h" #include "gnss_sdr_flags.h" #include "control_message_factory.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h index cd9753b6d..6a8a9bdf4 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h @@ -37,18 +37,18 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H -#include -#include -#include -#include -#include -#include -#include #include "gps_sdr_signal_processing.h" #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_FLL_PLL_filter.h" #include "cpu_multicorrelator_16sc.h" +#include +#include +#include +#include +#include +#include +#include class gps_l1_ca_dll_pll_c_aid_tracking_sc; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc index 7f29ff127..89f3ba0ec 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc @@ -35,21 +35,21 @@ */ #include "gps_l1_ca_dll_pll_tracking_cc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "gps_sdr_signal_processing.h" #include "tracking_discriminators.h" #include "lock_detectors.h" #include "gnss_sdr_flags.h" #include "GPS_L1_CA.h" #include "control_message_factory.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h index 346f7076a..8eca5317f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h @@ -38,14 +38,14 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include "cpu_multicorrelator_real_codes.h" +#include +#include +#include +#include class Gps_L1_Ca_Dll_Pll_Tracking_cc; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc index 0f55a12a3..9bd8d7967 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc @@ -35,21 +35,21 @@ */ #include "gps_l2_m_dll_pll_tracking_cc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "gps_l2c_signal.h" #include "tracking_discriminators.h" #include "lock_detectors.h" #include "GPS_L2C.h" #include "control_message_factory.h" #include "gnss_sdr_flags.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h index cf46636e2..3edd12ab4 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h @@ -36,14 +36,14 @@ #ifndef GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_CC_H #define GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_CC_H -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include "cpu_multicorrelator.h" +#include +#include +#include +#include class gps_l2_m_dll_pll_tracking_cc; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc index d91fe9cf4..b97cc804a 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc @@ -35,21 +35,22 @@ */ #include "gps_l5i_dll_pll_tracking_cc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "gps_l5_signal.h" #include "tracking_discriminators.h" #include "lock_detectors.h" #include "GPS_L5.h" #include "control_message_factory.h" #include "gnss_sdr_flags.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + using google::LogMessage; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h index 39da5fd1b..388d04c57 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h @@ -36,14 +36,14 @@ #ifndef GNSS_SDR_GPS_L5i_DLL_PLL_TRACKING_CC_H #define GNSS_SDR_GPS_L5i_DLL_PLL_TRACKING_CC_H -#include -#include -#include -#include #include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include "cpu_multicorrelator.h" +#include +#include +#include +#include class gps_l5i_dll_pll_tracking_cc; diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc index 3a76c8440..279dab5aa 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc @@ -33,9 +33,8 @@ */ #include "cpu_multicorrelator.h" -#include -#include #include +#include cpu_multicorrelator::cpu_multicorrelator() diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc index cc0df391c..42fa8f226 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc @@ -34,9 +34,9 @@ */ #include "cpu_multicorrelator_real_codes.h" -#include -#include #include +#include + cpu_multicorrelator_real_codes::cpu_multicorrelator_real_codes() diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h index dd7f1558e..35a5427cc 100644 --- a/src/core/interfaces/gnss_block_interface.h +++ b/src/core/interfaces/gnss_block_interface.h @@ -37,9 +37,10 @@ #ifndef GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ #define GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ +#include #include #include -#include + /*! * \brief This abstract class represents an interface to GNSS blocks. diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc index e5c7e6645..001a249ed 100644 --- a/src/core/libs/INIReader.cc +++ b/src/core/libs/INIReader.cc @@ -46,9 +46,9 @@ */ #include "INIReader.h" +#include "ini.h" #include // for tolower #include // for strol -#include "ini.h" INIReader::INIReader(std::string filename) diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h index b1b089174..e81b08787 100644 --- a/src/core/libs/gnss_sdr_supl_client.h +++ b/src/core/libs/gnss_sdr_supl_client.h @@ -34,14 +34,6 @@ #ifndef GNSS_SDR_SUPL_CLIENT_H_ #define GNSS_SDR_SUPL_CLIENT_H_ -#include -#include -#include -#include -#include -#include -#include -#include extern "C" { #include "supl.h" } @@ -53,6 +45,13 @@ extern "C" { #include "gps_acq_assist.h" #include "gps_ref_time.h" #include "gps_ref_location.h" +#include +#include +#include +#include +#include +#include +#include /*! * \brief class that implements a C++ interface to external Secure User Location Protocol (SUPL) client library.. diff --git a/src/core/libs/string_converter.cc b/src/core/libs/string_converter.cc index a43f73e63..1b6e38489 100644 --- a/src/core/libs/string_converter.cc +++ b/src/core/libs/string_converter.cc @@ -32,7 +32,7 @@ #include "string_converter.h" #include -#include + StringConverter::StringConverter() {} diff --git a/src/core/libs/supl/supl.c b/src/core/libs/supl/supl.c index 6a06bb252..021b65327 100644 --- a/src/core/libs/supl/supl.c +++ b/src/core/libs/supl/supl.c @@ -221,7 +221,7 @@ int EXPORT supl_server_connect(supl_ctx_t *ctx, char *server) { SSLeay_add_ssl_algorithms(); // meth = TLSv1_client_method(); - meth = SSLv23_client_method(); + meth = (SSL_METHOD*)SSLv23_client_method(); SSL_load_error_strings(); ctx->ssl_ctx = SSL_CTX_new(meth); if (!ctx->ssl_ctx) return E_SUPL_CONNECT; diff --git a/src/core/receiver/concurrent_map.h b/src/core/receiver/concurrent_map.h index fff578c1e..27ead329d 100644 --- a/src/core/receiver/concurrent_map.h +++ b/src/core/receiver/concurrent_map.h @@ -31,9 +31,10 @@ #ifndef GNSS_SDR_CONCURRENT_MAP_H #define GNSS_SDR_CONCURRENT_MAP_H +#include #include #include -#include + template diff --git a/src/core/receiver/concurrent_queue.h b/src/core/receiver/concurrent_queue.h index 8c700e220..d279c5ad0 100644 --- a/src/core/receiver/concurrent_queue.h +++ b/src/core/receiver/concurrent_queue.h @@ -31,8 +31,8 @@ #ifndef GNSS_SDR_CONCURRENT_QUEUE_H #define GNSS_SDR_CONCURRENT_QUEUE_H -#include #include +#include template diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h index 9bdd49d32..a7bba38d2 100644 --- a/src/core/receiver/control_message_factory.h +++ b/src/core/receiver/control_message_factory.h @@ -31,9 +31,9 @@ #ifndef GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_ #define GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_ +#include #include #include -#include //! Message described by who sent it and what it says typedef struct ControlMessage_ diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 72b91e956..073807b43 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -33,33 +33,33 @@ */ #include "control_thread.h" +#include "concurrent_queue.h" +#include "concurrent_map.h" +#include "control_message_factory.h" +#include "file_configuration.h" +#include "gnss_flowgraph.h" +#include "gnss_sdr_flags.h" +#include "galileo_ephemeris.h" +#include "galileo_iono.h" +#include "galileo_utc_model.h" +#include "galileo_almanac.h" +#include "gps_ephemeris.h" +#include "gps_iono.h" +#include "gps_utc_model.h" +#include "gps_almanac.h" +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "gps_ephemeris.h" -#include "gps_iono.h" -#include "gps_utc_model.h" -#include "gps_almanac.h" -#include "galileo_ephemeris.h" -#include "galileo_iono.h" -#include "galileo_utc_model.h" -#include "galileo_almanac.h" -#include "concurrent_queue.h" -#include "concurrent_map.h" -#include "gnss_flowgraph.h" -#include "gnss_sdr_flags.h" -#include "file_configuration.h" -#include "control_message_factory.h" + extern concurrent_map global_gps_acq_assist_map; extern concurrent_queue global_gps_acq_assist_queue; diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h index ea0decec8..f84b2f24d 100644 --- a/src/core/receiver/control_thread.h +++ b/src/core/receiver/control_thread.h @@ -35,12 +35,12 @@ #ifndef GNSS_SDR_CONTROL_THREAD_H_ #define GNSS_SDR_CONTROL_THREAD_H_ -#include -#include -#include -#include #include "control_message_factory.h" #include "gnss_sdr_supl_client.h" +#include +#include +#include +#include class GNSSFlowgraph; class ConfigurationInterface; diff --git a/src/core/receiver/file_configuration.cc b/src/core/receiver/file_configuration.cc index 4285d04f1..1e52e819f 100644 --- a/src/core/receiver/file_configuration.cc +++ b/src/core/receiver/file_configuration.cc @@ -34,11 +34,12 @@ */ #include "file_configuration.h" -#include -#include +#include "in_memory_configuration.h" #include "INIReader.h" #include "string_converter.h" -#include "in_memory_configuration.h" +#include +#include + using google::LogMessage; diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index cf1ba3995..ec83dabdf 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -35,11 +35,6 @@ #include "gnss_block_factory.h" -#include -#include -#include -#include -#include #include "configuration_interface.h" #include "in_memory_configuration.h" #include "gnss_block_interface.h" @@ -145,6 +140,12 @@ #include "gps_l1_ca_dll_pll_tracking_gpu.h" #endif +#include +#include +#include +#include +#include + using google::LogMessage; diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index 4aa852d74..be57433d1 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -37,10 +37,11 @@ #ifndef GNSS_SDR_BLOCK_FACTORY_H_ #define GNSS_SDR_BLOCK_FACTORY_H_ +#include #include #include #include -#include + class ConfigurationInterface; class GNSSBlockInterface; diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index a8be2a89f..25881a7ff 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -33,17 +33,17 @@ */ #include "gnss_flowgraph.h" -#include -#include -#include -#include -#include -#include -#include #include "configuration_interface.h" #include "gnss_block_interface.h" #include "channel_interface.h" #include "gnss_block_factory.h" +#include +#include +#include +#include +#include +#include +#include #define GNSS_SDR_ARRAY_SIGNAL_CONDITIONER_CHANNELS 8 diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h index abb4a6ef5..e3986fd6c 100644 --- a/src/core/receiver/gnss_flowgraph.h +++ b/src/core/receiver/gnss_flowgraph.h @@ -36,16 +36,17 @@ #ifndef GNSS_SDR_GNSS_FLOWGRAPH_H_ #define GNSS_SDR_GNSS_FLOWGRAPH_H_ +#include "GPS_L1_CA.h" +#include "gnss_signal.h" +#include "gnss_sdr_sample_counter.h" +#include +#include #include #include #include #include #include -#include -#include -#include "GPS_L1_CA.h" -#include "gnss_signal.h" -#include "gnss_sdr_sample_counter.h" + class GNSSBlockInterface; class ChannelInterface; diff --git a/src/core/receiver/in_memory_configuration.cc b/src/core/receiver/in_memory_configuration.cc index e1983e617..377d30174 100644 --- a/src/core/receiver/in_memory_configuration.cc +++ b/src/core/receiver/in_memory_configuration.cc @@ -31,9 +31,10 @@ #include "in_memory_configuration.h" +#include "string_converter.h" #include #include -#include "string_converter.h" + InMemoryConfiguration::InMemoryConfiguration() { diff --git a/src/core/receiver/in_memory_configuration.h b/src/core/receiver/in_memory_configuration.h index 22ff97ffe..de6e1913a 100644 --- a/src/core/receiver/in_memory_configuration.h +++ b/src/core/receiver/in_memory_configuration.h @@ -36,10 +36,11 @@ #ifndef GNSS_SDR_IN_MEMORY_CONFIGURATION_H_ #define GNSS_SDR_IN_MEMORY_CONFIGURATION_H_ +#include "configuration_interface.h" #include #include #include -#include "configuration_interface.h" + class StringConverter; diff --git a/src/core/system_parameters/GLONASS_L1_CA.h b/src/core/system_parameters/GLONASS_L1_CA.h index af0bd0227..e2558e114 100644 --- a/src/core/system_parameters/GLONASS_L1_CA.h +++ b/src/core/system_parameters/GLONASS_L1_CA.h @@ -32,11 +32,12 @@ #ifndef GNSS_SDR_GLONASS_L1_CA_H_ #define GNSS_SDR_GLONASS_L1_CA_H_ +#include "gnss_frequencies.h" +#include "MATH_CONSTANTS.h" #include #include #include // std::pair -#include "MATH_CONSTANTS.h" -#include "gnss_frequencies.h" + // Physical constants const double GLONASS_C_m_s = SPEED_OF_LIGHT; //!< The speed of light, [m/s] diff --git a/src/core/system_parameters/GPS_CNAV.h b/src/core/system_parameters/GPS_CNAV.h index d3f953f2b..fc2239ab6 100644 --- a/src/core/system_parameters/GPS_CNAV.h +++ b/src/core/system_parameters/GPS_CNAV.h @@ -32,10 +32,11 @@ #ifndef GNSS_SDR_GPS_CNAV_H_ #define GNSS_SDR_GPS_CNAV_H_ +#include "MATH_CONSTANTS.h" #include #include #include // std::pair -#include "MATH_CONSTANTS.h" + // CNAV GPS NAVIGATION MESSAGE STRUCTURE // NAVIGATION MESSAGE FIELDS POSITIONS (from IS-GPS-200E Appendix III) diff --git a/src/core/system_parameters/GPS_L1_CA.h b/src/core/system_parameters/GPS_L1_CA.h index 58249a60c..0c3746387 100644 --- a/src/core/system_parameters/GPS_L1_CA.h +++ b/src/core/system_parameters/GPS_L1_CA.h @@ -32,10 +32,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_H_ #define GNSS_SDR_GPS_L1_CA_H_ +#include "gnss_frequencies.h" +#include "MATH_CONSTANTS.h" #include #include // std::pair -#include "MATH_CONSTANTS.h" -#include "gnss_frequencies.h" + // Physical constants const double GPS_C_m_s = SPEED_OF_LIGHT; //!< The speed of light, [m/s] diff --git a/src/core/system_parameters/GPS_L2C.h b/src/core/system_parameters/GPS_L2C.h index 3e269ecf5..625aafe01 100644 --- a/src/core/system_parameters/GPS_L2C.h +++ b/src/core/system_parameters/GPS_L2C.h @@ -32,15 +32,13 @@ #ifndef GNSS_SDR_GPS_L2C_H_ #define GNSS_SDR_GPS_L2C_H_ + +#include "gnss_frequencies.h" +#include "GPS_CNAV.h" +#include "MATH_CONSTANTS.h" #include #include #include // std::pair -#include "MATH_CONSTANTS.h" -#include "gnss_frequencies.h" -#include "GPS_CNAV.h" - - - // Physical constants diff --git a/src/core/system_parameters/GPS_L5.h b/src/core/system_parameters/GPS_L5.h index 702e3ebd6..9c3236124 100644 --- a/src/core/system_parameters/GPS_L5.h +++ b/src/core/system_parameters/GPS_L5.h @@ -32,10 +32,10 @@ #ifndef GNSS_SDR_GPS_L5_H_ #define GNSS_SDR_GPS_L5_H_ -#include -#include "MATH_CONSTANTS.h" #include "gnss_frequencies.h" #include "GPS_CNAV.h" +#include "MATH_CONSTANTS.h" +#include // Physical constants diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h index 24794a244..33ace50ae 100644 --- a/src/core/system_parameters/Galileo_E1.h +++ b/src/core/system_parameters/Galileo_E1.h @@ -33,11 +33,11 @@ #ifndef GNSS_SDR_GALILEO_E1_H_ #define GNSS_SDR_GALILEO_E1_H_ +#include "gnss_frequencies.h" +#include "MATH_CONSTANTS.h" #include #include #include // std::pair -#include "MATH_CONSTANTS.h" -#include "gnss_frequencies.h" // Physical constants @@ -65,7 +65,7 @@ const double GALILEO_STARTOFFSET_ms = 68.802; //[ms] Initial sign. travel time ( // OBSERVABLE HISTORY DEEP FOR INTERPOLATION -const int GALILEO_E1_HISTORY_DEEP=100; +const int GALILEO_E1_HISTORY_DEEP = 100; // Galileo INAV Telemetry structure diff --git a/src/core/system_parameters/Galileo_E5a.h b/src/core/system_parameters/Galileo_E5a.h index 2a2f5a816..cedd414fb 100644 --- a/src/core/system_parameters/Galileo_E5a.h +++ b/src/core/system_parameters/Galileo_E5a.h @@ -31,11 +31,11 @@ #ifndef GNSS_SDR_GALILEO_E5A_H_ #define GNSS_SDR_GALILEO_E5A_H_ +#include "gnss_frequencies.h" +#include "MATH_CONSTANTS.h" #include #include #include // std::pair -#include "MATH_CONSTANTS.h" -#include "gnss_frequencies.h" // Carrier and code frequencies diff --git a/src/core/system_parameters/galileo_ephemeris.cc b/src/core/system_parameters/galileo_ephemeris.cc index d118bd392..9403e7968 100644 --- a/src/core/system_parameters/galileo_ephemeris.cc +++ b/src/core/system_parameters/galileo_ephemeris.cc @@ -29,8 +29,8 @@ */ #include "galileo_ephemeris.h" -#include #include "Galileo_E1.h" +#include Galileo_Ephemeris::Galileo_Ephemeris() diff --git a/src/core/system_parameters/galileo_fnav_message.h b/src/core/system_parameters/galileo_fnav_message.h index 3f3ba1048..2684782c4 100644 --- a/src/core/system_parameters/galileo_fnav_message.h +++ b/src/core/system_parameters/galileo_fnav_message.h @@ -38,16 +38,16 @@ #define GNSS_SDR_GALILEO_FNAV_MESSAGE_H_ -#include -#include -#include -#include -#include // for boost::uint16_t #include "galileo_ephemeris.h" #include "galileo_iono.h" #include "galileo_almanac.h" #include "galileo_utc_model.h" #include "Galileo_E5a.h" +#include // for boost::uint16_t +#include +#include +#include +#include /*! * \brief This class handles the Galileo F/NAV Data message, as described in the diff --git a/src/core/system_parameters/galileo_navigation_message.h b/src/core/system_parameters/galileo_navigation_message.h index e83b67cf3..d78a37d31 100644 --- a/src/core/system_parameters/galileo_navigation_message.h +++ b/src/core/system_parameters/galileo_navigation_message.h @@ -33,17 +33,18 @@ #ifndef GNSS_SDR_GALILEO_NAVIGATION_MESSAGE_H_ #define GNSS_SDR_GALILEO_NAVIGATION_MESSAGE_H_ -#include -#include -#include -#include -#include -#include // for boost::uint32_t #include "galileo_ephemeris.h" #include "galileo_iono.h" #include "galileo_almanac.h" #include "galileo_utc_model.h" #include "Galileo_E1.h" +#include // for boost::uint32_t +#include +#include +#include +#include +#include + /*! * \brief This class handles the Galileo I/NAV Data message, as described in the diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.cc b/src/core/system_parameters/glonass_gnav_ephemeris.cc index e899db773..8986cf52e 100644 --- a/src/core/system_parameters/glonass_gnav_ephemeris.cc +++ b/src/core/system_parameters/glonass_gnav_ephemeris.cc @@ -31,9 +31,9 @@ */ #include "glonass_gnav_ephemeris.h" -#include #include "GLONASS_L1_CA.h" #include "gnss_satellite.h" +#include Glonass_Gnav_Ephemeris::Glonass_Gnav_Ephemeris() { diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc index 40301ea09..ef58d7f3a 100644 --- a/src/core/system_parameters/glonass_gnav_navigation_message.cc +++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc @@ -31,7 +31,7 @@ */ #include "glonass_gnav_navigation_message.h" -#include +#include "gnss_satellite.h" #include diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.h b/src/core/system_parameters/glonass_gnav_navigation_message.h index 6aef9ad51..dda433983 100644 --- a/src/core/system_parameters/glonass_gnav_navigation_message.h +++ b/src/core/system_parameters/glonass_gnav_navigation_message.h @@ -35,12 +35,11 @@ #define GNSS_SDR_GLONASS_GNAV_NAVIGATION_MESSAGE_H_ -#include #include "GLONASS_L1_CA.h" #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_almanac.h" #include "glonass_gnav_utc_model.h" - +#include /*! diff --git a/src/core/system_parameters/glonass_gnav_utc_model.cc b/src/core/system_parameters/glonass_gnav_utc_model.cc index ec9d5e20e..2dc7fd2b9 100644 --- a/src/core/system_parameters/glonass_gnav_utc_model.cc +++ b/src/core/system_parameters/glonass_gnav_utc_model.cc @@ -31,7 +31,6 @@ */ #include "glonass_gnav_utc_model.h" -#include Glonass_Gnav_Utc_Model::Glonass_Gnav_Utc_Model() { @@ -44,6 +43,7 @@ Glonass_Gnav_Utc_Model::Glonass_Gnav_Utc_Model() d_B2 = 0.0; } + double Glonass_Gnav_Utc_Model::utc_time(double glonass_time_corrected) { double t_utc; diff --git a/src/core/system_parameters/glonass_gnav_utc_model.h b/src/core/system_parameters/glonass_gnav_utc_model.h index 9e84762d6..9712299a9 100644 --- a/src/core/system_parameters/glonass_gnav_utc_model.h +++ b/src/core/system_parameters/glonass_gnav_utc_model.h @@ -34,9 +34,8 @@ #ifndef GNSS_SDR_GLONASS_GNAV_UTC_MODEL_H_ #define GNSS_SDR_GLONASS_GNAV_UTC_MODEL_H_ -#include "boost/assign.hpp" +#include #include -#include /*! * \brief This class is a storage for the GLONASS GNAV UTC MODEL data as described in GLONASS ICD (Edition 5.1) diff --git a/src/core/system_parameters/gnss_satellite.cc b/src/core/system_parameters/gnss_satellite.cc index 9970455be..629dcb878 100644 --- a/src/core/system_parameters/gnss_satellite.cc +++ b/src/core/system_parameters/gnss_satellite.cc @@ -39,8 +39,6 @@ Gnss_Satellite::Gnss_Satellite() } - - Gnss_Satellite::Gnss_Satellite(const std::string& system_, unsigned int PRN_) { Gnss_Satellite::reset(); @@ -50,15 +48,10 @@ Gnss_Satellite::Gnss_Satellite(const std::string& system_, unsigned int PRN_) } - - Gnss_Satellite::~Gnss_Satellite() {} - - - void Gnss_Satellite::reset() { system_set = {"GPS", "Glonass", "SBAS", "Galileo", "Beidou"}; @@ -74,7 +67,6 @@ void Gnss_Satellite::reset() } - std::ostream& operator<<(std::ostream &out, const Gnss_Satellite &sat) // output { std::string tag(""); @@ -138,23 +130,23 @@ void Gnss_Satellite::set_system(const std::string& system_) void Gnss_Satellite::update_PRN(unsigned int PRN_) { if (system.compare("Glonass") != 0) - { - DLOG(INFO) << "Trying to update PRN for not GLONASS system"; - PRN = 0; - } + { + DLOG(INFO) << "Trying to update PRN for not GLONASS system"; + PRN = 0; + } else - { - if (PRN_ < 1 or PRN_ > 24) - { - DLOG(INFO) << "This PRN is not defined"; - // Adjusting for PRN 26, now used in - PRN = PRN_; - } - else - { - PRN = PRN_; - } - } + { + if (PRN_ < 1 or PRN_ > 24) + { + DLOG(INFO) << "This PRN is not defined"; + // Adjusting for PRN 26, now used in + PRN = PRN_; + } + else + { + PRN = PRN_; + } + } } @@ -179,17 +171,17 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_) } } else if (system.compare("Glonass") == 0) - { - if (PRN_ < 1 or PRN_ > 24) - { - DLOG(INFO) << "This PRN is not defined"; - PRN = 0; - } - else - { - PRN = PRN_; - } - } + { + if (PRN_ < 1 or PRN_ > 24) + { + DLOG(INFO) << "This PRN is not defined"; + PRN = 0; + } + else + { + PRN = PRN_; + } + } else if (system.compare("SBAS") == 0) { if (PRN_ == 122){ PRN = PRN_; } // WAAS Inmarsat 3F4 (AOR-W) @@ -205,15 +197,15 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_) } else if (system.compare("Galileo") == 0) { - if (PRN_ < 1 or PRN_ > 36) - { - DLOG(INFO) << "This PRN is not defined"; - PRN = 0; - } - else - { - PRN = PRN_; - } + if (PRN_ < 1 or PRN_ > 36) + { + DLOG(INFO) << "This PRN is not defined"; + PRN = 0; + } + else + { + PRN = PRN_; + } } else { @@ -241,10 +233,6 @@ unsigned int Gnss_Satellite::get_PRN() const } - - - - std::string Gnss_Satellite::get_system() const { // Get the satellite system {"GPS", "Glonass", "SBAS", "Galileo", "Beidou"} @@ -253,6 +241,7 @@ std::string Gnss_Satellite::get_system() const return system_; } + std::string Gnss_Satellite::get_system_short() const { // Get the satellite system {"G", "R", "S", "E", "C"} @@ -260,8 +249,6 @@ std::string Gnss_Satellite::get_system_short() const } - - std::string Gnss_Satellite::get_block() const { // Get the satellite block @@ -271,16 +258,14 @@ std::string Gnss_Satellite::get_block() const } - std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int PRN_) { std::string block_ = "Unknown"; if (system_.compare("GPS") == 0) { + // info from https://www.navcen.uscg.gov/?Do=constellationStatus switch ( PRN_ ) { - // info from https://www.navcen.uscg.gov/?Do=constellationStatus - case 1 : block_ = std::string("IIF"); // Plane D break; @@ -382,14 +367,12 @@ std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int } } - if (system_.compare("Glonass") == 0) { - switch ( PRN_ ) - { // Info from http://www.sdcm.ru/smglo/grupglo?version=eng&site=extern // See also http://www.glonass-center.ru/en/GLONASS/ - + switch ( PRN_ ) + { case 1 : block_ = std::string("1"); // Plane 1 rf_link = 1; diff --git a/src/core/system_parameters/gnss_satellite.h b/src/core/system_parameters/gnss_satellite.h index 75ea70ac1..395303479 100644 --- a/src/core/system_parameters/gnss_satellite.h +++ b/src/core/system_parameters/gnss_satellite.h @@ -34,7 +34,6 @@ #include #include -#include #include diff --git a/src/core/system_parameters/gps_cnav_ephemeris.cc b/src/core/system_parameters/gps_cnav_ephemeris.cc index f46cfc310..852462c68 100644 --- a/src/core/system_parameters/gps_cnav_ephemeris.cc +++ b/src/core/system_parameters/gps_cnav_ephemeris.cc @@ -32,7 +32,6 @@ #include "gps_cnav_ephemeris.h" #include -#include Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris() { @@ -120,8 +119,8 @@ double Gps_CNAV_Ephemeris::sv_clock_drift(double transmitTime) dt = check_t(transmitTime - d_Toc); d_satClkDrift = d_A_f0 + d_A_f1 * dt + d_A_f2 * (dt * dt) + sv_clock_relativistic_term(transmitTime); - //Correct satellite group delay - d_satClkDrift-=d_TGD; + // Correct satellite group delay + d_satClkDrift -= d_TGD; return d_satClkDrift; } @@ -201,7 +200,6 @@ double Gps_CNAV_Ephemeris::satellitePosition(double transmitTime) const double A_REF = 26559710.0; // See IS-GPS-200H, pp. 170 double d_sqrt_A = sqrt(A_REF + d_DELTA_A); - const double GM = 3.986005e14; //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2] const double OMEGA_DOT_REF = -2.6e-9; // semicircles / s, see IS-GPS-200H pp. 164 const double OMEGA_EARTH_DOT = 7.2921151467e-5; //!< Earth rotation rate, [rad/s] @@ -218,7 +216,7 @@ double Gps_CNAV_Ephemeris::satellitePosition(double transmitTime) // Mean motion difference from computed value - double delta_n_a=d_Delta_n+0.5*d_DELTA_DOT_N*tk; + double delta_n_a = d_Delta_n + 0.5 * d_DELTA_DOT_N * tk; // Corrected mean motion n = n0 + delta_n_a; diff --git a/src/core/system_parameters/gps_cnav_ephemeris.h b/src/core/system_parameters/gps_cnav_ephemeris.h index b8f304951..a5678d7cd 100644 --- a/src/core/system_parameters/gps_cnav_ephemeris.h +++ b/src/core/system_parameters/gps_cnav_ephemeris.h @@ -33,7 +33,7 @@ #define GNSS_SDR_GPS_CNAV_EPHEMERIS_H_ #include "GPS_CNAV.h" -#include "boost/assign.hpp" +#include #include diff --git a/src/core/system_parameters/gps_cnav_iono.h b/src/core/system_parameters/gps_cnav_iono.h index 426f199cb..6f7332c0b 100644 --- a/src/core/system_parameters/gps_cnav_iono.h +++ b/src/core/system_parameters/gps_cnav_iono.h @@ -33,7 +33,7 @@ #define GNSS_SDR_GPS_CNAV_IONO_H_ -#include "boost/assign.hpp" +#include #include diff --git a/src/core/system_parameters/gps_cnav_navigation_message.cc b/src/core/system_parameters/gps_cnav_navigation_message.cc index a78ade0c7..1bdc48360 100644 --- a/src/core/system_parameters/gps_cnav_navigation_message.cc +++ b/src/core/system_parameters/gps_cnav_navigation_message.cc @@ -31,7 +31,6 @@ */ #include "gps_cnav_navigation_message.h" -#include #include "gnss_satellite.h" diff --git a/src/core/system_parameters/gps_cnav_navigation_message.h b/src/core/system_parameters/gps_cnav_navigation_message.h index 3fd1fa913..8439f61a2 100644 --- a/src/core/system_parameters/gps_cnav_navigation_message.h +++ b/src/core/system_parameters/gps_cnav_navigation_message.h @@ -33,15 +33,16 @@ #define GNSS_SDR_GPS_CNAV_NAVIGATION_MESSAGE_H_ +#include "GPS_CNAV.h" +#include "gps_cnav_ephemeris.h" +#include "gps_cnav_iono.h" +#include "gps_cnav_utc_model.h" #include #include #include #include #include -#include "GPS_CNAV.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" -#include "gps_cnav_utc_model.h" + //TODO: Create GPS CNAV almanac //#include "gps_almanac.h" diff --git a/src/core/system_parameters/gps_cnav_utc_model.cc b/src/core/system_parameters/gps_cnav_utc_model.cc index e4380ba9d..9159935f3 100644 --- a/src/core/system_parameters/gps_cnav_utc_model.cc +++ b/src/core/system_parameters/gps_cnav_utc_model.cc @@ -49,13 +49,8 @@ double Gps_CNAV_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week) { double t_utc; double t_utc_daytime; - double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast(i_GPS_week - i_WN_T)); + double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast(i_GPS_week - i_WN_T)); - //std::cout<<"d_DeltaT_LS="<(i_GPS_week - i_WN_T)); + /* FOR CNAV: Replace the 20.3.3.5.2.4c with 30.3.3.6.2 UTC and GPS Time as follows */ + double tmp_d = (gpstime_corrected - d_t_OT + 604800 * static_cast(i_GPS_week - i_WN_T)); Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * tmp_d + d_A2*tmp_d*tmp_d; t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); } diff --git a/src/core/system_parameters/gps_cnav_utc_model.h b/src/core/system_parameters/gps_cnav_utc_model.h index b595a4439..62e6fd0c0 100644 --- a/src/core/system_parameters/gps_cnav_utc_model.h +++ b/src/core/system_parameters/gps_cnav_utc_model.h @@ -32,9 +32,9 @@ #ifndef GNSS_SDR_GPS_CNAV_UTC_MODEL_H_ #define GNSS_SDR_GPS_CNAV_UTC_MODEL_H_ -#include "boost/assign.hpp" +#include #include -#include + /*! * \brief This class is a storage for the GPS UTC MODEL data as described in in IS-GPS-200H diff --git a/src/core/system_parameters/gps_ephemeris.cc b/src/core/system_parameters/gps_ephemeris.cc index ac09ef955..d876f477e 100644 --- a/src/core/system_parameters/gps_ephemeris.cc +++ b/src/core/system_parameters/gps_ephemeris.cc @@ -31,9 +31,9 @@ */ #include "gps_ephemeris.h" -#include -#include "GPS_L1_CA.h" #include "gnss_satellite.h" +#include "GPS_L1_CA.h" +#include Gps_Ephemeris::Gps_Ephemeris() { diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h index a08f34400..eec5779ce 100644 --- a/src/core/system_parameters/gps_ephemeris.h +++ b/src/core/system_parameters/gps_ephemeris.h @@ -33,12 +33,11 @@ #define GNSS_SDR_GPS_EPHEMERIS_H_ -#include -#include -#include "boost/assign.hpp" +#include #include #include - +#include +#include /*! diff --git a/src/core/system_parameters/gps_iono.h b/src/core/system_parameters/gps_iono.h index a7e59c02b..d13120617 100644 --- a/src/core/system_parameters/gps_iono.h +++ b/src/core/system_parameters/gps_iono.h @@ -33,7 +33,7 @@ #define GNSS_SDR_GPS_IONO_H_ -#include "boost/assign.hpp" +#include #include diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc index 7a13109c1..27a4e26c7 100644 --- a/src/core/system_parameters/gps_navigation_message.cc +++ b/src/core/system_parameters/gps_navigation_message.cc @@ -31,9 +31,9 @@ m * \file gps_navigation_message.cc */ #include "gps_navigation_message.h" +#include "gnss_satellite.h" #include #include -#include void Gps_Navigation_Message::reset() diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h index 53482c905..3f9e2866f 100644 --- a/src/core/system_parameters/gps_navigation_message.h +++ b/src/core/system_parameters/gps_navigation_message.h @@ -33,17 +33,16 @@ #define GNSS_SDR_GPS_NAVIGATION_MESSAGE_H_ -#include -#include -#include -#include -#include #include "GPS_L1_CA.h" #include "gps_ephemeris.h" #include "gps_iono.h" #include "gps_almanac.h" #include "gps_utc_model.h" - +#include +#include +#include +#include +#include /*! diff --git a/src/core/system_parameters/gps_ref_location.h b/src/core/system_parameters/gps_ref_location.h index 1aa734088..9491ccbf9 100644 --- a/src/core/system_parameters/gps_ref_location.h +++ b/src/core/system_parameters/gps_ref_location.h @@ -32,7 +32,7 @@ #ifndef GNSS_SDR_GPS_REF_LOCATION_H_ #define GNSS_SDR_GPS_REF_LOCATION_H_ -#include "boost/assign.hpp" +#include #include diff --git a/src/core/system_parameters/gps_ref_time.h b/src/core/system_parameters/gps_ref_time.h index fbb246ad3..b65a18edd 100644 --- a/src/core/system_parameters/gps_ref_time.h +++ b/src/core/system_parameters/gps_ref_time.h @@ -32,7 +32,7 @@ #ifndef GNSS_SDR_GPS_REF_TIME_H_ #define GNSS_SDR_GPS_REF_TIME_H_ -#include "boost/assign.hpp" +#include #include diff --git a/src/core/system_parameters/gps_utc_model.cc b/src/core/system_parameters/gps_utc_model.cc index 59a385c1a..f52428bf4 100644 --- a/src/core/system_parameters/gps_utc_model.cc +++ b/src/core/system_parameters/gps_utc_model.cc @@ -29,9 +29,9 @@ */ #include "gps_utc_model.h" -#include #include + Gps_Utc_Model::Gps_Utc_Model() { valid = false; @@ -51,11 +51,6 @@ double Gps_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week) double t_utc_daytime; double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast(i_GPS_week - i_WN_T)); - //std::cout<<"d_DeltaT_LS="<(i_GPS_week - i_WN_T)); t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); diff --git a/src/core/system_parameters/gps_utc_model.h b/src/core/system_parameters/gps_utc_model.h index 0d1c48285..1a8938828 100644 --- a/src/core/system_parameters/gps_utc_model.h +++ b/src/core/system_parameters/gps_utc_model.h @@ -32,7 +32,7 @@ #ifndef GNSS_SDR_GPS_UTC_MODEL_H_ #define GNSS_SDR_GPS_UTC_MODEL_H_ -#include "boost/assign.hpp" +#include #include diff --git a/src/core/system_parameters/rtcm.cc b/src/core/system_parameters/rtcm.cc index 32c8fec5b..f87223ae3 100644 --- a/src/core/system_parameters/rtcm.cc +++ b/src/core/system_parameters/rtcm.cc @@ -29,19 +29,19 @@ */ #include "rtcm.h" +#include "Galileo_E1.h" +#include "GPS_L2C.h" +#include // for to_upper_copy +#include +#include +#include +#include #include // for std::reverse #include // std::chrono::seconds #include // for std::fmod #include // for strtol #include // for std::stringstream #include -#include // for to_upper_copy -#include -#include -#include -#include -#include "Galileo_E1.h" -#include "GPS_L2C.h" using google::LogMessage; diff --git a/src/core/system_parameters/rtcm.h b/src/core/system_parameters/rtcm.h index f19b71add..6ec935228 100644 --- a/src/core/system_parameters/rtcm.h +++ b/src/core/system_parameters/rtcm.h @@ -33,6 +33,14 @@ #define GNSS_SDR_RTCM_H_ +#include "concurrent_queue.h" +#include "gnss_synchro.h" +#include "galileo_fnav_message.h" +#include "gps_navigation_message.h" +#include "gps_cnav_navigation_message.h" +#include "glonass_gnav_navigation_message.h" +#include +#include #include #include #include @@ -42,14 +50,6 @@ #include #include #include -#include -#include -#include "concurrent_queue.h" -#include "gnss_synchro.h" -#include "galileo_fnav_message.h" -#include "gps_navigation_message.h" -#include "gps_cnav_navigation_message.h" -#include "glonass_gnav_navigation_message.h" /*! diff --git a/src/core/system_parameters/sbas_ephemeris.cc b/src/core/system_parameters/sbas_ephemeris.cc index 3e3dea64e..b093ea3c7 100644 --- a/src/core/system_parameters/sbas_ephemeris.cc +++ b/src/core/system_parameters/sbas_ephemeris.cc @@ -30,7 +30,6 @@ */ -#include #include "sbas_ephemeris.h" void Sbas_Ephemeris::print(std::ostream &out) diff --git a/src/core/system_parameters/sbas_ephemeris.h b/src/core/system_parameters/sbas_ephemeris.h index a0e9e91c7..62c63b38e 100644 --- a/src/core/system_parameters/sbas_ephemeris.h +++ b/src/core/system_parameters/sbas_ephemeris.h @@ -32,6 +32,8 @@ #ifndef GNSS_SDR_SBAS_EPHEMERIS_H_ #define GNSS_SDR_SBAS_EPHEMERIS_H_ +#include + /*! * \brief This class stores SBAS SV ephemeris data * diff --git a/src/main/main.cc b/src/main/main.cc index ef2a0effb..89634a6ec 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -39,18 +39,20 @@ #define GOOGLE_STRIP_LOG 0 #endif +#include "concurrent_map.h" +#include "concurrent_queue.h" +#include "control_thread.h" +#include "gnss_sdr_flags.h" +#include +#include +#include // for create_directories, exists +#include // for path, operator<< +#include // for filesystem +#include #include #include #include -#include -#include -#include -#include -#include "control_thread.h" -#include "concurrent_queue.h" -#include "concurrent_map.h" -#include "gnss_sdr_flags.h" -#include "display.h" + #if CUDA_GPU_ACCEL // For the CUDA runtime routines (prefixed with "cuda_") diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index e63c01736..2994eb0c4 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -700,31 +700,64 @@ else(NOT ${GTEST_DIR_LOCAL}) add_dependencies(gnuradio_block_test gtest) endif(NOT ${GTEST_DIR_LOCAL}) -# add_executable(acq_test ${EXCLUDE} -# ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc -# ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gps_l1_ca_pcps_acquisition_test.cc -# ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc -# ) -# target_link_libraries(acq_test ${Boost_LIBRARIES} -# ${GFlags_LIBS} -# ${GLOG_LIBRARIES} -# ${GTEST_LIBRARIES} -# ${GNURADIO_RUNTIME_LIBRARIES} -# ${GNURADIO_BLOCKS_LIBRARIES} -# ${GNURADIO_FILTER_LIBRARIES} -# ${GNURADIO_ANALOG_LIBRARIES} -# gnss_sp_libs -# gnss_rx -# gnss_system_parameters -# signal_generator_blocks -# ${VOLK_GNSSSDR_LIBRARIES} -# ) -# add_test(acq_test acq_test) +add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc + ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc ) + +target_link_libraries(matio_test ${Boost_LIBRARIES} + ${GFlags_LIBS} + ${GLOG_LIBRARIES} + ${GTEST_LIBRARIES} + ${MATIO_LIBRARIES} + gnss_system_parameters ) +add_test(matio_test matio_test) +if(NOT ${GTEST_DIR_LOCAL}) + if(MATIO_FOUND) + add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) + else(MATIO_FOUND) + add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION} matio-${GNSSSDR_MATIO_LOCAL_VERSION}) + endif(MATIO_FOUND) +else(NOT ${GTEST_DIR_LOCAL}) + if(MATIO_FOUND) + add_dependencies(matio_test gtest) + else(MATIO_FOUND) + add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION}) + endif(MATIO_FOUND) +endif(NOT ${GTEST_DIR_LOCAL}) + +add_executable(acq_test + ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc + ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc + ) +target_link_libraries(acq_test ${Boost_LIBRARIES} + ${GFlags_LIBS} + ${GLOG_LIBRARIES} + ${GTEST_LIBRARIES} + ${GNURADIO_RUNTIME_LIBRARIES} + ${GNURADIO_BLOCKS_LIBRARIES} + ${GNURADIO_FILTER_LIBRARIES} + ${GNURADIO_ANALOG_LIBRARIES} + gnss_sp_libs + gnss_rx + gnss_system_parameters + signal_generator_blocks + signal_processing_testing_lib + ${VOLK_GNSSSDR_LIBRARIES} + ) +add_test(acq_test acq_test) +if(NOT ${GTEST_DIR_LOCAL}) + add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) +else(NOT ${GTEST_DIR_LOCAL}) + add_dependencies(acq_test acq_test gtest) +endif(NOT ${GTEST_DIR_LOCAL}) + + add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc + ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc ) + target_link_libraries(trk_test ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES} @@ -747,9 +780,5 @@ else(NOT ${GTEST_DIR_LOCAL}) endif(NOT ${GTEST_DIR_LOCAL}) -if(${ENABLE_PACKAGING}) - add_dependencies(check gnuradio_block_test trk_test) -else(${ENABLE_PACKAGING}) - add_dependencies(check control_thread_test flowgraph_test gnss_block_test - gnuradio_block_test trk_test) -endif(${ENABLE_PACKAGING}) +add_dependencies(check control_thread_test flowgraph_test gnss_block_test + gnuradio_block_test acq_test trk_test matio_test) diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h index 73e5f8251..1f4a5cafb 100644 --- a/src/tests/common-files/gnuplot_i.h +++ b/src/tests/common-files/gnuplot_i.h @@ -56,6 +56,7 @@ #include #include #include // for getenv() +#include #include // for std::list @@ -1887,7 +1888,7 @@ bool Gnuplot::get_program_path() // Retrieves a C string containing the value of environment variable PATH path = std::getenv("PATH"); - if (path == NULL) + if (path == NULL || std::char_traits::length(path) > 4096 * sizeof(char)) { throw GnuplotException("Path is not set"); } diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc index 9877e61f2..fe9b1007b 100644 --- a/src/tests/single_test_main.cc +++ b/src/tests/single_test_main.cc @@ -29,15 +29,6 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "concurrent_queue.h" #include "concurrent_map.h" #include "gps_navigation_message.h" @@ -48,10 +39,18 @@ #include "gps_ref_location.h" #include "gps_ref_time.h" #include "galileo_navigation_message.h" -//#include "sbas_ionospheric_correction.h" -//#include "sbas_telemetry_data.h" -//#include "sbas_ephemeris.h" -//#include "sbas_satellite_correction.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + + + concurrent_queue global_gps_acq_assist_queue; diff --git a/src/tests/system-tests/obs_gps_l1_system_test.cc b/src/tests/system-tests/obs_gps_l1_system_test.cc index 353c494ae..8594913d6 100644 --- a/src/tests/system-tests/obs_gps_l1_system_test.cc +++ b/src/tests/system-tests/obs_gps_l1_system_test.cc @@ -29,6 +29,19 @@ * ------------------------------------------------------------------------- */ +#include "concurrent_map.h" +#include "concurrent_queue.h" +#include "control_thread.h" +#include "in_memory_configuration.h" +#include "signal_generator_flags.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -38,19 +51,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "concurrent_map.h" -#include "concurrent_queue.h" -#include "control_thread.h" -#include "in_memory_configuration.h" -#include "signal_generator_flags.h" // For GPS NAVIGATION (L1) diff --git a/src/tests/system-tests/obs_system_test.cc b/src/tests/system-tests/obs_system_test.cc index fad78a813..afef8fcbb 100644 --- a/src/tests/system-tests/obs_system_test.cc +++ b/src/tests/system-tests/obs_system_test.cc @@ -30,6 +30,20 @@ * ------------------------------------------------------------------------- */ +#include "gnuplot_i.h" +#include "test_flags.h" +#include "concurrent_map.h" +#include "concurrent_queue.h" +#include "control_thread.h" +#include "file_configuration.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -40,21 +54,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "gnuplot_i.h" -#include "test_flags.h" -#include "concurrent_map.h" -#include "concurrent_queue.h" -#include "control_thread.h" -#include "file_configuration.h" + // For GPS NAVIGATION (L1) concurrent_queue global_gps_acq_assist_queue; diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc index 0b3cd098d..5b1a9cb4f 100644 --- a/src/tests/system-tests/position_test.cc +++ b/src/tests/system-tests/position_test.cc @@ -29,16 +29,6 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "concurrent_map.h" #include "concurrent_queue.h" #include "control_thread.h" @@ -48,6 +38,15 @@ #include "gnuplot_i.h" #include "test_flags.h" #include "signal_generator_flags.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include DEFINE_string(config_file_ptest, std::string(""), "File containing the configuration parameters for the position test."); diff --git a/src/tests/system-tests/ttff_gps_l1.cc b/src/tests/system-tests/ttff_gps_l1.cc index fb6eabcf1..931e20ea7 100644 --- a/src/tests/system-tests/ttff_gps_l1.cc +++ b/src/tests/system-tests/ttff_gps_l1.cc @@ -30,6 +30,17 @@ * ------------------------------------------------------------------------- */ +#include "concurrent_map.h" +#include "concurrent_queue.h" +#include "control_thread.h" +#include "file_configuration.h" +#include "in_memory_configuration.h" +#include "gnss_flowgraph.h" +#include "gps_acq_assist.h" +#include +#include +#include +#include #include #include #include @@ -41,17 +52,6 @@ #include #include #include -#include -#include -#include -#include -#include "concurrent_map.h" -#include "concurrent_queue.h" -#include "control_thread.h" -#include "file_configuration.h" -#include "in_memory_configuration.h" -#include "gnss_flowgraph.h" -#include "gps_acq_assist.h" DEFINE_int32(fs_in, 4000000, "Sampling rate, in Samples/s"); diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index 3d012e543..344f0d694 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -29,17 +29,6 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "concurrent_queue.h" #include "concurrent_map.h" #include "control_thread.h" @@ -63,6 +52,19 @@ #include "glonass_gnav_almanac.h" #include "glonass_gnav_utc_model.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + using google::LogMessage; DECLARE_string(log_dir); diff --git a/src/tests/unit-tests/arithmetic/conjugate_test.cc b/src/tests/unit-tests/arithmetic/conjugate_test.cc index 1b0aaa8cb..9867b5584 100644 --- a/src/tests/unit-tests/arithmetic/conjugate_test.cc +++ b/src/tests/unit-tests/arithmetic/conjugate_test.cc @@ -29,7 +29,7 @@ * ------------------------------------------------------------------------- */ - +#include #include #include #include @@ -44,7 +44,7 @@ TEST(ConjugateTest, StandardCComplexImplementation) { std::complex* input = new std::complex[FLAGS_size_conjugate_test]; std::complex* output = new std::complex[FLAGS_size_conjugate_test]; - memset(input, 0, sizeof(std::complex) * FLAGS_size_conjugate_test); + std::fill_n(input, FLAGS_size_conjugate_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); @@ -118,7 +118,7 @@ TEST(ConjugateTest, VolkComplexImplementation) { std::complex* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); std::complex* output = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); - memset(input, 0, sizeof(std::complex) * FLAGS_size_conjugate_test); + std::fill_n(input, FLAGS_size_conjugate_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); diff --git a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc index 6238b5c75..cefa52e21 100644 --- a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc +++ b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc @@ -30,7 +30,7 @@ * ------------------------------------------------------------------------- */ - +#include #include #include #include @@ -115,7 +115,7 @@ TEST(MagnitudeSquaredTest, ArmadilloComplexImplementation) TEST(MagnitudeSquaredTest, VolkComplexImplementation) { std::complex* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); - memset(input, 0, sizeof(std::complex) * FLAGS_size_magnitude_test); + std::fill_n(input, FLAGS_size_magnitude_test, std::complex(0.0, 0.0)); float* output = static_cast(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(float), volk_gnsssdr_get_alignment())); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); diff --git a/src/tests/unit-tests/arithmetic/matio_test.cc b/src/tests/unit-tests/arithmetic/matio_test.cc index 552414d5d..5784a2428 100644 --- a/src/tests/unit-tests/arithmetic/matio_test.cc +++ b/src/tests/unit-tests/arithmetic/matio_test.cc @@ -33,6 +33,7 @@ #include #include #include +#include TEST(MatioTest, WriteAndReadDoubles) { diff --git a/src/tests/unit-tests/arithmetic/multiply_test.cc b/src/tests/unit-tests/arithmetic/multiply_test.cc index 093bca5f9..809ff8d11 100644 --- a/src/tests/unit-tests/arithmetic/multiply_test.cc +++ b/src/tests/unit-tests/arithmetic/multiply_test.cc @@ -30,7 +30,7 @@ * ------------------------------------------------------------------------- */ - +#include #include #include #include @@ -45,7 +45,7 @@ TEST(MultiplyTest, StandardCDoubleImplementation) { double* input = new double[FLAGS_size_multiply_test]; double* output = new double[FLAGS_size_multiply_test]; - memset(input, 0, sizeof(double) * FLAGS_size_multiply_test); + std::fill_n(input, FLAGS_size_multiply_test, 0.0); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); @@ -98,7 +98,7 @@ TEST(MultiplyTest, StandardCComplexImplementation) { std::complex* input = new std::complex[FLAGS_size_multiply_test]; std::complex* output = new std::complex[FLAGS_size_multiply_test]; - memset(input, 0, sizeof(std::complex) * FLAGS_size_multiply_test); + std::fill_n(input, FLAGS_size_multiply_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); @@ -180,7 +180,7 @@ TEST(MultiplyTest, VolkComplexImplementation) { std::complex* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); std::complex* output = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); - memset(input, 0, sizeof(std::complex) * FLAGS_size_multiply_test); + std::fill_n(input, FLAGS_size_multiply_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); 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 173b7f18b..0165cb2a6 100644 --- a/src/tests/unit-tests/control-plane/file_configuration_test.cc +++ b/src/tests/unit-tests/control-plane/file_configuration_test.cc @@ -31,7 +31,6 @@ #include -#include #include "file_configuration.h" 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 9d6f79c8e..e405a49f6 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 @@ -31,7 +31,6 @@ #include -#include #include #include #include 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 0f484fdba..51624006d 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 ae587a1b3..8f69f3c1d 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 @@ -42,7 +42,6 @@ #include -#include #include #include #include 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 e0b146fd6..4a257bbec 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 @@ -32,8 +32,8 @@ #include -#include #include +#include #include #include #include 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 ba4c01e2d..b5b4e2b86 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 b6cb14a8a..0cb5c50cf 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 @@ -33,7 +33,6 @@ #include #include -#include #include #include #include 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 fa1d5dc60..6e526f998 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 @@ -30,11 +30,7 @@ * ------------------------------------------------------------------------- */ - - - #include -#include #include #include #include @@ -457,7 +453,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ConnectAndRun) start = std::chrono::system_clock::now(); top_block->run(); // Start threads and wait end = std::chrono::system_clock::now(); - std::chrono::duration elapsed_seconds = end - start; + elapsed_seconds = end - start; }) << "Failure running the top_block."; std::cout << "Processed " << nsamples << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl; 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 86f2f85b3..8b9819ae0 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 @@ -30,7 +30,6 @@ */ #include -#include #include #include #include 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 47e56df36..ff09100a1 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 95b73e6e3..b7755482e 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 @@ -32,7 +32,6 @@ #include #include -#include #include #include #include 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 6243fb8bf..70f7394e0 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 a432cec1a..f9de000d1 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 @@ -33,9 +33,9 @@ #include -#include #include #include +#include #include #include #include @@ -49,6 +49,7 @@ #include "gnss_sdr_valve.h" #include "gnss_synchro.h" #include "gnuplot_i.h" +#include "GPS_L1_CA.h" #include "test_flags.h" #include "acquisition_dump_reader.h" #include "gps_l1_ca_pcps_acquisition.h" 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 985e7d16e..bae5e5735 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 @@ -31,7 +31,6 @@ #include #include -#include #include #include #include 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 1d070e69d..7c73877aa 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 02d44029a..761b8b2fa 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 @@ -33,7 +33,6 @@ #include -#include #include #include #include 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 cfff6ff70..6ecc2da52 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 @@ -33,7 +33,6 @@ #include -#include #include #include #include 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 be5a6cc69..7062f8e17 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 @@ -33,7 +33,6 @@ #include -#include #include #include #include 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 3d5b4a1af..9fa38e4a5 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 @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include #include 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 13896442c..c01768db2 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 @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include #include 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 a6a13dc42..cc180b7fd 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 @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include #include 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 1b09b7367..ec07cf68b 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 @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include #include 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 ee71cc113..3f19c0854 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -39,3 +39,6 @@ list(SORT SIGNAL_PROCESSING_TESTING_LIB_HEADERS) add_library(signal_processing_testing_lib ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) source_group(Headers FILES ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) +if(NOT MATIO_FOUND) + add_dependencies(signal_processing_testing_lib matio-${GNSSSDR_MATIO_LOCAL_VERSION}) +endif(NOT MATIO_FOUND) \ No newline at end of file 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 6e9d3e493..7f9b6c888 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 @@ -30,62 +30,62 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include #include "acquisition_dump_reader.h" +#include +#include +#include bool acquisition_dump_reader::read_binary_acq() { mat_t* matfile = Mat_Open(d_dump_filename.c_str(), MAT_ACC_RDONLY); if( matfile == NULL) - { - std::cout << "¡¡¡Unreachable Acquisition dump file!!!" << std::endl; - return false; - } + { + std::cout << "¡¡¡Unreachable Acquisition dump file!!!" << std::endl; + return false; + } matvar_t* var_= Mat_VarRead(matfile, "grid"); if( var_ == NULL) - { - std::cout << "¡¡¡Unreachable grid variable into Acquisition dump file!!!" << std::endl; - Mat_Close(matfile); - return false; - } + { + std::cout << "¡¡¡Unreachable grid variable into Acquisition dump file!!!" << std::endl; + Mat_Close(matfile); + return false; + } if(var_->rank != 2) - { - std::cout << "Invalid Acquisition dump file: rank error" << std::endl; - Mat_VarFree(var_); - Mat_Close(matfile); - return false; - } + { + std::cout << "Invalid Acquisition dump file: rank error" << std::endl; + Mat_VarFree(var_); + Mat_Close(matfile); + return false; + } if((var_->dims[0] != d_samples_per_code) or (var_->dims[1] != d_num_doppler_bins)) - { - std::cout << "Invalid Acquisition dump file: dimension matrix error" << std::endl; - if(var_->dims[0] != d_samples_per_code) std::cout << "Expected " << d_samples_per_code << " samples per code. Obtained " << var_->dims[0] << std::endl; - if(var_->dims[1] != d_num_doppler_bins) std::cout << "Expected " << d_num_doppler_bins << " Doppler bins. Obtained " << var_->dims[1] << std::endl; - Mat_VarFree(var_); - Mat_Close(matfile); - return false; - } + { + std::cout << "Invalid Acquisition dump file: dimension matrix error" << std::endl; + if(var_->dims[0] != d_samples_per_code) std::cout << "Expected " << d_samples_per_code << " samples per code. Obtained " << var_->dims[0] << std::endl; + if(var_->dims[1] != d_num_doppler_bins) std::cout << "Expected " << d_num_doppler_bins << " Doppler bins. Obtained " << var_->dims[1] << std::endl; + Mat_VarFree(var_); + Mat_Close(matfile); + return false; + } if(var_->data_type != MAT_T_SINGLE) - { - std::cout << "Invalid Acquisition dump file: data type error" << std::endl; - Mat_VarFree(var_); - Mat_Close(matfile); - return false; - } + { + std::cout << "Invalid Acquisition dump file: data type error" << std::endl; + Mat_VarFree(var_); + Mat_Close(matfile); + return false; + } std::vector >::iterator it1; std::vector::iterator it2; float* aux = static_cast(var_->data); int k = 0; float normalization_factor = std::pow(d_samples_per_code, 2); for(it1 = mag.begin(); it1 != mag.end(); it1++) - { - for(it2 = it1->begin(); it2 != it1->end(); it2++) { - *it2 = static_cast(std::sqrt(aux[k])) / normalization_factor; - k++; + for(it2 = it1->begin(); it2 != it1->end(); it2++) + { + *it2 = static_cast(std::sqrt(aux[k])) / normalization_factor; + k++; + } } - } Mat_VarFree(var_); Mat_Close(matfile); 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 47832b888..d3b8ef1b8 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 @@ -29,6 +29,7 @@ */ #include "observables_dump_reader.h" +#include bool observables_dump_reader::read_binary_obs() { 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 205c5cd9b..dc2cc2eb8 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 @@ -31,7 +31,6 @@ #ifndef GNSS_SDR_OBSERVABLES_DUMP_READER_H #define GNSS_SDR_OBSERVABLES_DUMP_READER_H -#include #include #include #include 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 0a0993c70..645b82ab5 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 @@ -29,6 +29,7 @@ */ #include "tlm_dump_reader.h" +#include bool tlm_dump_reader::read_binary_obs() { 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 1ffd3c217..ff0f3d5c1 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 @@ -31,7 +31,6 @@ #ifndef GNSS_SDR_TLM_DUMP_READER_H #define GNSS_SDR_TLM_DUMP_READER_H -#include #include #include #include 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 1ff2c67e3..f23048c18 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 @@ -29,6 +29,7 @@ */ #include "tracking_dump_reader.h" +#include bool tracking_dump_reader::read_binary_obs() { 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 1c84ed9e3..f30802ba5 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 @@ -31,7 +31,6 @@ #ifndef GNSS_SDR_TRACKING_DUMP_READER_H #define GNSS_SDR_TRACKING_DUMP_READER_H -#include #include #include #include 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 bc407fc20..7aadfc94f 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 @@ -29,6 +29,7 @@ */ #include "tracking_true_obs_reader.h" +#include bool tracking_true_obs_reader::read_binary_obs() { 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 08b69f433..4b57df24a 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 @@ -31,7 +31,6 @@ #ifndef GNSS_SDR_TRACKING_TRUE_OBS_READER_H #define GNSS_SDR_TRACKING_TRUE_OBS_READER_H -#include #include #include #include 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 8b4bcb07b..afb6626ef 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 @@ -29,6 +29,7 @@ */ #include "true_observables_reader.h" +#include bool true_observables_reader::read_binary_obs() { 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 8913cf61d..acdcda139 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 @@ -31,7 +31,6 @@ #ifndef GNSS_SDR_TRUE_OBSERVABLES_READER_H #define GNSS_SDR_TRUE_OBSERVABLES_READER_H -#include #include #include #include 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 d9b02fdbb..3f5923460 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 @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include 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 328b4c998..9ccec49d5 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 @@ -30,7 +30,6 @@ #include -#include #include #include #include "nmea_printer.h" 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 963ab0186..0652249e0 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 @@ -28,7 +28,6 @@ * ------------------------------------------------------------------------- */ -#include #include #include "rinex_printer.h" 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 13c28d711..672474b6b 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 @@ -28,13 +28,9 @@ * ------------------------------------------------------------------------- */ -//#include -//#include + #include -//#include -//#include #include "rtcm_printer.h" -//#include "gps_ephemeris.h" TEST(RtcmPrinterTest, Instantiate) @@ -51,22 +47,6 @@ TEST(RtcmPrinterTest, Instantiate) TEST(RtcmPrinterTest, Run) { - // std::string file_name = "./gps_ephemeris_rx.xml"; - // std::map gps_ephemeris_map; - // try - // { - // std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in); - // boost::archive::xml_iarchive xml(ifs); - // gps_ephemeris_map.clear(); - // xml >> boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", gps_ephemeris_map); - // ifs.close(); - // } - // catch (const std::exception& e) - // { - // //LOG(WARNING) << e.what() << "File: " << file_name; - // //std::cout << "File not found" << std::endl; - // } - std::string filename = "test.rtcm"; bool flag_rtcm_tty_port = false; std::string rtcm_dump_devname = "/dev/pts/4"; 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 6792608be..f0b3ac238 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 a571d44a7..b2a723991 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 @@ -30,7 +30,6 @@ */ #include -#include #include #include #include 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 3f4587fae..d0982266c 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 @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include 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 ea9740b90..b9b72729f 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 670e44312..887158baa 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 e845b0d22..00d77a6be 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 6625fda4f..69e9ba4c7 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include 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 32d0388cf..ce7c52fb2 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 @@ -31,7 +31,6 @@ */ #include -#include #include #include #include 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 43442611f..da2b3eb9c 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 @@ -33,7 +33,6 @@ #include #include -#include #include #include #include // to test the FPGA we have to create a simultaneous task to send the samples using the DMA and stop the test 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 bc750c062..8a2f31281 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 @@ -32,7 +32,6 @@ #include -#include #include #include #include