diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54a478cba..ddb7cbc68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,15 +28,15 @@ jobs: libgnutls-openssl-dev libmatio-dev googletest protobuf-compiler libprotobuf-dev \ python3-mako liborc-0.4-dev - name: configure - run: cd build && cmake -GNinja .. + run: cmake -S . -B build -GNinja - name: build - run: cd build && ninja + run: cmake --build build - name: check - run: cd build && ninja check && ../install/volk_gnsssdr_profile && ../install/run_tests + run: cmake --build build --target check && ./install/volk_gnsssdr_profile && ./install/run_tests - name: default position_test run: | - cd build && cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON -DENABLE_UNIT_TESTING_EXTRA=OFF .. && \ - ninja && ../install/position_test && ../install/run_tests --gtest_filter=Osnma* + cmake -S . -B build -DENABLE_SYSTEM_TESTING_EXTRA=ON -DENABLE_UNIT_TESTING_EXTRA=OFF && \ + cmake --build build && ./install/position_test && ./install/run_tests --gtest_filter=Osnma* build-macos: runs-on: macos-latest @@ -62,15 +62,15 @@ jobs: brew install ninja hdf5 automake armadillo lapack libmatio gnuradio openssl pugixml protobuf pip3 install mako - name: configure - run: cd build && cmake -GNinja .. + run: cmake -S . -B build -GNinja - name: build - run: cd build && ninja + run: cmake --build build - name: check - run: cd build && ninja check && ../install/volk_gnsssdr_profile && ../install/run_tests + run: cmake --build build --target check && ./install/volk_gnsssdr_profile && ./install/run_tests - name: default position_test run: | - cd build && cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON -DENABLE_UNIT_TESTING_EXTRA=OFF .. && \ - ninja && ../install/position_test && ../install/run_tests --gtest_filter=Osnma* + cmake -S . -B build -DENABLE_SYSTEM_TESTING_EXTRA=ON -DENABLE_UNIT_TESTING_EXTRA=OFF && \ + cmake --build build && ./install/position_test && ./install/run_tests --gtest_filter=Osnma* build-macos-xcode: runs-on: macos-latest @@ -96,22 +96,20 @@ jobs: brew install ninja pkg-config hdf5 automake armadillo lapack libmatio gnuradio openssl pugixml protobuf pip3 install mako - name: configure - run: cd build && cmake -GXcode .. + run: cmake -S . -B build -GXcode - name: build - run: cd build && xcodebuild -configuration Release + run: cmake --build build --config Release - name: check run: | - cd build - xcodebuild -configuration Release -target check - ../install/volk_gnsssdr_profile - ../install/run_tests + cmake --build build --config Release --target check + ./install/volk_gnsssdr_profile + ./install/run_tests - name: default position_test run: | - cd build - cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON -DENABLE_UNIT_TESTING_EXTRA=OFF .. - xcodebuild -configuration Release -target position_test - ../install/position_test - ../install/run_tests --gtest_filter=Osnma* + cmake -S . -B build -DENABLE_SYSTEM_TESTING_EXTRA=ON -DENABLE_UNIT_TESTING_EXTRA=OFF + cmake --build build --config Release --target position_test + ./install/position_test + ./install/run_tests --gtest_filter=Osnma* clang-format: runs-on: ubuntu-latest @@ -151,7 +149,7 @@ jobs: ln -s $(brew --prefix llvm)/bin/clang-apply-replacements /usr/local/bin ln -s $(brew --prefix llvm)/bin/run-clang-tidy.py /usr/local/bin - name: Prepare run - run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.15.2 core_monitor core_libs pvt_libs + run: cmake -S . -B build && cmake --build build --target volk_gnsssdr_module gtest-1.15.2 core_monitor core_libs pvt_libs - name: run clang-tidy run: cd build && /opt/homebrew/opt/llvm/bin/run-clang-tidy -fix - name: check @@ -168,7 +166,7 @@ jobs: - name: install dependencies run: sudo apt-get install python3-pip && sudo pip3 install cpplint - name: run checks - run: "find ./src/ -iname *.h -o -iname *.cc | xargs cpplint + run: "find ./src/ ./utils ./tests -iname *.h -o -iname *.cc | xargs cpplint --filter=-,+build/class,+build/c++14,+build/deprecated,+build/explicit_make_pair,\ +build/include_what_you_use,+build/printf_format,+build/storage_class,\ +readability/constructors,+readability/namespace,+readability/newline,\ @@ -180,7 +178,7 @@ jobs: +whitespace/end-of-line,+whitespace/ending-newline,+whitespace/semicolon,\ +whitespace/tab --exclude=./src/core/interfaces/gnss_block_interface.h --exclude=./src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/hwcaps_for_testing.* - --exclude=./src/utils/nav-listener/build/nav_message.pb.h" + --exclude=./utils/nav-listener/build/nav_message.pb.h" prettier-markdown: runs-on: ubuntu-latest @@ -215,12 +213,12 @@ jobs: pip install mako - name: configure shell: powershell - run: cd build; cmake -G "Visual Studio 17 2022" ..\src\algorithms\libs\volk_gnsssdr_module\volk_gnsssdr + run: cmake -S src\algorithms\libs\volk_gnsssdr_module\volk_gnsssdr -B build -G "Visual Studio 17 2022" - name: build run: cmake --build build --config Release - name: test shell: powershell - run: cd build; ctest -C Release + run: ctest -C Release --test-dir build - name: install run: cmake --install build - name: run profile @@ -233,11 +231,11 @@ jobs: - name: install dependencies run: sudo apt install python3-mako liborc-dev - name: configure - run: cd build && cmake ../src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr + run: cmake -S src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr -B build - name: build - run: cd build && make -j2 + run: cmake --build build - name: install - run: cd build && sudo make install && sudo ldconfig + run: sudo cmake --install build && sudo ldconfig - name: test run: volk_gnsssdr_profile @@ -253,11 +251,11 @@ jobs: python -m pip install --upgrade pip pip install mako - name: configure - run: cd build && cmake ../src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr + run: cmake -S src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr -B build - name: build - run: cd build && make -j2 && sudo make install + run: cmake --build build && sudo cmake --install build - name: test - run: cd build && ctest -C Release --exclude-regex volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc + run: ctest -C Release --test-dir build --exclude-regex volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc volk-gnsssdr-macos-xcode: runs-on: macos-latest @@ -271,13 +269,13 @@ jobs: python -m pip install --upgrade pip pip install mako - name: configure - run: cd build && cmake -GXcode ../src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr + run: cmake -S src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr -B build -GXcode - name: build - run: cd build && xcodebuild -configuration Release + run: cmake --build build --config Release - name: install - run: cd build && sudo xcodebuild -configuration Release -target install + run: sudo cmake --install build - name: test - run: cd build && ctest -C Release --exclude-regex volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc + run: ctest -C Release --test-dir build --exclude-regex --exclude-regex volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc shellcheck: runs-on: ubuntu-latest @@ -286,7 +284,7 @@ jobs: - name: install dependencies run: sudo apt install shellcheck - name: check scripts - run: shellcheck src/utils/scripts/* + run: shellcheck utils/scripts/* REUSE-compliance: runs-on: ubuntu-latest diff --git a/.github/workflows/volk_gnsssdr_android.yml b/.github/workflows/volk_gnsssdr_android.yml index 04a33c3d4..b10f894dd 100644 --- a/.github/workflows/volk_gnsssdr_android.yml +++ b/.github/workflows/volk_gnsssdr_android.yml @@ -50,6 +50,7 @@ jobs: shell: bash run: | cd $GITHUB_WORKSPACE/ + mkdir build cd build cmake -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/android-sdk-linux/ndk/24.0.8215888/build/cmake/android.toolchain.cmake \ -DANDROID_ABI=${{ matrix.arch.name }} \ diff --git a/.gitignore b/.gitignore index a876bf1c1..2155a88bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,30 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2011 Carles Fernandez-Prades +# SPDX-FileCopyrightText: 2011-2024 Carles Fernandez-Prades *~ .*.swp -docs/doxygen/Doxyfile -docs/html -docs/latex -docs/GNSS-SDR_manual.pdf -src/tests/data/output.dat -thirdparty/ -src/utils/nav-listener/build -.settings -.project -.cproject -.idea -cmake-build-debug/ +/build/ +/build*/ +/cmake-build-debug/ +/data/ +/docs/doxygen/Doxyfile +/docs/html/ +/docs/latex/ +/docs/GNSS-SDR_manual.pdf +/gnss_sdr_pvt.nmea +/GSDR* +/HAS_* +/PVT_* +/Testing/ +/tests/data/output.dat +/thirdparty/ +/utils/nav-listener/build/ +/utils/nav-listener/build*/ /install +.cproject .DS_Store +.idea +.project .pydevproject -.vscode/ +.settings .vs/ -Testing/ - -GSDR* -PVT_* -HAS_* -gnss_sdr_pvt.nmea -build-debug/ -build-release/ \ No newline at end of file +.vscode/ diff --git a/CMakeLists.txt b/CMakeLists.txt index c986cfc12..7535b5c2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3268,10 +3268,15 @@ if(ENABLE_AD9361 OR ENABLE_FMCOMMS2 OR ENABLE_PLUTOSDR) else() message(FATAL_ERROR "libiio is required for building gnss-sdr with -DENABLE_AD9361=ON.") endif() + else() + if(ENABLE_AD9361) + set(ENABLE_FPGA ON) + endif() endif() endif() + ################################################################################ # ION GNSS-SDR Metadata Standard https://sdr.ion.org/ (OPTIONAL) ################################################################################ @@ -3327,6 +3332,7 @@ if(ENABLE_ION) endif() + ##################################################################### # Check signal sources related to FPGA only. ##################################################################### @@ -3368,6 +3374,7 @@ if(ENABLE_MAX2771) file(GLOB_RECURSE SPIDEV_FILE "${TARGET_ROOTFS_PATH}/*/spidev.h") if(EXISTS "${SPIDEV_FILE}") message(STATUS "SPIdev driver found: ${SPIDEV_FILE}") + set(ENABLE_FPGA ON) else() message(STATUS "SPIdev driver not found, its installation is required.") if(ENABLE_PACKAGING) @@ -3399,6 +3406,7 @@ if(ENABLE_DMA_PROXY) file(GLOB_RECURSE DMA_PROXY_FILE "${TARGET_ROOTFS_PATH}/*/dma-proxy.ko") if(EXISTS "${DMA_PROXY_FILE}") message(STATUS "Found dma-proxy.ko file: ${DMA_PROXY_FILE}") + set(ENABLE_FPGA ON) else() if(ENABLE_PACKAGING) set(ENABLE_DMA_PROXY OFF) @@ -3602,6 +3610,10 @@ add_custom_target(uninstall # Add subdirectories ################################################################################ add_subdirectory(src) +if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) + add_subdirectory(tests) +endif() +add_subdirectory(utils) diff --git a/README.md b/README.md index d5cbacc94..6bad46ab8 100644 --- a/README.md +++ b/README.md @@ -535,18 +535,16 @@ gnss-sdr with the following structure: ``` |-gnss-sdr - |---build <- where gnss-sdr is built. |---cmake <- CMake-related files. |---conf <- Configuration files. Each file defines one particular receiver. - |---data <- Populate this folder with your captured data. |---docs <- Contains documentation-related files. |---install <- Executables will be placed here. |---src <- Source code folder. |-----algorithms <- Signal processing blocks. |-----core <- Control plane, interfaces, systems' parameters. |-----main <- Main function of the C++ program. - |-----tests <- QA code. - |-----utils <- some utilities (e.g. Matlab scripts). + |---tests <- QA code. + |---utils <- some utilities (e.g. Matlab scripts). ``` By default, you will be in the 'main' branch of the Git repository, which @@ -567,14 +565,14 @@ readings can be found at our Go to GNSS-SDR's build directory: ``` -$ cd gnss-sdr/build +$ cd gnss-sdr ``` Configure and build the application: ``` -$ cmake .. -$ make +$ cmake -S . -B build +$ cmake --build build ``` By default, CMake will build the Release version, meaning that the compiler will @@ -585,8 +583,8 @@ information about the internals of the receiver, as well as more fine-grained logging. This can be done by building the Debug version, by doing: ``` -$ cmake -DCMAKE_BUILD_TYPE=Debug .. -$ make +$ cmake -S . -B build-debug -DCMAKE_BUILD_TYPE=Debug +$ cmake --build build-debug ``` This will create four executables at gnss-sdr/install, namely `gnss-sdr`, @@ -595,7 +593,7 @@ that folder, but if you prefer to install `gnss-sdr` on your system and have it available anywhere else, do: ``` -$ sudo make install +$ sudo cmake --install build ``` This will also make a copy of the conf/ folder into @@ -607,21 +605,21 @@ You could be interested in creating the documentation (requires: `sudo apt-get install doxygen-latex` in Ubuntu/Debian) by doing: ``` -$ make doc +$ cmake --build build --target doc ``` -from the gnss-sdr/build folder. This will generate HTML documentation that can -be retrieved pointing your browser of preference to build/docs/html/index.html. -If a LaTeX installation is detected in your system, +This will generate HTML documentation that can be retrieved pointing your +browser of preference to `build/docs/html/index.html`. If a LaTeX installation +is detected in your system, ``` -$ make pdfmanual +$ cmake --build build --target pdfmanual ``` will create a PDF manual at build/docs/GNSS-SDR_manual.pdf. Finally, ``` -$ make doc-clean +$ cmake --build build --target doc-clean ``` will remove the content of previously generated documentation. @@ -639,30 +637,6 @@ the function to execute. It mimics GNU Radio's [VOLK](https://www.libvolk.org/) library, so if you still have not run `volk_profile`, this is a good moment to do so. -If you are using [Eclipse](https://www.eclipse.org/ide/) as your development -environment, CMake can create the project for you. However, if the build -directory is a subdirectory of the source directory (as is the case of the -`gnss-sdr/build` folder), this is not supported well by Eclipse. It is strongly -recommended to use a build directory which is a sibling of the source directory. -Hence, type from the `gnss-sdr` root folder: - -``` -$ cd .. -$ mkdir eclipse && cd eclipse -$ cmake -G "Eclipse CDT4 - Unix Makefiles" -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -DCMAKE_ECLIPSE_VERSION=4.5 ../gnss-sdr -``` - -and then import the created project into Eclipse: - -1. Import project using Menu File -> Import. -2. Select General -> Existing projects into workspace. -3. Select your root directory: Browse and select your newly created `eclipse/` - directory. Keep "Copy projects into workspace" unchecked. -4. Click on "Finish" and you will get a fully functional Eclipse project. - -After building the project, you will find the generated binaries at -`eclipse/install`. - #### Build OSMOSDR support (OPTIONAL) Install the [OsmoSDR](https://osmocom.org/projects/sdr "OsmoSDR's Homepage") @@ -691,9 +665,9 @@ $ sudo ldconfig Then, configure GNSS-SDR to build the `Osmosdr_Signal_Source` by: ``` -$ cmake -DENABLE_OSMOSDR=ON .. -$ make -$ sudo make install +$ cmake -S . -B build -DENABLE_OSMOSDR=ON +$ cmake --build build +$ sudo cmake --install build ``` (in order to disable the `Osmosdr_Signal_Source` compilation, you can pass @@ -734,18 +708,18 @@ $ cd ../.. Then configure GNSS-SDR to build the `Fmcomms2_Signal_Source` implementation: ``` -$ cd gnss-sdr/build -$ cmake -DENABLE_FMCOMMS2=ON .. -$ make -$ sudo make install +$ cd gnss-sdr +$ cmake -S . -B build -DENABLE_FMCOMMS2=ON +$ cmake --build build +$ sudo cmake --install build ``` or configure it to build `Plutosdr_Signal_Source`: ``` -$ cmake -DENABLE_PLUTOSDR=ON .. -$ make -$ sudo make install +$ cmake -S . -B build -DENABLE_PLUTOSDR=ON +$ cmake --build build +$ sudo cmake --install build ``` With `Fmcomms2_Signal_Source` you can use any SDR hardware based on @@ -760,9 +734,9 @@ devices. In order to enable the building of blocks that use OpenCL, type: ``` -$ cmake -DENABLE_OPENCL=ON .. -$ make -$ sudo make install +$ cmake -S . -B build -DENABLE_OPENCL=ON +$ cmake --build build +$ sudo cmake --install build ``` #### Build CUDA support (OPTIONAL) @@ -774,9 +748,9 @@ data-parallel computations, first you need to install the CUDA Toolkit from Make sure that the SDK samples build well. Then, build GNSS-SDR by doing: ``` -$ cmake -DENABLE_CUDA=ON .. -$ make -$ sudo make install +$ cmake -S . -B build -DENABLE_CUDA=ON +$ cmake --build build +$ sudo cmake --install build ``` Of course, you will also need a GPU that @@ -879,13 +853,13 @@ non-standard location. If that is the case, you need to inform GNSS-SDR's configuration system by defining the `PYTHON_EXECUTABLE` variable as: ``` -$ cmake -DPYTHON_EXECUTABLE=/path/to/bin/python3 .. +$ cmake -S . -B build -DPYTHON_EXECUTABLE=/path/to/bin/python3 ``` In case you have installed Macports in a non-standard location, you can use: ``` -$ cmake -DCMAKE_PREFIX_PATH=/opt/local -DUSE_MACPORTS_PYTHON=/opt/local/bin/python .. +$ cmake -S . -B build -DCMAKE_PREFIX_PATH=/opt/local -DUSE_MACPORTS_PYTHON=/opt/local/bin/python ``` changing `/opt/local` by the base directory in which your software is installed. @@ -901,17 +875,23 @@ software: ``` $ git clone https://github.com/gnss-sdr/gnss-sdr -$ cd gnss-sdr/build -$ cmake .. -$ make +$ cd gnss-sdr +$ cmake -S . -B build +$ cmake --build build ``` -This will create three executables at gnss-sdr/install, namely `gnss-sdr`, +This will create three executables at `gnss-sdr/install`, namely `gnss-sdr`, `run_tests` and `volk_gnsssdr_profile`. You can install the software receiver on your system by doing: ``` -$ sudo make install +$ sudo cmake --install build +``` + +and uninstall it with: + +``` +$ sudo cmake --build build --target uninstall ``` Note, it is advisable not to run the install step in a homebrew environment. @@ -919,7 +899,7 @@ Note, it is advisable not to run the install step in a homebrew environment. The documentation can be built by: ``` -$ make doc +$ cmake --build build --target doc ``` and can be viewed doing: @@ -994,7 +974,7 @@ $ git pull upstream next ``` Before rebuilding the source code, it is safe (and recommended) to remove the -remainders of old compilations: +remainders of old compilations, _e.g._: ``` $ rm -rf gnss-sdr/build/* @@ -1090,7 +1070,7 @@ You can use a single configuration file for processing different data files, specifying the file to be processed with the `--signal_source` flag: ``` -$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=../data/my_captured_data.dat +$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=./my_captured_data.dat ``` This will override the `SignalSource.filename` specified in the configuration @@ -1475,7 +1455,7 @@ SignalSource.port=1234 SignalSource.swap_iq=false SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ``` Example for a dual-frequency receiver: @@ -1569,7 +1549,7 @@ The block can be configured like this: ;#[Freq_Xlating_Fir_Filter] enables FIR filter and a composite frequency translation that shifts IF down to zero Hz. InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false ; #dump: Dump the filtered data to a file. -InputFilter.dump_filename=../data/input_filter.dat ; #dump_filename: Log path and filename. +InputFilter.dump_filename=./input_filter.dat ; #dump_filename: Log path and filename. InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -1622,7 +1602,7 @@ implements a nearest neighbourhood interpolation: ;#[Pass_Through] disables this block Resampler.implementation=Direct_Resampler Resampler.dump=false ; Dumps the resampled data to a file. -Resampler.dump_filename=../data/resampler.dat ; log path and filename. +Resampler.dump_filename=./resampler.dat ; log path and filename. Resampler.item_type=gr_complex Resampler.sample_freq_in=8000000 ; sample frequency of the input signal Resampler.sample_freq_out=4000000 ; desired sample frequency of the output signal @@ -1850,7 +1830,7 @@ Tracking_1B.dll_filter_order=2 ; DLL loop filter order [1], [2] or [3] Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ``` More documentation at the diff --git a/build/.gitignore b/build/.gitignore deleted file mode 100644 index 08e486f4d..000000000 --- a/build/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades -# Ignore everything in this directory -* -# Except this file -!.gitignore diff --git a/conf/File_input/Beidou/gnss-sdr_BDS_B1I_byte.conf b/conf/File_input/Beidou/gnss-sdr_BDS_B1I_byte.conf index a21547d24..e354a754d 100644 --- a/conf/File_input/Beidou/gnss-sdr_BDS_B1I_byte.conf +++ b/conf/File_input/Beidou/gnss-sdr_BDS_B1I_byte.conf @@ -50,7 +50,7 @@ InputFilter.grid_density=16 InputFilter.sampling_frequency=25000000 InputFilter.IF=6250000 InputFilter.dump = false -InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/src/tests/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat +InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/tests/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat Resampler.implementation=Pass_Through Resampler.sample_freq_in=25000000 Resampler.sample_freq_out=25000000 diff --git a/conf/File_input/Beidou/gnss-sdr_BDS_B3I_byte.conf b/conf/File_input/Beidou/gnss-sdr_BDS_B3I_byte.conf index 8de1c685e..edd60bcd8 100644 --- a/conf/File_input/Beidou/gnss-sdr_BDS_B3I_byte.conf +++ b/conf/File_input/Beidou/gnss-sdr_BDS_B3I_byte.conf @@ -51,7 +51,7 @@ InputFilter.grid_density=16 InputFilter.sampling_frequency=50000000 InputFilter.IF=12500000 InputFilter.dump = false -InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/src/tests/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat +InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/tests/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat Resampler.implementation=Pass_Through Resampler.sample_freq_in=50000000 Resampler.sample_freq_out=50000000 diff --git a/conf/File_input/Beidou/gnss-sdr_BDS_B3I_short.conf b/conf/File_input/Beidou/gnss-sdr_BDS_B3I_short.conf index a88c36092..01606f841 100644 --- a/conf/File_input/Beidou/gnss-sdr_BDS_B3I_short.conf +++ b/conf/File_input/Beidou/gnss-sdr_BDS_B3I_short.conf @@ -12,7 +12,7 @@ GNSS-SDR.internal_fs_sps=30000000 ;######### SIGNAL_SOURCE CONFIG ############ SignalSource.implementation=File_Signal_Source -;SignalSource.filename=/home/dmiralles/Documents/gnss-sdr/src/tests/signal_samples/USRP_BDS_B2a_201805171115_fs_25e6_if0e3_ishort_200ms.bin +;SignalSource.filename=/home/dmiralles/Documents/gnss-sdr/tests/signal_samples/USRP_BDS_B2a_201805171115_fs_25e6_if0e3_ishort_200ms.bin SignalSource.filename=/archive/USRP_BDS_B3I_201805171118_fs_25e6_if0e3_ishort.bin SignalSource.item_type=ishort SignalSource.sampling_frequency=30000000 diff --git a/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf b/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf index a208366e5..32b24bccc 100644 --- a/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf +++ b/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf @@ -39,7 +39,7 @@ Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.dump=false -Acquisition_1C.dump_filename=../data/kalman/acq_dump +Acquisition_1C.dump_filename=./kalman/acq_dump ;######### TRACKING GLOBAL CONFIG ############ Tracking_1C.implementation=GPS_L1_CA_Gaussian_Tracking @@ -48,7 +48,7 @@ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=4.0; Tracking_1C.order=3; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/kalman/epl_tracking_ch_ +Tracking_1C.dump_filename=./kalman/epl_tracking_ch_ Tracking_1C.bce_run = true; Tracking_1C.p_transient = 0; Tracking_1C.s_transient = 100; diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf index d83bd63d3..f0a90781b 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf @@ -34,7 +34,7 @@ DataTypeAdapter.item_type=float ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=float InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -64,7 +64,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=80000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -107,7 +107,7 @@ Tracking_1C.item_type=gr_complex Tracking_1C.pll_bw_hz=20.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf index 356dde132..6961b3c3f 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf @@ -30,14 +30,14 @@ SignalConditioner.implementation=Signal_Conditioner ;######### DATA_TYPE_ADAPTER CONFIG ############ DataTypeAdapter.implementation=Ishort_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/data_type_adapter.dat +DataTypeAdapter.dump_filename=./data_type_adapter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Pass_Through InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -46,7 +46,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf index 84179dbed..d61355a00 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf @@ -30,7 +30,7 @@ SignalConditioner.implementation=Signal_Conditioner DataTypeAdapter.implementation=Ishort_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/DataTypeAdapter.dat +DataTypeAdapter.dump_filename=./DataTypeAdapter.dat InputFilter.implementation=Pass_Through InputFilter.input_item_type=gr_complex @@ -67,7 +67,7 @@ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=4.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_c +Tracking_1C.dump_filename=./epl_tracking_c ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf index 1d76c2a2f..3a90a518d 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf @@ -24,7 +24,7 @@ SignalSource.sampling_frequency=4000000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf index d7a72f476..8f3a44652 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf @@ -51,7 +51,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -86,7 +86,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -103,7 +103,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex @@ -153,7 +153,7 @@ Tracking_1C.dll_bw_narrow_hz=2.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf index 48727d42f..a543752ef 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf @@ -50,7 +50,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf index 478cc875d..b86f734d4 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf @@ -51,7 +51,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf index 3ba4ba52d..ac8157f4e 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf @@ -50,7 +50,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf index 73624bc73..f919973d2 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf @@ -50,7 +50,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf index 9e77cb6ae..746330acf 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf @@ -54,7 +54,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -93,7 +93,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -129,7 +129,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf index f2a47b807..7e494914e 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf @@ -56,7 +56,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -95,7 +95,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -131,7 +131,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex @@ -190,7 +190,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking Tracking_1C.item_type=gr_complex Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=1.5; Tracking_1C.order=3; @@ -215,7 +215,7 @@ Tracking_2S.dll_bw_hz=0.3; Tracking_2S.order=3; Tracking_2S.early_late_space_chips=0.5; Tracking_2S.dump=true -Tracking_2S.dump_filename=../data/epl_tracking_ch_ +Tracking_2S.dump_filename=./epl_tracking_ch_ ;# GALILEO E1B diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf index c6ca7e8e0..7b5609ada 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf @@ -56,7 +56,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter_ch0.dat +InputFilter0.dump_filename=./input_filter_ch0.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -95,7 +95,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -136,7 +136,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Freq_Xlating_Fir_Filter InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter_ch2.dat +InputFilter2.dump_filename=./input_filter_ch2.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex InputFilter2.taps_item_type=float @@ -286,7 +286,7 @@ Tracking_1C.dll_bw_hz=3.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GALILEO E1 TRK CONFIG ############ @@ -298,7 +298,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf index 0abf4188c..0e0f9f289 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf @@ -56,7 +56,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter_ch0.dat +InputFilter0.dump_filename=./input_filter_ch0.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -94,7 +94,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -130,7 +130,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex @@ -212,7 +212,7 @@ Tracking_1C.dll_bw_hz=3.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf index 3f3a9831e..5146a4f1b 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf @@ -30,7 +30,7 @@ SignalConditioner.implementation=Signal_Conditioner ;######### DATA_TYPE_ADAPTER CONFIG ############ DataTypeAdapter.implementation=Ishort_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/data_type_adapter.dat +DataTypeAdapter.dump_filename=./data_type_adapter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Pass_Through @@ -39,7 +39,7 @@ InputFilter.implementation=Pass_Through ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex @@ -70,7 +70,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf index 257bd9091..2a9fedb8d 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf @@ -41,7 +41,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -75,7 +75,7 @@ Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.track_pilot=true Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf index 883927c8e..0b2dffd9b 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf @@ -25,7 +25,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 ; 0 means the entire file SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -62,7 +62,7 @@ InputFilter.sampling_frequency=20480000 InputFilter.IF=5499998.47412109 InputFilter.decimation_factor=8 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -96,7 +96,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf index 9c2ea55cc..75dd5981a 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf @@ -35,7 +35,7 @@ SignalSource.sampling_frequency=50000000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -68,13 +68,13 @@ InputFilter.sampling_frequency=50000000 InputFilter.IF=-15345000 InputFilter.decimation_factor=1 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf index a0715fba8..638a045d6 100644 --- a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf +++ b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf @@ -81,7 +81,7 @@ Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 Acquisition_1B.bit_transition_flag=true Acquisition_1B.dump=false -Acquisition_1B.dump_filename=../data/acq_dump.dat +Acquisition_1B.dump_filename=./acq_dump.dat ;######### TRACKING GPS CONFIG ############ @@ -91,7 +91,7 @@ Tracking_1C.pll_bw_hz=30.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -109,7 +109,7 @@ Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.early_late_space_narrow_chips=0.06; Tracking_1B.very_early_late_space_narrow_chips=0.25; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf index 91387a875..cf17d5140 100644 --- a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf +++ b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf @@ -25,7 +25,7 @@ SignalSource.sampling_frequency=16368000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -39,7 +39,7 @@ DataTypeAdapter.item_type=gr_complex ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex @@ -110,7 +110,7 @@ Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 Acquisition_1B.bit_transition_flag=true Acquisition_1B.dump=false -Acquisition_1B.dump_filename=../data/acq_dump.dat +Acquisition_1B.dump_filename=./acq_dump.dat ;######### TRACKING GPS CONFIG ############ @@ -120,7 +120,7 @@ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking @@ -137,7 +137,7 @@ Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.early_late_space_narrow_chips=0.15; Tracking_1B.very_early_late_space_narrow_chips=0.30; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf index 021b12ae8..12378e46f 100644 --- a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf +++ b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf @@ -11,7 +11,7 @@ GNSS-SDR.num_sources=2 ;######### SIGNAL_SOURCE CONFIG ############ SignalSource0.implementation=File_Signal_Source -SignalSource0.filename=../data/NT1065_L1_20160923_fs6625e6_if60e3_schar.bin ; <- PUT YOUR FILE HERE +SignalSource0.filename=./NT1065_L1_20160923_fs6625e6_if60e3_schar.bin ; <- PUT YOUR FILE HERE SignalSource0.item_type=ibyte SignalSource0.sampling_frequency=6625000 SignalSource0.samples=0 @@ -19,7 +19,7 @@ SignalSource0.dump=false; SignalSource0.dump_filename=/archive/signal_glonass.bin SignalSource1.implementation=File_Signal_Source -SignalSource1.filename=../data/NT1065_GLONASS_L1_20160923_fs6625e6_if0e3_schar.bin ; <- PUT YOUR FILE HERE +SignalSource1.filename=./NT1065_GLONASS_L1_20160923_fs6625e6_if0e3_schar.bin ; <- PUT YOUR FILE HERE SignalSource1.item_type=ibyte SignalSource1.sampling_frequency=6625000 SignalSource1.samples=0 diff --git a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf index 8f8baecfc..254196c30 100644 --- a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf +++ b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf @@ -23,7 +23,7 @@ SignalSource.repeat=false SignalSource.sample_type=iq SignalSource.seconds_to_skip=0 SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -69,7 +69,7 @@ Acquisition_1R.tong_max_dwells=20 Tracking_1R.implementation=GLONASS_L1_CA_DLL_PLL_C_Aid_Tracking Tracking_1R.item_type=cshort Tracking_1R.dump=false -Tracking_1R.dump_filename=../data/epl_tracking_ch_ +Tracking_1R.dump_filename=./epl_tracking_ch_ Tracking_1R.pll_bw_hz=40.0; Tracking_1R.dll_bw_hz=4.0; Tracking_1R.order=3; diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf index 3daee47ce..7e0df6bd2 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf @@ -35,7 +35,7 @@ InputFilter.implementation=Pass_Through InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -44,7 +44,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=20000000 Resampler.sample_freq_out=20000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -113,7 +113,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.dll_bw_narrow_hz=1.5; Tracking_1C.order=2; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -125,7 +125,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf index b92bdc4a9..1360f71bf 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf @@ -22,7 +22,7 @@ SignalSource.sampling_frequency=4000000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -32,12 +32,12 @@ SignalConditioner.implementation=Signal_Conditioner ;######### DATA_TYPE_ADAPTER CONFIG ############ DataTypeAdapter.implementation=Ibyte_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/DataTypeAdapter.dat +DataTypeAdapter.dump_filename=./DataTypeAdapter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Pass_Through InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex @@ -106,14 +106,14 @@ Tracking_1C.order=3; Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking Tracking_1B.item_type=gr_complex Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ Tracking_1B.pll_bw_hz=15.0; Tracking_1B.dll_bw_hz=2.0; Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf index b375cec21..aa404633c 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf @@ -85,7 +85,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.dll_bw_narrow_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -98,7 +98,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf index 3931754e0..c9f0de8f5 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf @@ -56,7 +56,7 @@ InputFilter.output_item_type=gr_complex Resampler.implementation=Pass_Through Resampler.item_type=gr_complex Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -111,7 +111,7 @@ Tracking_1C.pll_bw_hz=50.0; Tracking_1C.dll_bw_hz=5.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -123,7 +123,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf b/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf index a9ec9e564..ebff509e6 100644 --- a/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf +++ b/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf @@ -57,7 +57,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter_ch0.dat +InputFilter0.dump_filename=./input_filter_ch0.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -96,7 +96,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -135,7 +135,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Freq_Xlating_Fir_Filter InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter_ch2.dat +InputFilter2.dump_filename=./input_filter_ch2.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex InputFilter2.taps_item_type=float @@ -294,7 +294,7 @@ 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=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GALILEO E1 TRK CONFIG ############ Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking @@ -305,7 +305,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf index 5838a3b88..04070f0b7 100644 --- a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf +++ b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf @@ -45,7 +45,7 @@ DataTypeAdapter0.implementation=Ishort_To_Complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Pass_Through InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex @@ -54,7 +54,7 @@ InputFilter0.output_item_type=gr_complex ;######### RESAMPLER 1 CONFIG ############ Resampler1.implementation=Pass_Through Resampler1.dump=false -Resampler1.dump_filename=../data/resampler.dat +Resampler1.dump_filename=./resampler.dat Resampler1.item_type=gr_complex Resampler1.sample_freq_in=4000000 Resampler1.sample_freq_out=4000000 @@ -73,7 +73,7 @@ InputFilter1.dump=false ;######### RESAMPLER 1 CONFIG ############ Resampler1.implementation=Pass_Through Resampler1.dump=false -Resampler1.dump_filename=../data/resampler.dat. +Resampler1.dump_filename=./resampler.dat. Resampler1.item_type=gr_complex Resampler1.sample_freq_in=4000000 Resampler1.sample_freq_out=4000000 @@ -126,7 +126,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=4.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -138,7 +138,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf index c5c5e9134..671dd346d 100644 --- a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf +++ b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf @@ -48,7 +48,7 @@ DataTypeAdapter0.item_type=float ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=float InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -83,7 +83,7 @@ DataTypeAdapter1.item_type=float ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=float InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -184,7 +184,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -196,7 +196,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf index d0682aa30..0452136ec 100644 --- a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf +++ b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf @@ -39,7 +39,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -53,7 +53,7 @@ DataTypeAdapter.item_type=float ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=float InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -80,7 +80,7 @@ InputFilter.decimation_factor=8 ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex @@ -120,7 +120,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ Tracking_2S.implementation=GPS_L2_M_DLL_PLL_Tracking @@ -130,7 +130,7 @@ Tracking_2S.dll_bw_hz=0.4; Tracking_2S.order=2; Tracking_2S.early_late_space_chips=0.5; Tracking_2S.dump=true -Tracking_2S.dump_filename=../data/epl_tracking_ch_ +Tracking_2S.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf index a127a5870..ef553d655 100644 --- a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf +++ b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf @@ -37,7 +37,7 @@ SignalSource.repeat=false ;#dump: Dump the Signal source data to a file. Disable this option in this version SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;#enable_throttle_control: Enabling this option tells the signal source to keep the delay between samples in post processing. @@ -72,7 +72,7 @@ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false ;#dump_filename: Log path and filename. -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;#The following options are used in the filter design of Fir_Filter and Freq_Xlating_Fir_Filter implementation. ;#These options are based on parameters of gnuradio's function: gr_remez. @@ -169,7 +169,7 @@ Tracking_1C.implementation=GPS_L1_CA_Gaussian_Tracking Tracking_1C.item_type=gr_complex Tracking_1C.if=0 Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ Tracking_1C.pll_bw_hz=15.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; diff --git a/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf b/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf index 91bbc1c69..8e2e10e7b 100644 --- a/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf +++ b/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf @@ -22,7 +22,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -56,7 +56,7 @@ InputFilter.sampling_frequency=20480000 InputFilter.IF=5499998.47412109 InputFilter.decimation_factor=8 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -129,7 +129,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.dll_bw_narrow_hz=1.5; Tracking_1C.order=2; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -141,7 +141,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Other/front-end-cal.conf b/conf/Other/front-end-cal.conf index 39510a009..2753abf6d 100644 --- a/conf/Other/front-end-cal.conf +++ b/conf/Other/front-end-cal.conf @@ -85,7 +85,7 @@ SignalSource.repeat=false ;#dump: Dump the Signal source data to a file. SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ ;## It holds blocks to change data type, filter and resample input data. @@ -102,7 +102,7 @@ DataTypeAdapter.implementation=Pass_Through ;#dump: Dump the filtered data to a file. DataTypeAdapter.dump=false ;#dump_filename: Log path and filename. -DataTypeAdapter.dump_filename=../data/data_type_adapter.dat +DataTypeAdapter.dump_filename=./data_type_adapter.dat ;######### INPUT_FILTER CONFIG ############ ;## Filter the input data. Can be combined with frequency translation for IF signals @@ -176,7 +176,7 @@ InputFilter.decimation_factor=1 InputFilter.dump=false ;#dump_filename: Log path and filename. -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ ;## Resamples the input data. diff --git a/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf b/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf index c1b99441b..f920c7cb6 100644 --- a/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf +++ b/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf @@ -21,7 +21,7 @@ SignalSource.item_type=gr_complex SignalSource.samples=250000000 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -51,7 +51,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking_GPU Tracking_1C.item_type=gr_complex Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; diff --git a/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf b/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf index 01209aefb..699640977 100644 --- a/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf +++ b/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf @@ -54,7 +54,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -68,7 +68,7 @@ DataTypeAdapter.item_type=float ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=float InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -94,7 +94,7 @@ InputFilter.decimation_factor=8 ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex @@ -123,7 +123,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf b/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf index b0d592f84..94ab55c7c 100644 --- a/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf +++ b/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf @@ -49,7 +49,7 @@ InputFilter.Pfa=0.001 InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### CHANNELS GLOBAL CONFIG ############ Channels_1C.count=8 @@ -80,7 +80,7 @@ Tracking_1C.dll_bw_narrow_hz=1.5; Tracking_1C.fll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf index 67c4d60e1..efef7d428 100644 --- a/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf +++ b/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf @@ -36,7 +36,7 @@ SignalSource.sampling_frequency=19200000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -70,13 +70,13 @@ InputFilter.sampling_frequency=19200000 InputFilter.IF=4024000 InputFilter.decimation_factor=6 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf index 3fc5c22d2..1b057e4aa 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf @@ -31,7 +31,7 @@ SignalSource.gain_rx2=64 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_dds_lo=false SignalSource.freq_rf_tx_hz=1260000000 SignalSource.freq_dds_tx_hz=1000 diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf index f0ab33656..12c4bd0ee 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf @@ -41,7 +41,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -73,7 +73,7 @@ InputFilter.grid_density=16 InputFilter.sampling_frequency=4000000 InputFilter.IF=0 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -82,7 +82,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf index 04afb9a6c..e75b568dc 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf @@ -40,7 +40,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf index e751730de..c2ec58cd6 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf @@ -53,7 +53,7 @@ InputFilter.band2_error=1.0 InputFilter.filter_type=bandpass InputFilter.grid_density=16 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf index df763f64e..deef32d6f 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf @@ -41,7 +41,7 @@ SignalSource.gain_rx1=64 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ SignalConditioner.implementation=Signal_Conditioner @@ -52,7 +52,7 @@ DataTypeAdapter.implementation=Pass_Through ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf index 370931cca..000e2cb18 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf @@ -43,7 +43,7 @@ SignalSource.AGC_enabled = false SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.address=127.0.0.1 SignalSource.port=1234 SignalSource.swap_iq=false @@ -58,7 +58,7 @@ DataTypeAdapter.implementation=Pass_Through ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf index 8994bb3f3..149aa8b13 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf @@ -44,7 +44,7 @@ SignalSource.AGC_enabled = false SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;# Please note that the new RTL-SDR Blog V3 dongles ship a < 1 PPM ;# temperature compensated oscillator (TCXO), which is well suited for GNSS @@ -68,7 +68,7 @@ DataTypeAdapter.implementation=Pass_Through ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float diff --git a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf index cffb6f9b0..74e1fdbf0 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf @@ -39,7 +39,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -73,13 +73,13 @@ InputFilter.sampling_frequency=20000000 InputFilter.IF=-1600000 InputFilter.decimation_factor=1 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex Resampler.sample_freq_in=2000000 Resampler.sample_freq_out=2000000 diff --git a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf index a221b7169..9bf551da0 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf @@ -42,7 +42,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -79,12 +79,12 @@ InputFilter.sampling_frequency=4000000 InputFilter.IF=0 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 diff --git a/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf index b49801d10..fe0ca55d2 100644 --- a/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf @@ -27,7 +27,7 @@ SignalSource.gain=50 SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -62,7 +62,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ diff --git a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf index 0c53dedb1..6ed59bd79 100644 --- a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf @@ -54,7 +54,7 @@ InputFilter0.tw=500000 InputFilter0.IF=-22902000 InputFilter0.sampling_frequency=56000000 InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter @@ -68,7 +68,7 @@ InputFilter1.tw=500000 InputFilter1.IF=-8580000 InputFilter1.sampling_frequency=56000000 InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter2.implementation=Freq_Xlating_Fir_Filter @@ -82,7 +82,7 @@ InputFilter2.tw=500000 InputFilter2.IF=18000000 InputFilter2.sampling_frequency=56000000 InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler0.implementation=Pass_Through diff --git a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf index 0844dd1da..05ff16b75 100644 --- a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf @@ -55,7 +55,7 @@ InputFilter0.tw=1000000 InputFilter0.IF=-6322000 InputFilter0.sampling_frequency=20000000 InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter @@ -70,7 +70,7 @@ InputFilter1.tw=1000000 InputFilter1.IF=8000000 InputFilter1.sampling_frequency=20000000 InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat diff --git a/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf index 61f18e09f..de70827ed 100644 --- a/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf @@ -59,7 +59,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Pass_Through InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex @@ -74,7 +74,7 @@ SignalConditioner1.implementation=Pass_Through ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index 3f4b61766..16cb1e865 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -68,13 +68,13 @@ InputFilter.grid_density=16 InputFilter.sampling_frequency=4000000 InputFilter.IF=0 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -113,7 +113,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=3.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/data/.gitignore b/data/.gitignore deleted file mode 100644 index 08e486f4d..000000000 --- a/data/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades -# Ignore everything in this directory -* -# Except this file -!.gitignore diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 290c0e976..320421956 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -111,6 +111,18 @@ All notable changes to GNSS-SDR will be documented in this file. - Tidy up the `conf/` folder. - Add `install` and `uninstall` targets to the `nav_msg_listener` utility. +- **Potential Breaking Change**: The source tree has been refactored to follow a + more conventional folder structure. This may disrupt user pipelines that + relied on the previous structure and could break development branches that + were branched off from `next` before this change. The key changes are: + + - The `tests` and `utils` directories have been moved from the `src` folder to + the root of the source tree. + - The empty `build` and `data` folders have been removed. Users can create a + building folder using `mkdir build` or by having CMake handle it: + `cmake -S . -B build`. + - All default names for dump or input files starting with `../data/` + have been changed to `./`. See the definitions of concepts and metrics at https://gnss-sdr.org/design-forces/ diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox index 5545c2bae..cdb5774ba 100644 --- a/docs/doxygen/other/main_page.dox +++ b/docs/doxygen/other/main_page.dox @@ -101,10 +101,8 @@ $ git clone https://github.com/gnss-sdr/gnss-sdr This will create a folder named gnss-sdr with the following structure: \verbatim |-gnss-sdr - |---build <- where gnss-sdr is built |---cmake <- CMake-related files |---conf <- Configuration files. Each file represents one receiver. - |---data <- Populate this folder with your captured data. |---docs <- Contains documentation-related files |---install <- Executables |---src <- Source code folder @@ -127,13 +125,13 @@ This will create a folder named gnss-sdr with the following structure: |-------receiver |-------system_parameters |-----main - |-----tests - |-----utils <- some utilities (e.g. Matlab scripts) + |---tests + |---utils <- some utilities (e.g. Matlab scripts) \endverbatim You are now ready to build GNSS-SDR by using CMake as building tool: \verbatim -$ cd gnss-sdr/build +$ cd gnss-sdr && mkdir build && cd build $ cmake .. $ make \endverbatim @@ -153,10 +151,10 @@ You can create the documentation by doing: $ make doc \endverbatim -from the gnss-sdr/build folder. In both cases, Doxygen will generate HTML documentation that can be +from the building folder. In both cases, Doxygen will generate HTML documentation that can be retrieved pointing your browser of preference to gnss-sdr/docs/html/index.html. -There are two more extra targets available. From the gnss-sdr/build folder: +There are two more extra targets available. In the buiding folder: \verbatim $ make doc-clean \endverbatim @@ -177,10 +175,9 @@ By default, CMake will build the Release version, meaning that the compiler will a RF front-end and you need to attain real time. If working with a file (and thus without real-time constraints), you may want to obtain more information about the internals of the receiver, as well as more fine-grained logging. This can be done by building the Debug version, by doing: \verbatim -$ cd gnss-sdr/build +$ cd gnss-sdr && mkdir build-debug && cd build-debug $ cmake -DCMAKE_BUILD_TYPE=Debug .. $ make -$ sudo make install \endverbatim \subsection updating_gnss-sdr Updating GNSS-SDR @@ -191,8 +188,8 @@ $ git pull https://github.com/gnss-sdr/gnss-sdr next \endverbatim Before rebuiling the source code, it is safe (and recommended) to remove the remainders of old builds: \verbatim -$ cd gnss-sdr/build -$ sudo make uninstall +$ cd +$ sudo make uninstall ; if you installed it before $ rm -rf * \endverbatim @@ -215,7 +212,7 @@ and we will be happy to upload it to the server. You can use a single configuration file for processing different data files, specifying the file to be processed with the --signal_source flag: \verbatim -$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=../data/my_captured_data.dat +$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=./my_captured_data.dat \endverbatim This will override the SignalSource.filename specified in the configuration file. diff --git a/docs/xml-schemas/README.md b/docs/xml-schemas/README.md index eae9b1a70..1966290f6 100644 --- a/docs/xml-schemas/README.md +++ b/docs/xml-schemas/README.md @@ -51,6 +51,6 @@ Please check https://gnss-sdr.org/docs/sp-blocks/global-parameters/ for more information about the usage of XML files in GNSS-SDR. You could find useful the utility program -[rinex2assist](https://github.com/gnss-sdr/gnss-sdr/tree/next/src/utils/rinex2assist) +[rinex2assist](https://github.com/gnss-sdr/gnss-sdr/tree/next/utils/rinex2assist) for the generation of compatible XML files from recent, publicly available RINEX navigation data files. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab56014db..7b3c36c7b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,3 @@ add_subdirectory(algorithms) add_subdirectory(core) add_subdirectory(main) -if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) - add_subdirectory(tests) -endif() -add_subdirectory(utils) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index 903a3748c..1efbcfe4d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -57,7 +57,7 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index 700644227..dab9dcc47 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -48,7 +48,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index cafbcf33b..16a13e02d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -57,7 +57,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index fca12dbfe..27a60b479 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -59,7 +59,7 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index 5fcb2658c..153412bc0 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -66,7 +66,7 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role_ + ".item_type", default_item_type); dump_filename_ = configuration_->property(role_ + ".dump_filename", default_dump_filename); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000); diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index ed095a757..24d8eee4e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -591,7 +591,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items std::stringstream filename; std::streamsize n = sizeof(float) * (d_fft_size); // noncomplex file write filename.str(""); - filename << "../data/test_statistics_E5a_sat_" + filename << "./test_statistics_E5a_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); if (d_sampled_ms > 1) // If integration time > 1 code @@ -694,7 +694,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items std::stringstream filename; std::streamsize n = sizeof(float) * (d_num_doppler_bins); // noncomplex file write filename.str(""); - filename << "../data/test_statistics_E5a_sat_" << d_gnss_synchro->PRN << "_CAF.dat"; + filename << "./test_statistics_E5a_sat_" << d_gnss_synchro->PRN << "_CAF.dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); d_dump_file.write(reinterpret_cast(d_CAF_vector.data()), n); d_dump_file.close(); diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 8bc915769..b5dc2b0ba 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -336,7 +336,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 34eb3d189..91ce7b3d0 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -263,7 +263,7 @@ float pcps_assisted_acquisition_cc::search_maximum() std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << d_gnss_synchro->Acq_doppler_hz << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index ed4ed9ddb..3ad78883c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -352,7 +352,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 5f2fa348c..fbd1b2052 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -429,7 +429,7 @@ void pcps_opencl_acquisition_cc::acquisition_core_volk() std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); @@ -590,7 +590,7 @@ void pcps_opencl_acquisition_cc::acquisition_core_opencl() std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); 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 fdd6d918a..d54b8085a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -436,7 +436,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); 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 42c131337..75f8325d5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -342,7 +342,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); 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 afb062772..b853cebc1 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -35,7 +35,7 @@ ByteToShort::ByteToShort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("short"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc b/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc index 7eb94a519..ad63835ce 100644 --- a/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc +++ b/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc @@ -32,7 +32,7 @@ CshortToGrComplex::CshortToGrComplex(const ConfigurationInterface* configuration out_streams_(out_streams), dump_(configuration->property(role_ + ".dump", false)) { - const std::string default_dump_filename("../data/data_type_adapter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; 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 835ec2021..a675a57d5 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -37,7 +37,7 @@ IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("lv_8sc_t"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; 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 a79458e5b..7df423095 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -34,7 +34,7 @@ IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, cons { const std::string default_input_item_type("byte"); const std::string default_output_item_type("gr_complex"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; 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 2420bcd0f..94dbd8afe 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -36,7 +36,7 @@ IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("cshort"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; 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 18d8df571..9a86a2a2f 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -34,7 +34,7 @@ IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, { const std::string default_input_item_type("short"); const std::string default_output_item_type("gr_complex"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; 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 80e1c680a..9f5f546ca 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -36,7 +36,7 @@ IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("short"); const std::string default_output_item_type("cshort"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index 12cef24ca..92c84645a 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -142,7 +142,7 @@ void FirFilter::init() const std::string default_input_item_type("gr_complex"); const std::string default_output_item_type("gr_complex"); const std::string default_taps_item_type("float"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); const std::string default_filter_type("bandpass"); const std::vector default_bands = {0.0, 0.4, 0.6, 1.0}; const std::vector default_ampl = {1.0, 1.0, 0.0, 0.0}; 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 1378931c8..ba75c6f67 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -41,7 +41,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu const std::string default_input_item_type("gr_complex"); const std::string default_output_item_type("gr_complex"); const std::string default_taps_item_type("float"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); const double default_intermediate_freq = 0.0; const double default_sampling_freq = 4000000.0; const int default_number_of_taps = 6; diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index 8971d2c9d..8732ba4f8 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -39,7 +39,7 @@ PulseBlankingFilter::PulseBlankingFilter(const ConfigurationInterface* configura out_streams_(out_streams) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); const float default_pfa_ = 0.04; const float pfa = configuration->property(role_ + ".pfa", default_pfa_); const int default_length_ = 32; diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/.gitignore b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/.gitignore index a3bcb1ddf..e0043b895 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/.gitignore +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/.gitignore @@ -3,16 +3,16 @@ *~ *.pyc *.pyo -html/ -build/ -cmake_build/ -cmake-build-*/ -out/ +*.swp +/*build*/ +/archives/ +/.DS_Store +/gen/volk_gnsssdr_arch_defs.py +/html/ +/out/ .project .cproject .vagrant/ .vscode/ .vs/ -*.swp -/.DS_Store -/gen/volk_gnsssdr_arch_defs.py + diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h index 07eb3f849..63b1bd429 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Carles Fernandez-Prades #ifndef _MSC_VER // [ #error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] +#else #ifndef _MSC_SYS_TIME_H #define _MSC_SYS_TIME_H @@ -72,3 +72,6 @@ static inline int gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } + +#endif // _MSC_SYS_TIME_H +#endif // _MSC_VER \ No newline at end of file diff --git a/src/algorithms/signal_source/adapters/fifo_signal_source.cc b/src/algorithms/signal_source/adapters/fifo_signal_source.cc index c4f0fd08b..1064166db 100644 --- a/src/algorithms/signal_source/adapters/fifo_signal_source.cc +++ b/src/algorithms/signal_source/adapters/fifo_signal_source.cc @@ -35,7 +35,7 @@ FifoSignalSource::FifoSignalSource(ConfigurationInterface const* configuration, [[maybe_unused]] Concurrent_Queue* queue) : SignalSourceBase(configuration, role, "Fifo_Signal_Source"s), item_size_(sizeof(gr_complex)), // currenty output item size is always gr_complex - fifo_reader_(FifoReader::make(configuration->property(role + ".filename", "../data/example_capture.dat"s), + fifo_reader_(FifoReader::make(configuration->property(role + ".filename", "./example_capture.dat"s), configuration->property(role + ".sample_type", "ishort"s))), dump_(configuration->property(role + ".dump", false)), dump_filename_(configuration->property(role + ".dump_filename", "./data/signal_source.dat"s)) diff --git a/src/algorithms/signal_source/adapters/file_source_base.cc b/src/algorithms/signal_source/adapters/file_source_base.cc index f2d50abb0..567ae92e3 100644 --- a/src/algorithms/signal_source/adapters/file_source_base.cc +++ b/src/algorithms/signal_source/adapters/file_source_base.cc @@ -48,8 +48,8 @@ FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std: : SignalSourceBase(configuration, role, std::move(impl)), queue_(queue), role_(role), - filename_(configuration->property(role_ + ".filename"s, "../data/example_capture.dat"s)), - dump_filename_(configuration->property(role_ + ".dump_filename"s, "../data/my_capture.dat"s)), + filename_(configuration->property(role_ + ".filename"s, "./example_capture.dat"s)), + dump_filename_(configuration->property(role_ + ".dump_filename"s, "./my_capture.dat"s)), item_type_(configuration->property(role_ + ".item_type"s, std::move(default_item_type))), item_size_(0), header_size_(configuration->property(role_ + ".header_size"s, uint64_t(0))), diff --git a/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc b/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc index 92788ee02..0286c6ea3 100644 --- a/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc @@ -34,7 +34,7 @@ FileTimestampSignalSource::FileTimestampSignalSource(const ConfigurationInterfac unsigned int out_streams, Concurrent_Queue* queue) : FileSourceBase(configuration, role, "File_Timestamp_Signal_Source"s, queue, "byte"s), - timestamp_file_(configuration->property(role + ".timestamp_filename"s, "../data/example_capture_timestamp.dat"s)), + timestamp_file_(configuration->property(role + ".timestamp_filename"s, "./example_capture_timestamp.dat"s)), timestamp_clock_offset_ms_(configuration->property(role + ".timestamp_clock_offset_ms"s, 0.0)) { if (in_streams > 0) diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc index 00f2be229..c92c35433 100644 --- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc +++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc @@ -61,7 +61,7 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura Concurrent_Queue* queue) : SignalSourceBase(configuration, role, "ION_GSMS_Signal_Source"s), stream_ids_(parse_comma_list(configuration->property(role + ".streams"s, ""s))), - metadata_filepath_(configuration->property(role + ".metadata_filename"s, "../data/example_capture_metadata.sdrx"s)), + metadata_filepath_(configuration->property(role + ".metadata_filename"s, "./example_capture_metadata.sdrx"s)), in_streams_(in_streams), out_streams_(out_streams) { 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 a9b503c14..1b29d773e 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 @@ -54,8 +54,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInte enable_throttle_control_(configuration->property(role + ".enable_throttle_control", false)), endian_swap_(configuration->property(role + ".endian", false)) { - const std::string default_filename("../data/my_capture.dat"); - const std::string default_dump_filename("../data/my_capture_dump.dat"); + const std::string default_filename("./my_capture.dat"); + const std::string default_dump_filename("./my_capture_dump.dat"); filename_ = configuration->property(role + ".filename", default_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); diff --git a/src/tests/CMakeLists.txt b/tests/CMakeLists.txt similarity index 98% rename from src/tests/CMakeLists.txt rename to tests/CMakeLists.txt index 770dff763..78171ae9d 100644 --- a/src/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -366,14 +366,14 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) if(CMAKE_VERSION VERSION_GREATER 3.17.0) set(GNSSTK_PATCH_COMMAND cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} && - ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/src/tests/data/gnsstk_static14.patch && - ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/src/tests/data/gnsstk_gcc13.patch + ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_static14.patch && + ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_gcc13.patch ) else() set(GNSSTK_PATCH_COMMAND cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} && - ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/src/tests/data/gnsstk_static13.patch && - ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/src/tests/data/gnsstk_gcc13.patch + ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_static13.patch && + ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_gcc13.patch ) endif() # Patch only once @@ -623,12 +623,12 @@ if(NOT ENABLE_PACKAGING) install(FILES ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION share/gnss-sdr/signal_samples) install(FILES ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION share/gnss-sdr/signal_samples) install(FILES ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin DESTINATION share/gnss-sdr/signal_samples) - install(FILES ${GNSSSDR_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) - install(FILES ${GNSSSDR_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) + install(FILES ${GNSSSDR_SOURCE_DIR}/tests/data/rtklib_test/obs_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) + install(FILES ${GNSSSDR_SOURCE_DIR}/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) add_definitions(-DTEST_PATH="${CMAKE_INSTALL_PREFIX}/share/gnss-sdr/") else() - file(COPY ${GNSSSDR_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION ${GNSSSDR_BINARY_DIR}/thirdparty/data/rtklib_test) - file(COPY ${GNSSSDR_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION ${GNSSSDR_BINARY_DIR}/thirdparty/data/rtklib_test) + file(COPY ${GNSSSDR_SOURCE_DIR}/tests/data/rtklib_test/obs_test1.xml DESTINATION ${GNSSSDR_BINARY_DIR}/thirdparty/data/rtklib_test) + file(COPY ${GNSSSDR_SOURCE_DIR}/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION ${GNSSSDR_BINARY_DIR}/thirdparty/data/rtklib_test) add_definitions(-DTEST_PATH="${GNSSSDR_BINARY_DIR}/thirdparty/") endif() endif() @@ -687,7 +687,7 @@ if(ENABLE_UNIT_TESTING) endif() target_include_directories(run_tests INTERFACE - ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + ${GNSSSDR_SOURCE_DIR}/tests/common-files ) if(GNURADIO_USES_STD_POINTERS) target_compile_definitions(run_tests @@ -838,7 +838,7 @@ if(ENABLE_FPGA) target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga INTERFACE "$") endif() target_include_directories(gps_l1_ca_dll_pll_tracking_test_fpga - INTERFACE ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + INTERFACE ${GNSSSDR_SOURCE_DIR}/tests/common-files ) xcode_remove_warning_duplicates(gps_l1_ca_dll_pll_tracking_test_fpga) install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga @@ -873,7 +873,7 @@ function(add_system_test executable) endif() target_include_directories(${executable} PRIVATE ${OPT_INCLUDES_} - INTERFACE ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + INTERFACE ${GNSSSDR_SOURCE_DIR}/tests/common-files ) target_link_libraries(${executable} PRIVATE ${OPT_LIBS_} algorithms_libs) if(NOT ENABLE_GLOG_AND_GFLAGS) @@ -1098,7 +1098,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_include_directories(gnss_block_test PRIVATE ${GNSSSDR_SOURCE_DIR}/src/algorithms/libs - INTERFACE ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + INTERFACE ${GNSSSDR_SOURCE_DIR}/tests/common-files ) if(ENABLE_FPGA) @@ -1188,7 +1188,7 @@ endif() target_include_directories(matio_test INTERFACE - ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + ${GNSSSDR_SOURCE_DIR}/tests/common-files ) xcode_remove_warning_duplicates(matio_test) @@ -1238,7 +1238,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) endif() target_include_directories(acq_test INTERFACE - ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + ${GNSSSDR_SOURCE_DIR}/tests/common-files ) if(PMT_USES_BOOST_ANY) target_compile_definitions(acq_test diff --git a/src/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt similarity index 98% rename from src/tests/benchmarks/CMakeLists.txt rename to tests/benchmarks/CMakeLists.txt index 31ebf9f82..7d94d9e9b 100644 --- a/src/tests/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt @@ -112,7 +112,7 @@ endif() add_benchmark(benchmark_atan2 Gnuradio::runtime) add_benchmark(benchmark_copy) add_benchmark(benchmark_crypto core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES}) -add_benchmark(benchmark_osnma core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES}) +# add_benchmark(benchmark_osnma core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES}) add_benchmark(benchmark_detector core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES}) add_benchmark(benchmark_preamble core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES}) add_benchmark(benchmark_reed_solomon core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES}) diff --git a/src/tests/benchmarks/README.md b/tests/benchmarks/README.md similarity index 100% rename from src/tests/benchmarks/README.md rename to tests/benchmarks/README.md diff --git a/src/tests/benchmarks/benchmark_atan2.cc b/tests/benchmarks/benchmark_atan2.cc similarity index 100% rename from src/tests/benchmarks/benchmark_atan2.cc rename to tests/benchmarks/benchmark_atan2.cc diff --git a/src/tests/benchmarks/benchmark_copy.cc b/tests/benchmarks/benchmark_copy.cc similarity index 100% rename from src/tests/benchmarks/benchmark_copy.cc rename to tests/benchmarks/benchmark_copy.cc diff --git a/src/tests/benchmarks/benchmark_crypto.cc b/tests/benchmarks/benchmark_crypto.cc similarity index 100% rename from src/tests/benchmarks/benchmark_crypto.cc rename to tests/benchmarks/benchmark_crypto.cc diff --git a/src/tests/benchmarks/benchmark_detector.cc b/tests/benchmarks/benchmark_detector.cc similarity index 92% rename from src/tests/benchmarks/benchmark_detector.cc rename to tests/benchmarks/benchmark_detector.cc index 5679e9c3b..61da0f70c 100644 --- a/src/tests/benchmarks/benchmark_detector.cc +++ b/tests/benchmarks/benchmark_detector.cc @@ -42,9 +42,9 @@ void bm_forloop(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; for (size_t i = 0; i < d_preamble_samples.size(); i++) { if (d_symbol_history[i] < 0.0) @@ -57,6 +57,10 @@ void bm_forloop(benchmark::State& state) } } } + if (corr_value) + { + // avoidl warning + }; } @@ -73,14 +77,18 @@ void bm_accumulate(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::accumulate(d_symbol_history.begin(), d_symbol_history.end(), 0, [&d_preamble_samples, n = 0](float a, float b) mutable { return (b > 0.0 ? a + d_preamble_samples[n++] : a - d_preamble_samples[n++]); }); } + if (corr_value) + { + // avoidl warning + }; } @@ -97,9 +105,9 @@ void bm_inner_product(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::inner_product(d_symbol_history.begin(), d_symbol_history.end(), d_preamble_samples.begin(), @@ -111,6 +119,10 @@ void bm_inner_product(benchmark::State& state) #endif [](float a, int32_t b) { return (std::signbit(a) ? -b : b); }); } + if (corr_value) + { + // avoidl warning + }; } @@ -128,9 +140,9 @@ void bm_transform_reduce(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::transform_reduce(d_symbol_history.begin(), d_symbol_history.end(), d_preamble_samples.begin(), @@ -138,6 +150,10 @@ void bm_transform_reduce(benchmark::State& state) std::plus<>(), [](auto a, auto b) { return (std::signbit(a) ? -b : b); }); } + if (corr_value) + { + // avoidl warning + }; } #endif @@ -156,9 +172,9 @@ void bm_transform_reduce_policy(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::transform_reduce( std::execution::par, d_symbol_history.begin(), @@ -168,6 +184,10 @@ void bm_transform_reduce_policy(benchmark::State& state) std::plus<>(), [](auto a, auto b) { return (std::signbit(a) ? -b : b); }); } + if (corr_value) + { + // avoidl warning + }; } #endif diff --git a/src/tests/benchmarks/benchmark_osnma.cc b/tests/benchmarks/benchmark_osnma.cc similarity index 100% rename from src/tests/benchmarks/benchmark_osnma.cc rename to tests/benchmarks/benchmark_osnma.cc diff --git a/src/tests/benchmarks/benchmark_preamble.cc b/tests/benchmarks/benchmark_preamble.cc similarity index 100% rename from src/tests/benchmarks/benchmark_preamble.cc rename to tests/benchmarks/benchmark_preamble.cc diff --git a/src/tests/benchmarks/benchmark_reed_solomon.cc b/tests/benchmarks/benchmark_reed_solomon.cc similarity index 100% rename from src/tests/benchmarks/benchmark_reed_solomon.cc rename to tests/benchmarks/benchmark_reed_solomon.cc diff --git a/src/tests/common-files/gnuplot_i.h b/tests/common-files/gnuplot_i.h similarity index 100% rename from src/tests/common-files/gnuplot_i.h rename to tests/common-files/gnuplot_i.h diff --git a/src/tests/common-files/observable_tests_flags.h b/tests/common-files/observable_tests_flags.h similarity index 100% rename from src/tests/common-files/observable_tests_flags.h rename to tests/common-files/observable_tests_flags.h diff --git a/src/tests/common-files/signal_generator_flags.h b/tests/common-files/signal_generator_flags.h similarity index 100% rename from src/tests/common-files/signal_generator_flags.h rename to tests/common-files/signal_generator_flags.h diff --git a/src/tests/common-files/test_flags.h b/tests/common-files/test_flags.h similarity index 100% rename from src/tests/common-files/test_flags.h rename to tests/common-files/test_flags.h diff --git a/src/tests/common-files/tracking_tests_flags.h b/tests/common-files/tracking_tests_flags.h similarity index 100% rename from src/tests/common-files/tracking_tests_flags.h rename to tests/common-files/tracking_tests_flags.h diff --git a/src/tests/data/config_file_sample.txt b/tests/data/config_file_sample.txt similarity index 100% rename from src/tests/data/config_file_sample.txt rename to tests/data/config_file_sample.txt diff --git a/src/tests/data/gnsstk_gcc13.patch b/tests/data/gnsstk_gcc13.patch similarity index 100% rename from src/tests/data/gnsstk_gcc13.patch rename to tests/data/gnsstk_gcc13.patch diff --git a/src/tests/data/gnsstk_static13.patch b/tests/data/gnsstk_static13.patch similarity index 100% rename from src/tests/data/gnsstk_static13.patch rename to tests/data/gnsstk_static13.patch diff --git a/src/tests/data/gnsstk_static14.patch b/tests/data/gnsstk_static14.patch similarity index 100% rename from src/tests/data/gnsstk_static14.patch rename to tests/data/gnsstk_static14.patch diff --git a/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml b/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml similarity index 100% rename from src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml rename to tests/data/rtklib_test/eph_GPS_L1CA_test1.xml diff --git a/src/tests/data/rtklib_test/obs_test1.xml b/tests/data/rtklib_test/obs_test1.xml similarity index 100% rename from src/tests/data/rtklib_test/obs_test1.xml rename to tests/data/rtklib_test/obs_test1.xml diff --git a/src/tests/single_test_main.cc b/tests/single_test_main.cc similarity index 100% rename from src/tests/single_test_main.cc rename to tests/single_test_main.cc diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/tests/system-tests/libs/CMakeLists.txt similarity index 100% rename from src/tests/system-tests/libs/CMakeLists.txt rename to tests/system-tests/libs/CMakeLists.txt diff --git a/src/tests/system-tests/libs/position_test_flags.h b/tests/system-tests/libs/position_test_flags.h similarity index 100% rename from src/tests/system-tests/libs/position_test_flags.h rename to tests/system-tests/libs/position_test_flags.h diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc b/tests/system-tests/libs/rtklib_solver_dump_reader.cc similarity index 100% rename from src/tests/system-tests/libs/rtklib_solver_dump_reader.cc rename to tests/system-tests/libs/rtklib_solver_dump_reader.cc diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h b/tests/system-tests/libs/rtklib_solver_dump_reader.h similarity index 100% rename from src/tests/system-tests/libs/rtklib_solver_dump_reader.h rename to tests/system-tests/libs/rtklib_solver_dump_reader.h diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc b/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc similarity index 100% rename from src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc rename to tests/system-tests/libs/spirent_motion_csv_dump_reader.cc diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h b/tests/system-tests/libs/spirent_motion_csv_dump_reader.h similarity index 100% rename from src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h rename to tests/system-tests/libs/spirent_motion_csv_dump_reader.h diff --git a/src/tests/system-tests/position_test.cc b/tests/system-tests/position_test.cc similarity index 100% rename from src/tests/system-tests/position_test.cc rename to tests/system-tests/position_test.cc diff --git a/src/tests/system-tests/ttff.cc b/tests/system-tests/ttff.cc similarity index 100% rename from src/tests/system-tests/ttff.cc rename to tests/system-tests/ttff.cc diff --git a/src/tests/test_main.cc b/tests/test_main.cc similarity index 100% rename from src/tests/test_main.cc rename to tests/test_main.cc diff --git a/src/tests/unit-tests/arithmetic/code_generation_test.cc b/tests/unit-tests/arithmetic/code_generation_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/code_generation_test.cc rename to tests/unit-tests/arithmetic/code_generation_test.cc diff --git a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc b/tests/unit-tests/arithmetic/complex_carrier_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/complex_carrier_test.cc rename to tests/unit-tests/arithmetic/complex_carrier_test.cc diff --git a/src/tests/unit-tests/arithmetic/conjugate_test.cc b/tests/unit-tests/arithmetic/conjugate_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/conjugate_test.cc rename to tests/unit-tests/arithmetic/conjugate_test.cc diff --git a/src/tests/unit-tests/arithmetic/fft_length_test.cc b/tests/unit-tests/arithmetic/fft_length_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/fft_length_test.cc rename to tests/unit-tests/arithmetic/fft_length_test.cc diff --git a/src/tests/unit-tests/arithmetic/fft_speed_test.cc b/tests/unit-tests/arithmetic/fft_speed_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/fft_speed_test.cc rename to tests/unit-tests/arithmetic/fft_speed_test.cc diff --git a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc b/tests/unit-tests/arithmetic/magnitude_squared_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/magnitude_squared_test.cc rename to tests/unit-tests/arithmetic/magnitude_squared_test.cc diff --git a/src/tests/unit-tests/arithmetic/matio_test.cc b/tests/unit-tests/arithmetic/matio_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/matio_test.cc rename to tests/unit-tests/arithmetic/matio_test.cc diff --git a/src/tests/unit-tests/arithmetic/multiply_test.cc b/tests/unit-tests/arithmetic/multiply_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/multiply_test.cc rename to tests/unit-tests/arithmetic/multiply_test.cc diff --git a/src/tests/unit-tests/arithmetic/preamble_correlator_test.cc b/tests/unit-tests/arithmetic/preamble_correlator_test.cc similarity index 100% rename from src/tests/unit-tests/arithmetic/preamble_correlator_test.cc rename to tests/unit-tests/arithmetic/preamble_correlator_test.cc diff --git a/src/tests/unit-tests/control-plane/control_thread_test.cc b/tests/unit-tests/control-plane/control_thread_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/control_thread_test.cc rename to tests/unit-tests/control-plane/control_thread_test.cc diff --git a/src/tests/unit-tests/control-plane/file_configuration_test.cc b/tests/unit-tests/control-plane/file_configuration_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/file_configuration_test.cc rename to tests/unit-tests/control-plane/file_configuration_test.cc diff --git a/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc b/tests/unit-tests/control-plane/gnss_block_factory_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/gnss_block_factory_test.cc rename to tests/unit-tests/control-plane/gnss_block_factory_test.cc diff --git a/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc b/tests/unit-tests/control-plane/gnss_flowgraph_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc rename to tests/unit-tests/control-plane/gnss_flowgraph_test.cc diff --git a/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc b/tests/unit-tests/control-plane/in_memory_configuration_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/in_memory_configuration_test.cc rename to tests/unit-tests/control-plane/in_memory_configuration_test.cc diff --git a/src/tests/unit-tests/control-plane/protobuf_test.cc b/tests/unit-tests/control-plane/protobuf_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/protobuf_test.cc rename to tests/unit-tests/control-plane/protobuf_test.cc diff --git a/src/tests/unit-tests/control-plane/string_converter_test.cc b/tests/unit-tests/control-plane/string_converter_test.cc similarity index 100% rename from src/tests/unit-tests/control-plane/string_converter_test.cc rename to tests/unit-tests/control-plane/string_converter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc similarity index 99% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index 0a893e41c..7614c7dfd 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -306,7 +306,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_2() /*Unset this flag to eliminates data logging for the Validation of results probabilities test*/ - dump_test_results = true; + dump_test_results = false; num_of_realizations = 100; @@ -882,7 +882,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul { std::stringstream filenamepd; filenamepd.str(""); - filenamepd << "../data/test_statistics_" << gnss_synchro.System + filenamepd << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_e1_value_CN0_dB_0 << "_dBHz.csv"; @@ -908,7 +908,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul { std::stringstream filenamepf; filenamepf.str(""); - filenamepf << "../data/test_statistics_" << gnss_synchro.System + filenamepf << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_e1_value_CN0_dB_0 << "_dBHz.csv"; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc similarity index 98% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 33d60383e..ae1224f8f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -243,7 +243,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_1() config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); @@ -277,7 +277,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_1() config->set_property("Acquisition_5X.doppler_step", "250"); config->set_property("Acquisition_5X.bit_transition_flag", "false"); config->set_property("Acquisition_5X.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/acquisition.dat"); + config->set_property("SignalSource.dump_filename", "./acquisition.dat"); } @@ -313,7 +313,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_2() config->set_property("Acquisition_5X.doppler_step", "250"); config->set_property("Acquisition_5X.bit_transition_flag", "false"); config->set_property("Acquisition_5X.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/acquisition.dat"); + config->set_property("SignalSource.dump_filename", "./acquisition.dat"); } @@ -393,7 +393,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_3() config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); @@ -424,7 +424,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_3() config->set_property("Acquisition_5X.doppler_step", "250"); config->set_property("Acquisition_5X.bit_transition_flag", "false"); config->set_property("Acquisition_5X.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/acquisition.dat"); + config->set_property("SignalSource.dump_filename", "./acquisition.dat"); } diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc similarity index 99% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index c74b99d29..34f0c1de0 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -200,7 +200,7 @@ void GalileoE5bPcpsAcquisitionTest::init() config->set_property("SignalSource.data_flag", "false"); config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); config->set_property("InputFilter.output_item_type", "gr_complex"); @@ -222,7 +222,7 @@ void GalileoE5bPcpsAcquisitionTest::init() config->set_property("Acquisition_7X.implementation", "Galileo_E5b_PCPS_Acquisition"); config->set_property("Acquisition_7X.item_type", "gr_complex"); config->set_property("Acquisition_7X.coherent_integration_time_ms", std::to_string(integration_time_ms)); - config->set_property("Acquisition_7X.dump", "true"); + config->set_property("Acquisition_7X.dump", "false"); config->set_property("Acquisition_7X.dump_filename", "./acquisition"); config->set_property("Acquisition_7X.threshold", "0.001"); config->set_property("Acquisition_7X.doppler_max", "10000"); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc similarity index 99% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc index 497ced58f..8f433b5d2 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc @@ -200,7 +200,7 @@ void GalileoE6PcpsAcquisitionTest::init() config->set_property("SignalSource.data_flag", "false"); config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); config->set_property("InputFilter.output_item_type", "gr_complex"); @@ -222,7 +222,7 @@ void GalileoE6PcpsAcquisitionTest::init() config->set_property("Acquisition_E6.implementation", "Galileo_E6_PCPS_Acquisition"); config->set_property("Acquisition_E6.item_type", "gr_complex"); config->set_property("Acquisition_E6.coherent_integration_time_ms", std::to_string(integration_time_ms)); - config->set_property("Acquisition_E6.dump", "true"); + config->set_property("Acquisition_E6.dump", "false"); config->set_property("Acquisition_E6.dump_filename", "./acquisition"); config->set_property("Acquisition_E6.pfa", "0.01"); config->set_property("Acquisition_E6.doppler_max", "10000"); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc similarity index 99% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 1dce2a6f8..d3d12b6a1 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -396,7 +396,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::config_3() /*Unset this flag to eliminates data logging for the Validation of results probabilities test*/ - dump_test_results = true; + dump_test_results = false; num_of_realizations = 1; @@ -849,7 +849,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili { std::stringstream filenamepd; filenamepd.str(""); - filenamepd << "../data/test_statistics_" << gnss_synchro.System + filenamepd << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_value_CN0_dB_0 << "_dBHz.csv"; @@ -876,7 +876,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili { std::stringstream filenamepf; filenamepf.str(""); - filenamepf << "../data/test_statistics_" << gnss_synchro.System + filenamepf << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_value_CN0_dB_0 << "_dBHz.csv"; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc rename to tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc b/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc rename to tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc b/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc rename to tests/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc b/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc rename to tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc b/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc rename to tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc b/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc rename to tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc b/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc rename to tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt b/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt similarity index 98% rename from src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt rename to tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt index 32a81ee01..54d27bcc3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -55,7 +55,7 @@ target_include_directories(signal_processing_testing_lib PUBLIC ${GNSSSDR_SOURCE_DIR}/src/core/interfaces INTERFACE - ${GNSSSDR_SOURCE_DIR}/src/tests/common-files + ${GNSSSDR_SOURCE_DIR}/tests/common-files ) if(USE_GENERIC_LAMBDAS) diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc b/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc rename to tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h b/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h rename to tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc b/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc rename to tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h b/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h rename to tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc b/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc rename to tests/unit-tests/signal-processing-blocks/libs/item_type_helpers_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc b/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc rename to tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h b/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h rename to tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc b/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc rename to tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h b/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h rename to tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc b/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc rename to tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h b/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h rename to tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc b/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc rename to tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h b/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h rename to tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc b/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc rename to tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h b/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h rename to tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc rename to tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc rename to tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/osnma/gnss_crypto_test.cc b/tests/unit-tests/signal-processing-blocks/osnma/gnss_crypto_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/osnma/gnss_crypto_test.cc rename to tests/unit-tests/signal-processing-blocks/osnma/gnss_crypto_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/osnma/osnma_msg_receiver_test.cc b/tests/unit-tests/signal-processing-blocks/osnma/osnma_msg_receiver_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/osnma/osnma_msg_receiver_test.cc rename to tests/unit-tests/signal-processing-blocks/osnma/osnma_msg_receiver_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/osnma/osnma_test_vectors.cc b/tests/unit-tests/signal-processing-blocks/osnma/osnma_test_vectors.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/osnma/osnma_test_vectors.cc rename to tests/unit-tests/signal-processing-blocks/osnma/osnma_test_vectors.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/geohash_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/geohash_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/geohash_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/geohash_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc rename to tests/unit-tests/signal-processing-blocks/pvt/serdes_monitor_pvt_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc b/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc rename to tests/unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc b/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc rename to tests/unit-tests/signal-processing-blocks/resampler/mmse_resampler_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc b/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc rename to tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc b/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc rename to tests/unit-tests/signal-processing-blocks/sources/gnss_sdr_valve_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc b/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc rename to tests/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc b/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc rename to tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc rename to tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/discriminator_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc similarity index 98% rename from src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc index b5b92999b..bd4e74d7e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc @@ -72,7 +72,7 @@ void GalileoE1DllPllVemlTrackingInternalTest::init() config->set_property("Tracking_1B.implementation", "Galileo_E1_DLL_PLL_VEML_Tracking"); config->set_property("Tracking_1B.item_type", "gr_complex"); config->set_property("Tracking_1B.dump", "false"); - config->set_property("Tracking_1B.dump_filename", "../data/veml_tracking_ch_"); + config->set_property("Tracking_1B.dump_filename", "./veml_tracking_ch_"); config->set_property("Tracking_1B.early_late_space_chips", "0.15"); config->set_property("Tracking_1B.very_early_late_space_chips", "0.6"); config->set_property("Tracking_1B.pll_bw_hz", "30.0"); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc similarity index 98% rename from src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc index 9d17f703a..f13a498bd 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc @@ -78,7 +78,7 @@ void GalileoE5aTrackingTest::init() config->set_property("Tracking_5X.implementation", "Galileo_E5a_DLL_PLL_Tracking"); config->set_property("Tracking_5X.item_type", "gr_complex"); config->set_property("Tracking_5X.dump", "false"); - config->set_property("Tracking_5X.dump_filename", "../data/e5a_tracking_ch_"); + config->set_property("Tracking_5X.dump_filename", "./e5a_tracking_ch_"); config->set_property("Tracking_5X.early_late_space_chips", "0.5"); config->set_property("Tracking_5X.order", "2"); config->set_property("Tracking_5X.pll_bw_hz", "20.0"); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc similarity index 98% rename from src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc index 4e69dae2a..8536ece4f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc @@ -79,7 +79,7 @@ void GalileoE5bTrackingTest::init() config->set_property("Tracking_7X.implementation", "Galileo_E5b_DLL_PLL_Tracking"); config->set_property("Tracking_7X.item_type", "gr_complex"); config->set_property("Tracking_7X.dump", "false"); - config->set_property("Tracking_7X.dump_filename", "../data/e5b_tracking"); + config->set_property("Tracking_7X.dump_filename", "./e5b_tracking"); config->set_property("Tracking_7X.early_late_space_chips", "0.5"); config->set_property("Tracking_7X.order", "2"); config->set_property("Tracking_7X.pll_bw_hz", "20.0"); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc rename to tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_gaussian_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_gaussian_tracking_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_gaussian_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_gaussian_tracking_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc similarity index 98% rename from src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc index 43c32314a..995ce58dd 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc @@ -144,7 +144,7 @@ void GpsL2MDllPllTrackingTest::init() config->set_property("GNSS-SDR.internal_fs_sps", "5000000"); config->set_property("Tracking_2S.item_type", "gr_complex"); config->set_property("Tracking_2S.dump", "false"); - config->set_property("Tracking_2S.dump_filename", "../data/L2m_tracking_ch_"); + config->set_property("Tracking_2S.dump_filename", "./L2m_tracking_ch_"); config->set_property("Tracking_2S.implementation", "GPS_L2_M_DLL_PLL_Tracking"); config->set_property("Tracking_2S.early_late_space_chips", "0.5"); config->set_property("Tracking_2S.order", "2"); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc rename to tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc similarity index 100% rename from src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc rename to tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc diff --git a/src/tests/unit-tests/system-parameters/galileo_e1b_reed_solomon_test.cc b/tests/unit-tests/system-parameters/galileo_e1b_reed_solomon_test.cc similarity index 100% rename from src/tests/unit-tests/system-parameters/galileo_e1b_reed_solomon_test.cc rename to tests/unit-tests/system-parameters/galileo_e1b_reed_solomon_test.cc diff --git a/src/tests/unit-tests/system-parameters/galileo_e6b_reed_solomon_test.cc b/tests/unit-tests/system-parameters/galileo_e6b_reed_solomon_test.cc similarity index 100% rename from src/tests/unit-tests/system-parameters/galileo_e6b_reed_solomon_test.cc rename to tests/unit-tests/system-parameters/galileo_e6b_reed_solomon_test.cc diff --git a/src/tests/unit-tests/system-parameters/galileo_ism_test.cc b/tests/unit-tests/system-parameters/galileo_ism_test.cc similarity index 100% rename from src/tests/unit-tests/system-parameters/galileo_ism_test.cc rename to tests/unit-tests/system-parameters/galileo_ism_test.cc diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc b/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc similarity index 100% rename from src/tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc rename to tests/unit-tests/system-parameters/glonass_gnav_crc_test.cc diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc b/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc similarity index 100% rename from src/tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc rename to tests/unit-tests/system-parameters/glonass_gnav_ephemeris_test.cc diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc b/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc similarity index 100% rename from src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc rename to tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc diff --git a/src/tests/unit-tests/system-parameters/has_decoding_test.cc b/tests/unit-tests/system-parameters/has_decoding_test.cc similarity index 99% rename from src/tests/unit-tests/system-parameters/has_decoding_test.cc rename to tests/unit-tests/system-parameters/has_decoding_test.cc index 5dc12536f..a93b07da2 100644 --- a/src/tests/unit-tests/system-parameters/has_decoding_test.cc +++ b/tests/unit-tests/system-parameters/has_decoding_test.cc @@ -33,7 +33,7 @@ // Usage: // ./run_tests --gtest_filter=HAS_Test.Decoder -// ./run_tests --gtest_filter=HAS_Test.Decoder --has_data_test_file=../data/HAS_Messages_sample/encoded/Sample_HAS_Pages_Encoded_20210713_08.txt --start_page_test_file=70 +// ./run_tests --gtest_filter=HAS_Test.Decoder --has_data_test_file=./HAS_Messages_sample/encoded/Sample_HAS_Pages_Encoded_20210713_08.txt --start_page_test_file=70 #if USE_GLOG_AND_GFLAGS DEFINE_string(has_data_test_file, std::string(""), "File containing encoded HAS pages (format: [time sat_id HAS_page_in_hex] in each line)"); diff --git a/src/utils/CMakeLists.txt b/utils/CMakeLists.txt similarity index 100% rename from src/utils/CMakeLists.txt rename to utils/CMakeLists.txt diff --git a/src/utils/front-end-cal/CMakeLists.txt b/utils/front-end-cal/CMakeLists.txt similarity index 100% rename from src/utils/front-end-cal/CMakeLists.txt rename to utils/front-end-cal/CMakeLists.txt diff --git a/src/utils/front-end-cal/front_end_cal.cc b/utils/front-end-cal/front_end_cal.cc similarity index 100% rename from src/utils/front-end-cal/front_end_cal.cc rename to utils/front-end-cal/front_end_cal.cc diff --git a/src/utils/front-end-cal/front_end_cal.h b/utils/front-end-cal/front_end_cal.h similarity index 100% rename from src/utils/front-end-cal/front_end_cal.h rename to utils/front-end-cal/front_end_cal.h diff --git a/src/utils/front-end-cal/main.cc b/utils/front-end-cal/main.cc similarity index 100% rename from src/utils/front-end-cal/main.cc rename to utils/front-end-cal/main.cc diff --git a/src/utils/matlab/dll_pll_veml_plot_sample.m b/utils/matlab/dll_pll_veml_plot_sample.m similarity index 100% rename from src/utils/matlab/dll_pll_veml_plot_sample.m rename to utils/matlab/dll_pll_veml_plot_sample.m diff --git a/src/utils/matlab/gps_l1_ca_kf_plot_sample.m b/utils/matlab/gps_l1_ca_kf_plot_sample.m similarity index 100% rename from src/utils/matlab/gps_l1_ca_kf_plot_sample.m rename to utils/matlab/gps_l1_ca_kf_plot_sample.m diff --git a/src/utils/matlab/gps_l1_ca_pvt_plot_sample_agilent_cap2.m b/utils/matlab/gps_l1_ca_pvt_plot_sample_agilent_cap2.m similarity index 100% rename from src/utils/matlab/gps_l1_ca_pvt_plot_sample_agilent_cap2.m rename to utils/matlab/gps_l1_ca_pvt_plot_sample_agilent_cap2.m diff --git a/src/utils/matlab/gps_l1_ca_pvt_raw_plot_sample.m b/utils/matlab/gps_l1_ca_pvt_raw_plot_sample.m similarity index 100% rename from src/utils/matlab/gps_l1_ca_pvt_raw_plot_sample.m rename to utils/matlab/gps_l1_ca_pvt_raw_plot_sample.m diff --git a/src/utils/matlab/gps_l1_ca_telemetry_plot_sample.m b/utils/matlab/gps_l1_ca_telemetry_plot_sample.m similarity index 100% rename from src/utils/matlab/gps_l1_ca_telemetry_plot_sample.m rename to utils/matlab/gps_l1_ca_telemetry_plot_sample.m diff --git a/src/utils/matlab/help_script1.m b/utils/matlab/help_script1.m similarity index 100% rename from src/utils/matlab/help_script1.m rename to utils/matlab/help_script1.m diff --git a/src/utils/matlab/help_script2.m b/utils/matlab/help_script2.m similarity index 100% rename from src/utils/matlab/help_script2.m rename to utils/matlab/help_script2.m diff --git a/src/utils/matlab/hybrid_observables_plot_sample.m b/utils/matlab/hybrid_observables_plot_sample.m similarity index 100% rename from src/utils/matlab/hybrid_observables_plot_sample.m rename to utils/matlab/hybrid_observables_plot_sample.m diff --git a/src/utils/matlab/libs/dll_pll_veml_read_tracking_dump.m b/utils/matlab/libs/dll_pll_veml_read_tracking_dump.m similarity index 100% rename from src/utils/matlab/libs/dll_pll_veml_read_tracking_dump.m rename to utils/matlab/libs/dll_pll_veml_read_tracking_dump.m diff --git a/src/utils/matlab/libs/geoFunctions/cart2geo.m b/utils/matlab/libs/geoFunctions/cart2geo.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/cart2geo.m rename to utils/matlab/libs/geoFunctions/cart2geo.m diff --git a/src/utils/matlab/libs/geoFunctions/cart2utm.m b/utils/matlab/libs/geoFunctions/cart2utm.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/cart2utm.m rename to utils/matlab/libs/geoFunctions/cart2utm.m diff --git a/src/utils/matlab/libs/geoFunctions/check_t.m b/utils/matlab/libs/geoFunctions/check_t.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/check_t.m rename to utils/matlab/libs/geoFunctions/check_t.m diff --git a/src/utils/matlab/libs/geoFunctions/clksin.m b/utils/matlab/libs/geoFunctions/clksin.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/clksin.m rename to utils/matlab/libs/geoFunctions/clksin.m diff --git a/src/utils/matlab/libs/geoFunctions/clsin.m b/utils/matlab/libs/geoFunctions/clsin.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/clsin.m rename to utils/matlab/libs/geoFunctions/clsin.m diff --git a/src/utils/matlab/libs/geoFunctions/deg2dms.m b/utils/matlab/libs/geoFunctions/deg2dms.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/deg2dms.m rename to utils/matlab/libs/geoFunctions/deg2dms.m diff --git a/src/utils/matlab/libs/geoFunctions/dms2deg.m b/utils/matlab/libs/geoFunctions/dms2deg.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/dms2deg.m rename to utils/matlab/libs/geoFunctions/dms2deg.m diff --git a/src/utils/matlab/libs/geoFunctions/dms2mat.m b/utils/matlab/libs/geoFunctions/dms2mat.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/dms2mat.m rename to utils/matlab/libs/geoFunctions/dms2mat.m diff --git a/src/utils/matlab/libs/geoFunctions/e_r_corr.m b/utils/matlab/libs/geoFunctions/e_r_corr.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/e_r_corr.m rename to utils/matlab/libs/geoFunctions/e_r_corr.m diff --git a/src/utils/matlab/libs/geoFunctions/findUtmZone.m b/utils/matlab/libs/geoFunctions/findUtmZone.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/findUtmZone.m rename to utils/matlab/libs/geoFunctions/findUtmZone.m diff --git a/src/utils/matlab/libs/geoFunctions/geo2cart.m b/utils/matlab/libs/geoFunctions/geo2cart.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/geo2cart.m rename to utils/matlab/libs/geoFunctions/geo2cart.m diff --git a/src/utils/matlab/libs/geoFunctions/leastSquarePos.m b/utils/matlab/libs/geoFunctions/leastSquarePos.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/leastSquarePos.m rename to utils/matlab/libs/geoFunctions/leastSquarePos.m diff --git a/src/utils/matlab/libs/geoFunctions/mat2dms.m b/utils/matlab/libs/geoFunctions/mat2dms.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/mat2dms.m rename to utils/matlab/libs/geoFunctions/mat2dms.m diff --git a/src/utils/matlab/libs/geoFunctions/roundn.m b/utils/matlab/libs/geoFunctions/roundn.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/roundn.m rename to utils/matlab/libs/geoFunctions/roundn.m diff --git a/src/utils/matlab/libs/geoFunctions/satpos.m b/utils/matlab/libs/geoFunctions/satpos.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/satpos.m rename to utils/matlab/libs/geoFunctions/satpos.m diff --git a/src/utils/matlab/libs/geoFunctions/togeod.m b/utils/matlab/libs/geoFunctions/togeod.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/togeod.m rename to utils/matlab/libs/geoFunctions/togeod.m diff --git a/src/utils/matlab/libs/geoFunctions/topocent.m b/utils/matlab/libs/geoFunctions/topocent.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/topocent.m rename to utils/matlab/libs/geoFunctions/topocent.m diff --git a/src/utils/matlab/libs/geoFunctions/tropo.m b/utils/matlab/libs/geoFunctions/tropo.m similarity index 100% rename from src/utils/matlab/libs/geoFunctions/tropo.m rename to utils/matlab/libs/geoFunctions/tropo.m diff --git a/src/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m b/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m similarity index 100% rename from src/utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m rename to utils/matlab/libs/gps_l1_ca_dll_pll_read_tracking_dump.m diff --git a/src/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m b/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m similarity index 100% rename from src/utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m rename to utils/matlab/libs/gps_l1_ca_kf_read_tracking_dump.m diff --git a/src/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m b/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m similarity index 100% rename from src/utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m rename to utils/matlab/libs/gps_l1_ca_pvt_read_pvt_dump.m diff --git a/src/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m b/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m similarity index 100% rename from src/utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m rename to utils/matlab/libs/gps_l1_ca_read_pvt_raw_dump.m diff --git a/src/utils/matlab/libs/gps_l1_ca_read_telemetry_dump.m b/utils/matlab/libs/gps_l1_ca_read_telemetry_dump.m similarity index 100% rename from src/utils/matlab/libs/gps_l1_ca_read_telemetry_dump.m rename to utils/matlab/libs/gps_l1_ca_read_telemetry_dump.m diff --git a/src/utils/matlab/libs/plotKalman.m b/utils/matlab/libs/plotKalman.m similarity index 100% rename from src/utils/matlab/libs/plotKalman.m rename to utils/matlab/libs/plotKalman.m diff --git a/src/utils/matlab/libs/plotNavigation.m b/utils/matlab/libs/plotNavigation.m similarity index 100% rename from src/utils/matlab/libs/plotNavigation.m rename to utils/matlab/libs/plotNavigation.m diff --git a/src/utils/matlab/libs/plotTracking.m b/utils/matlab/libs/plotTracking.m similarity index 100% rename from src/utils/matlab/libs/plotTracking.m rename to utils/matlab/libs/plotTracking.m diff --git a/src/utils/matlab/libs/plotVEMLTracking.m b/utils/matlab/libs/plotVEMLTracking.m similarity index 100% rename from src/utils/matlab/libs/plotVEMLTracking.m rename to utils/matlab/libs/plotVEMLTracking.m diff --git a/src/utils/matlab/libs/quantize_signal.m b/utils/matlab/libs/quantize_signal.m similarity index 100% rename from src/utils/matlab/libs/quantize_signal.m rename to utils/matlab/libs/quantize_signal.m diff --git a/src/utils/matlab/libs/read_complex_binary.m b/utils/matlab/libs/read_complex_binary.m similarity index 100% rename from src/utils/matlab/libs/read_complex_binary.m rename to utils/matlab/libs/read_complex_binary.m diff --git a/src/utils/matlab/libs/read_complex_char_binary.m b/utils/matlab/libs/read_complex_char_binary.m similarity index 100% rename from src/utils/matlab/libs/read_complex_char_binary.m rename to utils/matlab/libs/read_complex_char_binary.m diff --git a/src/utils/matlab/libs/read_complex_short_binary.m b/utils/matlab/libs/read_complex_short_binary.m similarity index 100% rename from src/utils/matlab/libs/read_complex_short_binary.m rename to utils/matlab/libs/read_complex_short_binary.m diff --git a/src/utils/matlab/libs/read_hybrid_observables_dump.m b/utils/matlab/libs/read_hybrid_observables_dump.m similarity index 100% rename from src/utils/matlab/libs/read_hybrid_observables_dump.m rename to utils/matlab/libs/read_hybrid_observables_dump.m diff --git a/src/utils/matlab/libs/read_true_sim_observables_dump.m b/utils/matlab/libs/read_true_sim_observables_dump.m similarity index 100% rename from src/utils/matlab/libs/read_true_sim_observables_dump.m rename to utils/matlab/libs/read_true_sim_observables_dump.m diff --git a/src/utils/matlab/plotTrackingE5a.m b/utils/matlab/plotTrackingE5a.m similarity index 100% rename from src/utils/matlab/plotTrackingE5a.m rename to utils/matlab/plotTrackingE5a.m diff --git a/src/utils/matlab/plot_acq_grid.m b/utils/matlab/plot_acq_grid.m similarity index 100% rename from src/utils/matlab/plot_acq_grid.m rename to utils/matlab/plot_acq_grid.m diff --git a/src/utils/matlab/plot_acq_grid_gsoc.m b/utils/matlab/plot_acq_grid_gsoc.m similarity index 100% rename from src/utils/matlab/plot_acq_grid_gsoc.m rename to utils/matlab/plot_acq_grid_gsoc.m diff --git a/src/utils/matlab/plot_acq_grid_gsoc_e5.m b/utils/matlab/plot_acq_grid_gsoc_e5.m similarity index 100% rename from src/utils/matlab/plot_acq_grid_gsoc_e5.m rename to utils/matlab/plot_acq_grid_gsoc_e5.m diff --git a/src/utils/matlab/plot_acq_grid_gsoc_glonass.m b/utils/matlab/plot_acq_grid_gsoc_glonass.m similarity index 100% rename from src/utils/matlab/plot_acq_grid_gsoc_glonass.m rename to utils/matlab/plot_acq_grid_gsoc_glonass.m diff --git a/src/utils/matlab/plot_tracking_quality_indicators.m b/utils/matlab/plot_tracking_quality_indicators.m similarity index 100% rename from src/utils/matlab/plot_tracking_quality_indicators.m rename to utils/matlab/plot_tracking_quality_indicators.m diff --git a/src/utils/nav-listener/CMakeLists.txt b/utils/nav-listener/CMakeLists.txt similarity index 100% rename from src/utils/nav-listener/CMakeLists.txt rename to utils/nav-listener/CMakeLists.txt diff --git a/src/utils/nav-listener/README.md b/utils/nav-listener/README.md similarity index 100% rename from src/utils/nav-listener/README.md rename to utils/nav-listener/README.md diff --git a/src/utils/nav-listener/cmake/cmake_uninstall.cmake.in b/utils/nav-listener/cmake/cmake_uninstall.cmake.in similarity index 100% rename from src/utils/nav-listener/cmake/cmake_uninstall.cmake.in rename to utils/nav-listener/cmake/cmake_uninstall.cmake.in diff --git a/src/utils/nav-listener/main.cc b/utils/nav-listener/main.cc similarity index 100% rename from src/utils/nav-listener/main.cc rename to utils/nav-listener/main.cc diff --git a/src/utils/nav-listener/nav_message.proto b/utils/nav-listener/nav_message.proto similarity index 100% rename from src/utils/nav-listener/nav_message.proto rename to utils/nav-listener/nav_message.proto diff --git a/src/utils/nav-listener/nav_msg_udp_listener.cc b/utils/nav-listener/nav_msg_udp_listener.cc similarity index 100% rename from src/utils/nav-listener/nav_msg_udp_listener.cc rename to utils/nav-listener/nav_msg_udp_listener.cc diff --git a/src/utils/nav-listener/nav_msg_udp_listener.h b/utils/nav-listener/nav_msg_udp_listener.h similarity index 100% rename from src/utils/nav-listener/nav_msg_udp_listener.h rename to utils/nav-listener/nav_msg_udp_listener.h diff --git a/src/utils/python/analysis.py b/utils/python/analysis.py similarity index 100% rename from src/utils/python/analysis.py rename to utils/python/analysis.py diff --git a/src/utils/python/dll_pll_veml_plot_sample.py b/utils/python/dll_pll_veml_plot_sample.py similarity index 100% rename from src/utils/python/dll_pll_veml_plot_sample.py rename to utils/python/dll_pll_veml_plot_sample.py diff --git a/src/utils/python/gps_l1_ca_kf_plot_sample.py b/utils/python/gps_l1_ca_kf_plot_sample.py similarity index 100% rename from src/utils/python/gps_l1_ca_kf_plot_sample.py rename to utils/python/gps_l1_ca_kf_plot_sample.py diff --git a/src/utils/python/gps_l1_ca_pvt_raw_plot_sample.py b/utils/python/gps_l1_ca_pvt_raw_plot_sample.py similarity index 100% rename from src/utils/python/gps_l1_ca_pvt_raw_plot_sample.py rename to utils/python/gps_l1_ca_pvt_raw_plot_sample.py diff --git a/src/utils/python/gps_l1_ca_telemetry_plot_sample.py b/utils/python/gps_l1_ca_telemetry_plot_sample.py similarity index 100% rename from src/utils/python/gps_l1_ca_telemetry_plot_sample.py rename to utils/python/gps_l1_ca_telemetry_plot_sample.py diff --git a/src/utils/python/hybrid_observables_plot_sample.py b/utils/python/hybrid_observables_plot_sample.py similarity index 100% rename from src/utils/python/hybrid_observables_plot_sample.py rename to utils/python/hybrid_observables_plot_sample.py diff --git a/src/utils/python/lib/dll_pll_veml_read_tracking_dump.py b/utils/python/lib/dll_pll_veml_read_tracking_dump.py similarity index 100% rename from src/utils/python/lib/dll_pll_veml_read_tracking_dump.py rename to utils/python/lib/dll_pll_veml_read_tracking_dump.py diff --git a/src/utils/python/lib/gps_l1_ca_kf_read_tracking_dump.py b/utils/python/lib/gps_l1_ca_kf_read_tracking_dump.py similarity index 100% rename from src/utils/python/lib/gps_l1_ca_kf_read_tracking_dump.py rename to utils/python/lib/gps_l1_ca_kf_read_tracking_dump.py diff --git a/src/utils/python/lib/gps_l1_ca_read_pvt_dump.py b/utils/python/lib/gps_l1_ca_read_pvt_dump.py similarity index 100% rename from src/utils/python/lib/gps_l1_ca_read_pvt_dump.py rename to utils/python/lib/gps_l1_ca_read_pvt_dump.py diff --git a/src/utils/python/lib/gps_l1_ca_read_telemetry_dump.py b/utils/python/lib/gps_l1_ca_read_telemetry_dump.py similarity index 100% rename from src/utils/python/lib/gps_l1_ca_read_telemetry_dump.py rename to utils/python/lib/gps_l1_ca_read_telemetry_dump.py diff --git a/src/utils/python/lib/plotKalman.py b/utils/python/lib/plotKalman.py similarity index 100% rename from src/utils/python/lib/plotKalman.py rename to utils/python/lib/plotKalman.py diff --git a/src/utils/python/lib/plotNavigation.py b/utils/python/lib/plotNavigation.py similarity index 100% rename from src/utils/python/lib/plotNavigation.py rename to utils/python/lib/plotNavigation.py diff --git a/src/utils/python/lib/plotPosition.py b/utils/python/lib/plotPosition.py similarity index 100% rename from src/utils/python/lib/plotPosition.py rename to utils/python/lib/plotPosition.py diff --git a/src/utils/python/lib/plotTracking.py b/utils/python/lib/plotTracking.py similarity index 100% rename from src/utils/python/lib/plotTracking.py rename to utils/python/lib/plotTracking.py diff --git a/src/utils/python/lib/plotVEMLTracking.py b/utils/python/lib/plotVEMLTracking.py similarity index 100% rename from src/utils/python/lib/plotVEMLTracking.py rename to utils/python/lib/plotVEMLTracking.py diff --git a/src/utils/python/lib/read_hybrid_observables_dump.py b/utils/python/lib/read_hybrid_observables_dump.py similarity index 100% rename from src/utils/python/lib/read_hybrid_observables_dump.py rename to utils/python/lib/read_hybrid_observables_dump.py diff --git a/src/utils/python/plot_acq_grid.py b/utils/python/plot_acq_grid.py similarity index 100% rename from src/utils/python/plot_acq_grid.py rename to utils/python/plot_acq_grid.py diff --git a/src/utils/python/plot_tracking_quality_indicators.py b/utils/python/plot_tracking_quality_indicators.py similarity index 100% rename from src/utils/python/plot_tracking_quality_indicators.py rename to utils/python/plot_tracking_quality_indicators.py diff --git a/src/utils/python/vtl_analysis.py b/utils/python/vtl_analysis.py similarity index 100% rename from src/utils/python/vtl_analysis.py rename to utils/python/vtl_analysis.py diff --git a/src/utils/reproducibility/ieee-access18/L2-access18.conf b/utils/reproducibility/ieee-access18/L2-access18.conf similarity index 100% rename from src/utils/reproducibility/ieee-access18/L2-access18.conf rename to utils/reproducibility/ieee-access18/L2-access18.conf diff --git a/src/utils/reproducibility/ieee-access18/README.md b/utils/reproducibility/ieee-access18/README.md similarity index 93% rename from src/utils/reproducibility/ieee-access18/README.md rename to utils/reproducibility/ieee-access18/README.md index 67f59ad6d..82fa59103 100644 --- a/src/utils/reproducibility/ieee-access18/README.md +++ b/utils/reproducibility/ieee-access18/README.md @@ -58,9 +58,9 @@ $ tar xvfJ L2_signal_samples.tar.xz $ echo "3a04c1eeb970776bb77f5e3b7eaff2df L2_signal_samples.tar.xz" > data.md5 $ md5sum -c data.md5 $ cd .. -$ cp ../src/utils/reproducibility/ieee-access18/L2-access18.conf . -$ cp ../src/utils/reproducibility/ieee-access18/plot_dump.m . -$ cp -r ../src/utils/matlab/libs/geoFunctions . +$ cp ../utils/reproducibility/ieee-access18/L2-access18.conf . +$ cp ../utils/reproducibility/ieee-access18/plot_dump.m . +$ cp -r ../utils/matlab/libs/geoFunctions . $ gnss-sdr --c=L2-access18.conf $ octave --no-gui plot_dump.m $ epspdf Figure2.eps Figure2.pdf diff --git a/src/utils/reproducibility/ieee-access18/plot_dump.m b/utils/reproducibility/ieee-access18/plot_dump.m similarity index 100% rename from src/utils/reproducibility/ieee-access18/plot_dump.m rename to utils/reproducibility/ieee-access18/plot_dump.m diff --git a/src/utils/rinex-tools/CMakeLists.txt b/utils/rinex-tools/CMakeLists.txt similarity index 99% rename from src/utils/rinex-tools/CMakeLists.txt rename to utils/rinex-tools/CMakeLists.txt index 695c369ee..84d361d40 100644 --- a/src/utils/rinex-tools/CMakeLists.txt +++ b/utils/rinex-tools/CMakeLists.txt @@ -33,7 +33,7 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND add_executable(obsdiff ${CMAKE_CURRENT_SOURCE_DIR}/obsdiff.cc obsdiff_flags.h) endif() - target_include_directories(obsdiff PUBLIC ${GNSSSDR_SOURCE_DIR}/src/tests/common-files) + target_include_directories(obsdiff PUBLIC ${GNSSSDR_SOURCE_DIR}/tests/common-files) if(GNSSTK_VERSION AND "${GNSSTK_VERSION}" VERSION_LESS 3.0.1) set_property(TARGET obsdiff PROPERTY CXX_STANDARD 14) # Required by GPSTk v3.0.0 endif() diff --git a/src/utils/rinex-tools/README.md b/utils/rinex-tools/README.md similarity index 100% rename from src/utils/rinex-tools/README.md rename to utils/rinex-tools/README.md diff --git a/src/utils/rinex-tools/obsdiff.cc b/utils/rinex-tools/obsdiff.cc similarity index 100% rename from src/utils/rinex-tools/obsdiff.cc rename to utils/rinex-tools/obsdiff.cc diff --git a/src/utils/rinex-tools/obsdiff_flags.h b/utils/rinex-tools/obsdiff_flags.h similarity index 100% rename from src/utils/rinex-tools/obsdiff_flags.h rename to utils/rinex-tools/obsdiff_flags.h diff --git a/src/utils/rinex2assist/CMakeLists.txt b/utils/rinex2assist/CMakeLists.txt similarity index 100% rename from src/utils/rinex2assist/CMakeLists.txt rename to utils/rinex2assist/CMakeLists.txt diff --git a/src/utils/rinex2assist/README.md b/utils/rinex2assist/README.md similarity index 100% rename from src/utils/rinex2assist/README.md rename to utils/rinex2assist/README.md diff --git a/src/utils/rinex2assist/main.cc b/utils/rinex2assist/main.cc similarity index 100% rename from src/utils/rinex2assist/main.cc rename to utils/rinex2assist/main.cc diff --git a/src/utils/scripts/download-galileo-almanac.sh b/utils/scripts/download-galileo-almanac.sh similarity index 100% rename from src/utils/scripts/download-galileo-almanac.sh rename to utils/scripts/download-galileo-almanac.sh diff --git a/src/utils/scripts/gnss-sdr-harness.sh b/utils/scripts/gnss-sdr-harness.sh similarity index 100% rename from src/utils/scripts/gnss-sdr-harness.sh rename to utils/scripts/gnss-sdr-harness.sh diff --git a/src/utils/simulink/MultiThread/README_gnss_sdr_tcp_connector_parallel_tracking.txt b/utils/simulink/MultiThread/README_gnss_sdr_tcp_connector_parallel_tracking.txt similarity index 100% rename from src/utils/simulink/MultiThread/README_gnss_sdr_tcp_connector_parallel_tracking.txt rename to utils/simulink/MultiThread/README_gnss_sdr_tcp_connector_parallel_tracking.txt diff --git a/src/utils/simulink/MultiThread/gnss_sdr_tcp_connector_parallel_tracking_start.m b/utils/simulink/MultiThread/gnss_sdr_tcp_connector_parallel_tracking_start.m similarity index 100% rename from src/utils/simulink/MultiThread/gnss_sdr_tcp_connector_parallel_tracking_start.m rename to utils/simulink/MultiThread/gnss_sdr_tcp_connector_parallel_tracking_start.m diff --git a/src/utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl b/utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl similarity index 100% rename from src/utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl rename to utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl diff --git a/src/utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license b/utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license similarity index 100% rename from src/utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license rename to utils/simulink/MultiThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license diff --git a/src/utils/simulink/SingleThread/README_gnss_sdr_galileo_e1_tcp_connector_tracking.txt b/utils/simulink/SingleThread/README_gnss_sdr_galileo_e1_tcp_connector_tracking.txt similarity index 100% rename from src/utils/simulink/SingleThread/README_gnss_sdr_galileo_e1_tcp_connector_tracking.txt rename to utils/simulink/SingleThread/README_gnss_sdr_galileo_e1_tcp_connector_tracking.txt diff --git a/src/utils/simulink/SingleThread/README_gnss_sdr_tcp_connector_tracking.txt b/utils/simulink/SingleThread/README_gnss_sdr_tcp_connector_tracking.txt similarity index 100% rename from src/utils/simulink/SingleThread/README_gnss_sdr_tcp_connector_tracking.txt rename to utils/simulink/SingleThread/README_gnss_sdr_tcp_connector_tracking.txt diff --git a/src/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl b/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl similarity index 100% rename from src/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl rename to utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl diff --git a/src/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl.license b/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl.license similarity index 100% rename from src/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl.license rename to utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_lib.mdl.license diff --git a/src/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_start.m b/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_start.m similarity index 100% rename from src/utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_start.m rename to utils/simulink/SingleThread/gnss_sdr_galileo_e1_tcp_connector_tracking_start.m diff --git a/src/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl b/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl similarity index 100% rename from src/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl rename to utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl diff --git a/src/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license b/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license similarity index 100% rename from src/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license rename to utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_lib.mdl.license diff --git a/src/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_start.m b/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_start.m similarity index 100% rename from src/utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_start.m rename to utils/simulink/SingleThread/gnss_sdr_tcp_connector_tracking_start.m