Merge branch 'next' of github.com:gnss-sdr/gnss-sdr into pps_lime

2024-12-14 12:10:34 +00:00 · 2022-08-29 11:50:07 +02:00 · 2022-08-29 11:50:07 +02:00 · 069c958965
commit 069c958965
parent baa2a33838 8044564117
14 changed files with 53 additions and 4 deletions
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@ -78,6 +78,9 @@ All notable changes to GNSS-SDR will be documented in this file.
  `Osmosdr_Signal_Source` implementation of a `SignalSource`.
 - The `Osmosdr_Signal_Source` implementation learned a new parameter `if_bw` to
  manually set the bandwidth of the bandpass filter on the radio frontend.
+- The `UHD_Signal_Source` learned two new optional parameters
+  `device_recv_frame_size` and `device_num_recv_frames` for overriding
+  [transport layer defaults](https://files.ettus.com/manual/page_transport.html).
 - The new configuration parameter `Channels_XX.RF_channel_ID` allows to specify
  the signal source per channel group.
 - Allowed the CMake project to be a sub-project.
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@ -32,11 +32,18 @@ target_include_directories(pvt_adapters
        ${GNSSSDR_SOURCE_DIR}/src/core/interfaces
 )

-if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
+if((NOT (CMAKE_VERSION VERSION_LESS "3.1")) AND NOT (CMAKE_CXX_STANDARD VERSION_LESS 17))
    target_compile_definitions(pvt_adapters
        PRIVATE
-            -DUSE_OLD_BOOST_MATH_COMMON_FACTOR=1
+            -DUSE_STD_COMMON_FACTOR=1
    )
+else()
+    if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
+        target_compile_definitions(pvt_adapters
+            PRIVATE
+                -DUSE_OLD_BOOST_MATH_COMMON_FACTOR=1
+        )
+    endif()
 endif()

 if(ENABLE_CLANG_TIDY)
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@ -28,6 +28,10 @@
 #include "rtklib_rtkpos.h"             // for rtkfree, rtkinit
 #include <glog/logging.h>              // for LOG
 #include <iostream>                    // for std::cout
+#if USE_STD_COMMON_FACTOR
+#include <numeric>
+namespace bc = std;
+#else
 #if USE_OLD_BOOST_MATH_COMMON_FACTOR
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
@ -35,6 +39,7 @@ namespace bc = boost::math;
 #include <boost/integer/common_factor_rt.hpp>
 namespace bc = boost::integer;
 #endif
+#endif

 using namespace std::string_literals;

--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@ -74,11 +74,18 @@ if(ENABLE_CLANG_TIDY)
    endif()
 endif()

-if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
+if((NOT (CMAKE_VERSION VERSION_LESS "3.1")) AND NOT (CMAKE_CXX_STANDARD VERSION_LESS 17))
    target_compile_definitions(pvt_gr_blocks
        PRIVATE
-            -DUSE_OLD_BOOST_MATH_COMMON_FACTOR=1
+            -DUSE_STD_COMMON_FACTOR=1
    )
+else()
+    if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
+        target_compile_definitions(pvt_gr_blocks
+            PRIVATE
+                -DUSE_OLD_BOOST_MATH_COMMON_FACTOR=1
+        )
+    endif()
 endif()

 if(USE_BOOST_BIND_PLACEHOLDERS)
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
@ -86,6 +86,10 @@
 #include <boost/bind/bind.hpp>
 #endif

+#if USE_STD_COMMON_FACTOR
+#include <numeric>
+namespace bc = std;
+#else
 #if USE_OLD_BOOST_MATH_COMMON_FACTOR
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
@ -93,6 +97,7 @@ namespace bc = boost::math;
 #include <boost/integer/common_factor_rt.hpp>
 namespace bc = boost::integer;
 #endif
+#endif

 #if PMT_USES_BOOST_ANY
 #include <boost/any.hpp>
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@ -24,6 +24,7 @@
 #include <cstdlib>    // for mkstemp
 #include <ctime>      // for tm
 #include <exception>  // for exception
+#include <iomanip>    // for std::setprecision
 #include <iostream>   // for cout, cerr
 #include <sstream>
 #include <sys/stat.h>   // for S_IXUSR | S_IRWXG | S_IRWXO
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@ -65,6 +65,20 @@ UhdSignalSource::UhdSignalSource(const ConfigurationInterface* configuration,
    sample_rate_ = configuration->property(role + ".sampling_frequency", 4.0e6);
    item_type_ = configuration->property(role + ".item_type", default_item_type);

+    // UHD TRANSPORT PARAMETERS
+    // option to manually set device "num_recv_frames"
+    std::string device_num_recv_frames = configuration->property(role + ".device_num_recv_frames", empty);
+    if (empty != device_num_recv_frames)  // if not empty
+        {
+            dev_addr["num_recv_frames"] = device_num_recv_frames;
+        }
+    // option to manually set device "recv_frame_size"
+    std::string device_recv_frame_size = configuration->property(role + ".device_recv_frame_size", empty);
+    if (empty != device_recv_frame_size)  // if not empty
+        {
+            dev_addr["recv_frame_size"] = device_recv_frame_size;
+        }
+
    if (RF_channels_ == 1)
        {
            // Single RF channel UHD operation (backward compatible config file format)
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@ -46,6 +46,7 @@
 #include <chrono>
 #include <cmath>
 #include <fstream>
+#include <iomanip>
 #include <numeric>
 #include <thread>

--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@ -63,6 +63,7 @@
 #include <chrono>
 #include <cmath>
 #include <exception>
+#include <iomanip>
 #include <unistd.h>
 #include <utility>
 #if GNSSTK_USES_GPSTK_NAMESPACE
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
@ -62,6 +62,7 @@
 #include <chrono>
 #include <cmath>
 #include <exception>
+#include <iomanip>
 #include <pthread.h>
 #include <unistd.h>
 #include <utility>
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@ -22,6 +22,7 @@
 #include <gnuradio/top_block.h>
 #include <chrono>
 #include <exception>
+#include <iomanip>
 #include <string>
 #include <unistd.h>
 #include <utility>
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@ -39,6 +39,7 @@
 #include <matio.h>
 #include <pmt/pmt.h>
 #include <chrono>
+#include <iomanip>
 #include <unistd.h>
 #include <utility>
 #include <vector>
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
@ -42,6 +42,7 @@
 #include <chrono>
 #include <cstdio>  // FPGA read input file
 #include <fcntl.h>
+#include <iomanip>
 #include <iostream>
 #include <unistd.h>
 #include <utility>
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
@ -38,6 +38,7 @@
 #include <gtest/gtest.h>
 #include <pmt/pmt.h>
 #include <chrono>
+#include <iomanip>
 #include <unistd.h>
 #include <utility>
 #include <vector>