bds_b3i: Updating branch with new changes from upstream repo

2025-10-25 20:47:39 +00:00 · 2019-03-12 10:54:17 -05:00
parent 2b4a395dc8 fb5347038d
commit dc65760122
104 changed files with 1229 additions and 624 deletions
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -100,6 +100,7 @@ target_link_libraries(tracking_adapters
        tracking_gr_blocks
        algorithms_libs
        gnss_sdr_flags
+        Gnuradio::runtime
    PRIVATE
        Volkgnsssdr::volkgnsssdr
 )
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
@@ -38,10 +38,15 @@
 #include "Galileo_E1.h"
 #include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf_fpga.h"
 #include "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>     // for round
+#include <cstring>   // for memcpy
+#include <iostream>  // for operator<<,


 GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h
@@ -1,7 +1,7 @@
 /*!
 * \file galileo_e1_dll_pll_veml_tracking_fpga.h
- * \brief  Adapts a DLL+PLL VEML (Very Early Minus Late) tracking loop block
- *   to a TrackingInterface for Galileo E1 signals for the FPGA
+ * \brief Adapts a DLL+PLL VEML (Very Early Minus Late) tracking loop block
+ *  to a TrackingInterface for Galileo E1 signals for the FPGA
 * \author Marc Majoral, 2019. mmajoral(at)cttc.cat
 *
 * Code DLL + carrier PLL according to the algorithms described in:
@@ -39,9 +39,12 @@

 #include "dll_pll_veml_tracking_fpga.h"
 #include "tracking_interface.h"
-#include <string>
-
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, basic_block_sptr
+#include <cstddef>                   // for size_t
+#include <cstdint>                   // for uint32_t
+#include <string>                    // for string

+class Gnss_Synchro;
 class ConfigurationInterface;

 /*!
@@ -87,7 +90,7 @@ public:
    /*!
     * \brief Set acquisition/tracking common Gnss_Synchro object pointer
     * to efficiently exchange synchronization data between acquisition and
-     *  tracking blocks
+     * tracking blocks
     */
    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;

@@ -98,7 +101,6 @@ public:
     */
    void stop_tracking() override;

-
 private:
    dll_pll_veml_tracking_fpga_sptr tracking_fpga_sc;
    uint32_t channel_;
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
@@ -33,10 +33,17 @@
 #include "Galileo_E5a.h"
 #include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf_fpga.h"
 #include "galileo_e5_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include <glog/logging.h>
+#include <gnuradio/gr_complex.h>  // for gr_complex
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>  // for round
+#include <complex>
+#include <cstring>  // for memcpy
+#include <iostream>


 GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h
@@ -34,9 +34,12 @@

 #include "dll_pll_veml_tracking_fpga.h"
 #include "tracking_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr
+#include <cstdint>                   // For uint32_t
+#include <stddef.h>                  // for size_t
 #include <string>
-#include <cstdint>

+class Gnss_Synchro;
 class ConfigurationInterface;

 /*!
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc
@@ -38,10 +38,15 @@
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf_fpga.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for round
+#include <cstring>  // for memcpy
+#include <iostream>

 #define NUM_PRNs 32

--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h
@@ -39,9 +39,12 @@

 #include "dll_pll_veml_tracking_fpga.h"
 #include "tracking_interface.h"
+#include <gnuradio/runtime_types.h>
+#include <cstddef>
 #include <string>


+class Gnss_Synchro;
 class ConfigurationInterface;

 /*!
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc
@@ -1,7 +1,7 @@
 /*!
 * \file gps_l2_m_dll_pll_tracking_fpga.cc
 * \brief Implementation of an adapter of a DLL+PLL tracking loop block
- * for GPS L2C to a TrackingInterface
+ * for GPS L2C to a TrackingInterface for the FPGA
 * \author Javier Arribas, 2019. jarribas(at)cttc.es
 *
 * Code DLL + carrier PLL according to the algorithms described in:
@@ -11,7 +11,7 @@
 *
 * -------------------------------------------------------------------------
 *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
 *
 * GNSS-SDR is a software defined Global Navigation
 *          Satellite Systems receiver
@@ -39,10 +39,16 @@
 #include "GPS_L2C.h"
 #include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf_fpga.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include "gps_l2c_signal.h"
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for round
+#include <cstring>  // for memcpy
+#include <iostream>
+

 #define NUM_PRNs 32

--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h
@@ -1,7 +1,7 @@
 /*!
 * \file gps_l2_m_dll_pll_tracking_fpga.h
 * \brief  Interface of an adapter of a DLL+PLL tracking loop block
- * for GPS L2C to a TrackingInterface
+ * for GPS L2C to a TrackingInterface for the FPGA
 * \author Marc Majoral, 2019, mmajoral(at)cttc.es
 *
 * Code DLL + carrier PLL according to the algorithms described in:
@@ -11,7 +11,7 @@
 *
 * -------------------------------------------------------------------------
 *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
 *
 * GNSS-SDR is a software defined Global Navigation
 *          Satellite Systems receiver
@@ -34,14 +34,16 @@
 * -------------------------------------------------------------------------
 */

-#ifndef GNSS_SDR_gps_l2_m_dll_pll_tracking_FPGA_H_
-#define GNSS_SDR_gps_l2_m_dll_pll_tracking_FPGA_H_
+#ifndef GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_FPGA_H_
+#define GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_FPGA_H_

-#include "tracking_interface.h"
-//#include "dll_pll_veml_tracking.h"
 #include "dll_pll_veml_tracking_fpga.h"
+#include "tracking_interface.h"
+#include <gnuradio/runtime_types.h>
+#include <cstddef>
 #include <string>

+class Gnss_Synchro;
 class ConfigurationInterface;

 /*!
@@ -90,13 +92,13 @@ public:
    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;

    void start_tracking() override;
+
    /*!
     * \brief Stop running tracking
     */
    void stop_tracking() override;

 private:
-    //dll_pll_veml_tracking_sptr tracking_;
    dll_pll_veml_tracking_fpga_sptr tracking_fpga_sc;
    unsigned int channel_;
    std::string role_;
@@ -105,4 +107,4 @@ private:
    int* d_ca_codes;
 };

-#endif  // GNSS_SDR_gps_l2_m_dll_pll_tracking_FPGA_H_
+#endif  // GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_FPGA_H_
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
@@ -1,7 +1,7 @@
 /*!
 * \file gps_l5_dll_pll_tracking_fpga.cc
 * \brief  Interface of an adapter of a DLL+PLL tracking loop block
- * for GPS L5 to a TrackingInterface
+ * for GPS L5 to a TrackingInterface for the FPGA
 * \author Marc Majoral, 2019. mmajoral(at)cttc.cat
 *         Javier Arribas, 2019. jarribas(at)cttc.es
 *
@@ -40,10 +40,15 @@
 #include "GPS_L5.h"
 #include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf_fpga.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include "gps_l5_signal.h"
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for round
+#include <cstring>  // for memcpy
+#include <iostream>

 #define NUM_PRNs 32

--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h
@@ -1,7 +1,7 @@
 /*!
 * \file gps_l5_dll_pll_tracking_fpga.h
 * \brief  Interface of an adapter of a DLL+PLL tracking loop block
- * for GPS L5 to a TrackingInterface
+ * for GPS L5 to a TrackingInterface for the FPGA
 * \author Marc Majoral, 2019. mmajoral(at)cttc.cat
 *         Javier Arribas, 2019. jarribas(at)cttc.es
 *
@@ -40,8 +40,12 @@

 #include "dll_pll_veml_tracking_fpga.h"
 #include "tracking_interface.h"
+#include <gnuradio/runtime_types.h>
+#include <cstddef>
+#include <cstdint>
 #include <string>

+class Gnss_Synchro;
 class ConfigurationInterface;

 /*!
@@ -62,10 +66,10 @@ public:
        return role_;
    }

-    //! Returns "GPS_L5_DLL_PLL_Tracking"
+    //! Returns "GPS_L5_DLL_PLL_Tracking_Fpga"
    inline std::string implementation() override
    {
-        return "GPS_L5_DLL_PLL_Tracking";
+        return "GPS_L5_DLL_PLL_Tracking_Fpga";
    }

    inline size_t item_size() override
@@ -90,6 +94,7 @@ public:
    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;

    void start_tracking() override;
+
    /*!
     * \brief Stop running tracking
     */
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -47,6 +47,7 @@
 #include "beidou_b1i_signal_processing.h"
 #include "galileo_e1_signal_processing.h"
 #include "galileo_e5_signal_processing.h"
+#include "gnss_satellite.h"
 #include "gnss_sdr_create_directory.h"
 #include "gnss_synchro.h"
 #include "gps_l2c_signal.h"
@@ -63,9 +64,11 @@
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>  // for fill_n
 #include <cmath>      // for fmod, round, floor
+#include <complex>    // for complex
+#include <cstdlib>    // for abs, size_t
 #include <exception>  // for exception
 #include <iostream>   // for cout, cerr
-#include <map>
+#include <map>        // for map


 dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(const Dll_Pll_Conf &conf_)
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
@@ -44,8 +44,10 @@
 #include <pmt/pmt.h>              // for pmt_t
 #include <cstdint>                // for int32_t
 #include <fstream>                // for string, ofstream
+#include <string>                 // for string
 #include <utility>                // for pair

+
 class Gnss_Synchro;
 class dll_pll_veml_tracking;

--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -41,25 +41,25 @@
 #include "Galileo_E1.h"
 #include "Galileo_E5a.h"
 #include "MATH_CONSTANTS.h"
-#include "galileo_e1_signal_processing.h"
-#include "galileo_e5_signal_processing.h"
+#include "fpga_multicorrelator.h"
+#include "gnss_satellite.h"
 #include "gnss_sdr_create_directory.h"
-#include "gps_l2c_signal.h"
-#include "gps_l5_signal.h"
-#include "gps_sdr_signal_processing.h"
+#include "gnss_synchro.h"
 #include "lock_detectors.h"
 #include "tracking_discriminators.h"
 #include <boost/filesystem/path.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>
 #include <cmath>
+#include <complex>
+#include <cstdlib>  // for abs, size_t
 #include <exception>
 #include <iostream>
-#include <numeric>
-#include <sstream>
+#include <map>


 dll_pll_veml_tracking_fpga_sptr dll_pll_veml_make_tracking_fpga(const Dll_Pll_Conf_Fpga &conf_)
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h
@@ -33,18 +33,23 @@
 #define GNSS_SDR_DLL_PLL_VEML_TRACKING_FPGA_H

 #include "dll_pll_conf_fpga.h"
-#include "fpga_multicorrelator.h"
-#include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include <boost/circular_buffer.hpp>
+#include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
-#include <fstream>
-#include <map>
-#include <queue>
+#include <gnuradio/gr_complex.h>  // for gr_complex
+#include <gnuradio/types.h>       // for gr_vector_const_void_star
+#include <pmt/pmt.h>              // for pmt_t
+#include <cstdint>
+#include <deque>    // for deque
+#include <fstream>  // for ofstream
+#include <memory>   // for shared_ptr
+#include <string>
 #include <utility>
-//#include <string>

+class Fpga_Multicorrelator_8sc;
+class Gnss_Synchro;
 class dll_pll_veml_tracking_fpga;

 using dll_pll_veml_tracking_fpga_sptr = boost::shared_ptr<dll_pll_veml_tracking_fpga>;