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

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -30,11 +30,17 @@
 
 
 #include "rtklib_pvt.h"
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
-#include "pvt_conf.h"
-#include "rtklib_rtkpos.h"
-#include <glog/logging.h>
+#include "MATH_CONSTANTS.h"           // for D2R
+#include "configuration_interface.h"  // for ConfigurationInterface
+#include "galileo_almanac.h"          // for Galileo_Almanac
+#include "galileo_ephemeris.h"        // for Galileo_Ephemeris
+#include "gnss_sdr_flags.h"           // for FLAGS_RINEX_version
+#include "gps_almanac.h"              // for Gps_Almanac
+#include "gps_ephemeris.h"            // for Gps_Ephemeris
+#include "pvt_conf.h"                 // for Pvt_Conf
+#include "rtklib_rtkpos.h"            // for rtkfree, rtkinit
+#include <glog/logging.h>             // for LOG
+#include <iostream>                   // for operator<<
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;

src/algorithms/PVT/adapters/rtklib_pvt.h

@@ -32,18 +32,21 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_H_
 #define GNSS_SDR_RTKLIB_PVT_H_
 
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "gps_almanac.h"
-#include "gps_ephemeris.h"
-#include "pvt_interface.h"
-#include "rtklib.h"
-#include "rtklib_pvt_gs.h"
-#include <map>
-#include <string>
-
+#include "pvt_interface.h"           // for PvtInterface
+#include "rtklib.h"                  // for rtk_t
+#include "rtklib_pvt_gs.h"           // for rtklib_pvt_gs_sptr
+#include <gnuradio/gr_complex.h>     // for gr_complex
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
+#include <ctime>                     // for time_t
+#include <map>                       // for map
+#include <string>                    // for string
 
 class ConfigurationInterface;
+class Galileo_Almanac;
+class Galileo_Ephemeris;
+class Gps_Almanac;
+class Gps_Ephemeris;
 
 /*!
  * \brief This class implements a PvtInterface for the RTKLIB PVT block

src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt

@@ -30,12 +30,13 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 
 target_link_libraries(pvt_gr_blocks
     PUBLIC
-        pvt_libs
+        algorithms_libs_rtklib
         core_system_parameters
         Boost::date_time
         Gnuradio::pmt
         Gnuradio::runtime
     PRIVATE
+        pvt_libs
         algorithms_libs
         Gflags::gflags
         Glog::glog

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc

@@ -29,23 +29,57 @@
  */
 
 #include "rtklib_pvt_gs.h"
+#include "beidou_dnav_almanac.h"
+#include "beidou_dnav_ephemeris.h"
+#include "beidou_dnav_iono.h"
+#include "beidou_dnav_utc_model.h"
 #include "display.h"
+#include "galileo_almanac.h"
 #include "galileo_almanac_helper.h"
+#include "galileo_ephemeris.h"
+#include "galileo_iono.h"
+#include "galileo_utc_model.h"
+#include "geojson_printer.h"
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
 #include "gnss_sdr_create_directory.h"
+#include "gps_almanac.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
+#include "gps_cnav_utc_model.h"
+#include "gps_ephemeris.h"
+#include "gps_iono.h"
+#include "gps_utc_model.h"
+#include "gpx_printer.h"
+#include "kml_printer.h"
+#include "monitor_pvt.h"
+#include "monitor_pvt_udp_sink.h"
+#include "nmea_printer.h"
 #include "pvt_conf.h"
-#include <boost/archive/xml_iarchive.hpp>
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/exception/all.hpp>
+#include "rinex_printer.h"
+#include "rtcm_printer.h"
+#include "rtklib_solver.h"
+#include <boost/any.hpp>                   // for any_cast, any
+#include <boost/archive/xml_iarchive.hpp>  // for xml_iarchive
+#include <boost/archive/xml_oarchive.hpp>  // for xml_oarchive
+#include <boost/bind/bind.hpp>             // for bind_t, bind
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/exception/exception.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/serialization/map.hpp>
-#include <glog/logging.h>
-#include <gnuradio/gr_complex.h>
-#include <gnuradio/io_signature.h>
-#include <algorithm>
-#include <exception>
-#include <fstream>
-#include <iostream>
-#include <stdexcept>
+#include <boost/serialization/nvp.hpp>  // for nvp, make_nvp
+#include <boost/system/error_code.hpp>  // for error_code
+#include <glog/logging.h>               // for LOG
+#include <gnuradio/io_signature.h>      // for io_signature
+#include <pmt/pmt_sugar.h>              // for mp
+#include <algorithm>                    // for sort, unique
+#include <exception>                    // for exception
+#include <fstream>                      // for ofstream
+#include <iostream>                     // for operator<<
+#include <stdexcept>                    // for length_error
+#include <sys/ipc.h>                    // for IPC_CREAT
+#include <sys/msg.h>                    // for msgctl
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
@@ -149,7 +183,6 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels,
     // initialize geojson_printer
     std::string geojson_dump_filename;
     geojson_dump_filename = d_dump_filename;
-
     d_geojson_output_enabled = conf_.geojson_output_enabled;
     if (d_geojson_output_enabled)
         {

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h

@@ -31,38 +31,39 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_GS_H
 #define GNSS_SDR_RTKLIB_PVT_GS_H
 
-#include "beidou_dnav_almanac.h"
-#include "beidou_dnav_ephemeris.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "geojson_printer.h"
 #include "gnss_synchro.h"
-#include "gps_almanac.h"
-#include "gps_ephemeris.h"
-#include "gpx_printer.h"
-#include "kml_printer.h"
-#include "monitor_pvt_udp_sink.h"
-#include "nmea_printer.h"
-#include "pvt_conf.h"
-#include "rinex_printer.h"
-#include "rtcm_printer.h"
-#include "rtklib_solver.h"
+#include "rtklib.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <gnuradio/sync_block.h>
-#include <pmt/pmt.h>
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/types.h>
-#include <utility>
-#include <vector>
-
+#include <boost/shared_ptr.hpp>   // for boost::shared_ptr
+#include <gnuradio/sync_block.h>  // for sync_block
+#include <gnuradio/types.h>       // for gr_vector_const_void_star
+#include <pmt/pmt.h>              // for pmt_t
+#include <chrono>                 // for system_clock
+#include <cstdint>                // for int32_t
+#include <ctime>                  // for time_t
+#include <map>                    // for map
+#include <memory>                 // for shared_ptr, unique_ptr
+#include <string>                 // for string
+#include <sys/types.h>            // for key_t
+#include <utility>                // for pair
+#include <vector>                 // for vector
 
+class Beidou_Dnav_Almanac;
+class Beidou_Dnav_Ephemeris;
+class Galileo_Almanac;
+class Galileo_Ephemeris;
+class GeoJSON_Printer;
+class Gps_Almanac;
+class Gps_Ephemeris;
+class Gpx_Printer;
+class Kml_Printer;
+class Monitor_Pvt_Udp_Sink;
+class Nmea_Printer;
+class Pvt_Conf;
+class Rinex_Printer;
+class Rtcm_Printer;
+class Rtklib_Solver;
 class rtklib_pvt_gs;
 
 using rtklib_pvt_gs_sptr = boost::shared_ptr<rtklib_pvt_gs>;

src/algorithms/PVT/libs/CMakeLists.txt

@@ -26,6 +26,7 @@ set(PVT_LIB_SOURCES
     rinex_printer.cc
     nmea_printer.cc
     rtcm_printer.cc
+    rtcm.cc
     geojson_printer.cc
     rtklib_solver.cc
     pvt_conf.cc
@@ -41,6 +42,7 @@ set(PVT_LIB_HEADERS
     rinex_printer.h
     nmea_printer.h
     rtcm_printer.h
+    rtcm.h
     geojson_printer.h
     rtklib_solver.h
     pvt_conf.h
@@ -59,10 +61,10 @@ target_link_libraries(pvt_libs
     PUBLIC
         Armadillo::armadillo
         Boost::date_time
-        algorithms_libs
         algorithms_libs_rtklib
         core_system_parameters
     PRIVATE
+        algorithms_libs
         Boost::filesystem
         Boost::system
         Gflags::gflags
@@ -72,13 +74,20 @@ target_link_libraries(pvt_libs
 
 target_include_directories(pvt_libs
     PUBLIC
-        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-        ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
         ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
+        target_compile_definitions(pvt_libs
+            PUBLIC
+                -DBOOST_ASIO_HAS_STD_STRING_VIEW
+        )
+    endif()
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(pvt_libs

src/algorithms/PVT/libs/rinex_printer.cc

@@ -29,6 +29,27 @@
  */
 
 #include "rinex_printer.h"
+#include "Beidou_B1I.h"
+#include "GLONASS_L1_L2_CA.h"
+#include "GPS_L1_CA.h"
+#include "Galileo_E1.h"
+#include "beidou_dnav_ephemeris.h"
+#include "beidou_dnav_iono.h"
+#include "beidou_dnav_utc_model.h"
+#include "galileo_ephemeris.h"
+#include "galileo_iono.h"
+#include "galileo_utc_model.h"
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
+#include "gnss_synchro.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
+#include "gps_cnav_utc_model.h"
+#include "gps_ephemeris.h"
+#include "gps_iono.h"
+#include "gps_navigation_message.h"
+#include "gps_utc_model.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/time_zone_base.hpp>
@@ -38,8 +59,9 @@
 #include <glog/logging.h>
 #include <algorithm>  // for min and max
 #include <cmath>      // for floor
-#include <cstdlib>    // for getenv()
+#include <cstring>    // for memcpy
 #include <exception>
+#include <iostream>  // for cout
 #include <iterator>
 #include <ostream>
 #include <set>

src/algorithms/PVT/libs/rinex_printer.h

@@ -51,25 +51,33 @@
 #ifndef GNSS_SDR_RINEX_PRINTER_H_
 #define GNSS_SDR_RINEX_PRINTER_H_
 
-#include "Beidou_B1I.h"
-#include "GLONASS_L1_L2_CA.h"
-#include "GPS_L1_CA.h"
-#include "Galileo_E1.h"
-#include "beidou_dnav_navigation_message.h"
-#include "galileo_navigation_message.h"
-#include "glonass_gnav_navigation_message.h"
-#include "gnss_synchro.h"
-#include "gps_cnav_navigation_message.h"
-#include "gps_navigation_message.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <cstdint>
-#include <fstream>
+#include <cstdint>  // for int32_t
+#include <cstdlib>  // for strtol, strtod
+#include <fstream>  // for fstream
 #include <iomanip>  // for setprecision
-#include <map>
+#include <map>      // for map
 #include <sstream>  // for stringstream
-#include <string>
+#include <string>   // for string
+
+class Beidou_Dnav_Ephemeris;
+class Beidou_Dnav_Iono;
+class Beidou_Dnav_Utc_Model;
+class Galileo_Ephemeris;
+class Galileo_Iono;
+class Galileo_Utc_Model;
+class Glonass_Gnav_Almanac;
+class Glonass_Gnav_Ephemeris;
+class Glonass_Gnav_Utc_Model;
+class Gnss_Synchro;
+class Gps_CNAV_Ephemeris;
+class Gps_CNAV_Iono;
+class Gps_CNAV_Utc_Model;
+class Gps_Ephemeris;
+class Gps_Iono;
+class Gps_Navigation_Message;
+class Gps_Utc_Model;
 
-class Sbas_Raw_Msg;
 
 /*!
  * \brief Class that handles the generation of Receiver

src/algorithms/PVT/libs/rtcm.cc

@@ -40,7 +40,6 @@
 #include <cmath>      // for std::fmod
 #include <cstdlib>    // for strtol
 #include <sstream>    // for std::stringstream
-#include <thread>
 
 
 Rtcm::Rtcm(uint16_t port)

src/algorithms/PVT/libs/rtcm.h

@@ -43,7 +43,9 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
 #include <bitset>
+#include <cstddef>  // for size_t
 #include <cstdint>
+#include <cstring>  // for memcpy
 #include <deque>
 #include <map>
 #include <memory>

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -92,15 +92,17 @@ add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 
 target_link_libraries(acquisition_adapters
     PUBLIC
-        Gnuradio::blocks
         algorithms_libs
         gnss_sdr_flags
         acquisition_gr_blocks
         core_system_parameters
+        Gnuradio::blocks
+        Volk::volk
     PRIVATE
         Boost::boost
         Gflags::gflags
         Glog::glog
+        Gnuradio::fft
         Volkgnsssdr::volkgnsssdr
         acquisition_libs
 )

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc

@@ -34,7 +34,15 @@
 #include "configuration_interface.h"
 #include "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include <glog/logging.h>
+#include <gnuradio/fft/fft.h>     // for fft_complex
+#include <gnuradio/gr_complex.h>  // for gr_complex
+#include <volk/volk.h>            // for volk_32fc_conjugate_32fc
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for abs, pow, floor
+#include <complex>  // for complex
+#include <cstring>  // for memcpy
 
 
 GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h

@@ -34,14 +34,15 @@
 
 #include "acquisition_interface.h"
 #include "complex_byte_to_float_x2.h"
-#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/stream_to_vector.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_...
+#include <volk/volk_complex.h>       // for lv_16sc_t
+#include <cstddef>                   // for size_t
 #include <string>
 
-
+class Gnss_Synchro;
 class ConfigurationInterface;
 
 /*!

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc

@@ -34,9 +34,15 @@
 #include "configuration_interface.h"
 #include "galileo_e5_signal_processing.h"
 #include "gnss_sdr_flags.h"
-#include <boost/math/distributions/exponential.hpp>
+#include "gnss_synchro.h"
 #include <glog/logging.h>
-#include <volk_gnsssdr/volk_gnsssdr_complex.h>
+#include <gnuradio/fft/fft.h>     // for fft_complex
+#include <gnuradio/gr_complex.h>  // for gr_complex
+#include <volk/volk.h>            // for volk_32fc_conjugate_32fc
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for abs, pow, floor
+#include <complex>  // for complex
+#include <cstring>  // for strcpy, memcpy
 
 
 GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration,

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h

@@ -34,12 +34,15 @@
 
 
 #include "acquisition_interface.h"
-#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
 #include <gnuradio/blocks/stream_to_vector.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_...
+#include <volk/volk_complex.h>       // for lv_16sc_t
+#include <cstddef>  // for size_t
+#include <cstdint>
 #include <string>
 
+class Gnss_Synchro;
 class ConfigurationInterface;
 
 class GalileoE5aPcpsAcquisitionFpga : public AcquisitionInterface

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc

@@ -36,10 +36,16 @@
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include <glog/logging.h>
 #include <gnuradio/fft/fft.h>
-#include <new>
+#include <gnuradio/gr_complex.h>  // for gr_complex
+#include <volk/volk.h>            // for volk_32fc_conjugate_32fc
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for abs, pow, floor
+#include <complex>  // for complex
+#include <cstring>  // for memcpy
 
 
 #define NUM_PRNs 32

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h

@@ -36,11 +36,13 @@
 #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FPGA_H_
 
 #include "acquisition_interface.h"
-#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <volk/volk_complex.h>       // for lv_16sc_t
+#include <cstddef>
 #include <string>
 
+class Gnss_Synchro;
 class ConfigurationInterface;
 
 /*!

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc

@@ -35,9 +35,16 @@
 #include "GPS_L2C.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include "gps_l2c_signal.h"
-#include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <gnuradio/fft/fft.h>     // for fft_complex
+#include <gnuradio/gr_complex.h>  // for gr_complex
+#include <volk/volk.h>            // for volk_32fc_conjugate_32fc
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for abs, pow, floor
+#include <complex>  // for complex
+#include <cstring>  // for memcpy
 
 #define NUM_PRNs 32
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h

@@ -36,14 +36,15 @@
 
 #include "acquisition_interface.h"
 #include "complex_byte_to_float_x2.h"
-#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/stream_to_vector.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <gnuradio/runtime_types.h>
+#include <volk/volk_complex.h>       // for lv_16sc_t
+#include <cstddef>
 #include <string>
 
-
+class Gnss_Synchro;
 class ConfigurationInterface;
 
 /*!

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc

@@ -36,9 +36,16 @@
 #include "GPS_L5.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include "gnss_synchro.h"
 #include "gps_l5_signal.h"
-#include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <gnuradio/fft/fft.h>     // for fft_complex
+#include <gnuradio/gr_complex.h>  // for gr_complex
+#include <volk/volk.h>            // for volk_32fc_conjugate_32fc
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>    // for abs, pow, floor
+#include <complex>  // for complex
+#include <cstring>  // for memcpy
 
 #define NUM_PRNs 32
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h

@@ -37,14 +37,15 @@
 
 #include "acquisition_interface.h"
 #include "complex_byte_to_float_x2.h"
-#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/stream_to_vector.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_...
+#include <volk/volk_complex.h>       // for lv_16sc_t
+#include <cstddef>                   // for size_t
 #include <string>
 
-
+class Gnss_Synchro;
 class ConfigurationInterface;
 
 /*!

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc

@@ -33,9 +33,15 @@
 
 
 #include "pcps_acquisition_fpga.h"
+#include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include <utility>
+#include <pmt/pmt.h>        // for from_long
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for ceil
+#include <iostream>         // for operator<<
+#include <utility>          // for move
+
 
 #define AQ_DOWNSAMPLING_DELAY 40  // delay due to the downsampling filter in the acquisition
 
@@ -133,7 +139,7 @@ void pcps_acquisition_fpga::set_state(int32_t state)
 void pcps_acquisition_fpga::send_positive_acquisition()
 {
     // Declare positive acquisition using a message port
-    //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL
+    // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL
     DLOG(INFO) << "positive acquisition"
                << ", satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN
                << ", sample_stamp " << d_sample_counter

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h

@@ -42,8 +42,15 @@
 
 
 #include "fpga_acquisition.h"
-#include "gnss_synchro.h"
-#include <gnuradio/block.h>
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/block.h>     // for block
+#include <gnuradio/types.h>     // for gr_vector_const_void_star
+#include <volk/volk_complex.h>  // for lv_16sc_t
+#include <cstdint>              // for uint32_t
+#include <memory>               // for shared_ptr
+#include <string>               // for string
+
+class Gnss_Synchro;
 
 typedef struct
 {
@@ -78,9 +85,7 @@ pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_);
 class pcps_acquisition_fpga : public gr::block
 {
 private:
-    friend pcps_acquisition_fpga_sptr
-
-    pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_);
+    friend pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_);
 
     pcps_acquisition_fpga(pcpsconf_fpga_t conf_);
 
@@ -115,10 +120,10 @@ public:
     ~pcps_acquisition_fpga();
 
     /*!
-      * \brief Set acquisition/tracking common Gnss_Synchro object pointer
-      * to exchange synchronization data between acquisition and tracking blocks.
-      * \param p_gnss_synchro Satellite information shared by the processing blocks.
-      */
+     * \brief Set acquisition/tracking common Gnss_Synchro object pointer
+     * to exchange synchronization data between acquisition and tracking blocks.
+     * \param p_gnss_synchro Satellite information shared by the processing blocks.
+     */
     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
@@ -133,53 +138,53 @@ public:
     }
 
     /*!
-      * \brief Initializes acquisition algorithm.
-      */
+     * \brief Initializes acquisition algorithm.
+     */
     void init();
 
     /*!
-      * \brief Sets local code for PCPS acquisition algorithm.
-      * \param code - Pointer to the PRN code.
-      */
+     * \brief Sets local code for PCPS acquisition algorithm.
+     * \param code - Pointer to the PRN code.
+     */
     void set_local_code();
 
     /*!
-      * \brief If set to 1, ensures that acquisition starts at the
-      * first available sample.
-      * \param state - int=1 forces start of acquisition
-      */
+     * \brief If set to 1, ensures that acquisition starts at the
+     * first available sample.
+     * \param state - int=1 forces start of acquisition
+     */
     void set_state(int32_t state);
 
     /*!
-      * \brief Starts acquisition algorithm, turning from standby mode to
-      * active mode
-      * \param active - bool that activates/deactivates the block.
-      */
+     * \brief Starts acquisition algorithm, turning from standby mode to
+     * active mode
+     * \param active - bool that activates/deactivates the block.
+     */
     void set_active(bool active);
 
     /*!
-      * \brief Set acquisition channel unique ID
-      * \param channel - receiver channel.
-      */
+     * \brief Set acquisition channel unique ID
+     * \param channel - receiver channel.
+     */
     inline void set_channel(uint32_t channel)
     {
         d_channel = channel;
     }
 
     /*!
-      * \brief Set statistics threshold of PCPS algorithm.
-      * \param threshold - Threshold for signal detection (check \ref Navitec2012,
-      * Algorithm 1, for a definition of this threshold).
-      */
+     * \brief Set statistics threshold of PCPS algorithm.
+     * \param threshold - Threshold for signal detection (check \ref Navitec2012,
+     * Algorithm 1, for a definition of this threshold).
+     */
     inline void set_threshold(float threshold)
     {
         d_threshold = threshold;
     }
 
     /*!
-      * \brief Set maximum Doppler grid search
-      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
-      */
+     * \brief Set maximum Doppler grid search
+     * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
+     */
     inline void set_doppler_max(uint32_t doppler_max)
     {
         acq_parameters.doppler_max = doppler_max;
@@ -187,22 +192,15 @@ public:
     }
 
     /*!
-      * \brief Set Doppler steps for the grid search
-      * \param doppler_step - Frequency bin of the search grid [Hz].
-      */
+     * \brief Set Doppler steps for the grid search
+     * \param doppler_step - Frequency bin of the search grid [Hz].
+     */
     inline void set_doppler_step(uint32_t doppler_step)
     {
         d_doppler_step = doppler_step;
         acquisition_fpga->set_doppler_step(doppler_step);
     }
 
-    /*!
-      * \brief Parallel Code Phase Search Acquisition signal processing.
-      */
-    int general_work(int noutput_items, gr_vector_int& ninput_items,
-        gr_vector_const_void_star& input_items,
-        gr_vector_void_star& output_items);
-
     /*!
      * \brief This funciton triggers a HW reset of the FPGA PL.
      */
@@ -212,6 +210,13 @@ public:
      * \brief This funciton is only used for the unit tests
      */
     void read_fpga_total_scale_factor(uint32_t* total_scale_factor, uint32_t* fw_scale_factor);
+
+    /*!
+     * \brief Parallel Code Phase Search Acquisition signal processing.
+     */
+    int general_work(int noutput_items, gr_vector_int& ninput_items,
+        gr_vector_const_void_star& input_items,
+        gr_vector_void_star& output_items);
 };
 
 #endif /* GNSS_SDR_PCPS_ACQUISITION_FPGA_H_*/

src/algorithms/acquisition/libs/CMakeLists.txt

@@ -37,7 +37,6 @@ add_library(acquisition_libs
 target_link_libraries(acquisition_libs
     PUBLIC
         Volk::volk
-        Gnuradio::fft
     PRIVATE
         Gflags::gflags
         Glog::glog

src/algorithms/acquisition/libs/fpga_acquisition.cc

@@ -1,16 +1,16 @@
 /*!
  * \file fpga_acquisition.cc
- * \brief High optimized FPGA vector correlator class
+ * \brief Highly optimized FPGA vector correlator class
  * \authors <ul>
  *          <li> Marc Majoral, 2019. mmajoral(at)cttc.cat
  *          </ul>
  *
- * Class that controls and executes a high optimized acquisition HW
+ * Class that controls and executes a highly optimized acquisition HW
  * accelerator in the FPGA
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2018  (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,13 +34,14 @@
  */
 
 #include "fpga_acquisition.h"
-#include "GPS_L1_CA.h"
-#include "gps_sdr_signal_processing.h"
-#include <glog/logging.h>
-#include <fcntl.h>  // libraries used by the GIPO
-#include <iostream>
-#include <sys/mman.h>  // libraries used by the GIPO
-#include <utility>
+#include "GPS_L1_CA.h"     // for GPS_TWO_PI
+#include <glog/logging.h>  // for LOG
+#include <cmath>           // for log2
+#include <fcntl.h>         // libraries used by the GIPO
+#include <iostream>        // for operator<<
+#include <sys/mman.h>      // libraries used by the GIPO
+#include <unistd.h>        // for write, close, read, ssize_t
+#include <utility>         // for move
 
 
 // FPGA register parameters
@@ -75,26 +76,6 @@
     })
 #endif
 
-bool Fpga_Acquisition::init()
-{
-    return true;
-}
-
-
-bool Fpga_Acquisition::set_local_code(uint32_t PRN)
-{
-    // select the code with the chosen PRN
-    d_PRN = PRN;
-    return true;
-}
-
-
-void Fpga_Acquisition::write_local_code()
-{
-    Fpga_Acquisition::fpga_configure_acquisition_local_code(
-        &d_all_fft_codes[d_nsamples_total * (d_PRN - 1)]);
-}
-
 
 Fpga_Acquisition::Fpga_Acquisition(std::string device_name,
     uint32_t nsamples,
@@ -132,6 +113,30 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name,
 }
 
 
+Fpga_Acquisition::~Fpga_Acquisition() = default;
+
+
+bool Fpga_Acquisition::init()
+{
+    return true;
+}
+
+
+bool Fpga_Acquisition::set_local_code(uint32_t PRN)
+{
+    // select the code with the chosen PRN
+    d_PRN = PRN;
+    return true;
+}
+
+
+void Fpga_Acquisition::write_local_code()
+{
+    Fpga_Acquisition::fpga_configure_acquisition_local_code(
+        &d_all_fft_codes[d_nsamples_total * (d_PRN - 1)]);
+}
+
+
 void Fpga_Acquisition::open_device()
 {
     // open communication with HW accelerator
@@ -151,9 +156,6 @@ void Fpga_Acquisition::open_device()
 }
 
 
-Fpga_Acquisition::~Fpga_Acquisition() = default;
-
-
 bool Fpga_Acquisition::free()
 {
     return true;

src/algorithms/acquisition/libs/fpga_acquisition.h

@@ -1,11 +1,11 @@
 /*!
  * \file fpga_acquisition.h
- * \brief High optimized FPGA vector correlator class
+ * \brief Highly optimized FPGA vector correlator class
  * \authors <ul>
  *          <li> Marc Majoral, 2019. mmajoral(at)cttc.cat
  *          </ul>
  *
- * Class that controls and executes a high optimized acquisition HW
+ * Class that controls and executes a highly optimized acquisition HW
  * accelerator in the FPGA
  *
  * -------------------------------------------------------------------------
@@ -36,9 +36,9 @@
 #ifndef GNSS_SDR_FPGA_ACQUISITION_H_
 #define GNSS_SDR_FPGA_ACQUISITION_H_
 
-#include <gnuradio/fft/fft.h>
-#include <volk/volk.h>
+#include <volk/volk_complex.h>  // for lv_16sc_t
 #include <cstdint>
+#include <string>
 
 /*!
  * \brief Class that implements carrier wipe-off and correlators.

src/algorithms/channel/adapters/CMakeLists.txt

@@ -30,6 +30,7 @@ target_link_libraries(channel_adapters
     PUBLIC
         Gnuradio::runtime
         channel_libs
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog

src/algorithms/channel/adapters/channel.cc

@@ -31,12 +31,13 @@
 
 #include "channel.h"
 #include "acquisition_interface.h"
+#include "channel_fsm.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include "telemetry_decoder_interface.h"
 #include "tracking_interface.h"
 #include <glog/logging.h>
-#include <cstdint>
+#include <cstring>  // for memcpy
 #include <utility>
 
 
@@ -204,8 +205,7 @@ void Channel::stop_channel()
             LOG(WARNING) << "Invalid channel event";
             return;
         }
-    DLOG(INFO)
-        << "Channel stop_channel()";
+    DLOG(INFO) << "Channel stop_channel()";
 }
 
 

src/algorithms/channel/adapters/channel.h

@@ -35,7 +35,6 @@
 #ifndef GNSS_SDR_CHANNEL_H_
 #define GNSS_SDR_CHANNEL_H_
 
-#include "channel_fsm.h"
 #include "channel_interface.h"
 #include "channel_msg_receiver_cc.h"
 #include "gnss_signal.h"
@@ -52,6 +51,7 @@ class ConfigurationInterface;
 class AcquisitionInterface;
 class TrackingInterface;
 class TelemetryDecoderInterface;
+class ChannelFsm;
 
 /*!
  * \brief This class represents a GNSS channel. It wraps an AcquisitionInterface,

src/algorithms/libs/CMakeLists.txt

@@ -40,7 +40,6 @@ set(GNSS_SPLIBS_SOURCES
     conjugate_ic.cc
     gnss_sdr_create_directory.cc
     geofunctions.cc
-    rtcm.cc
 )
 
 set(GNSS_SPLIBS_HEADERS
@@ -66,7 +65,6 @@ set(GNSS_SPLIBS_HEADERS
     gnss_sdr_create_directory.h
     gnss_circular_deque.h
     geofunctions.h
-    rtcm.h
 )
 
 if(ENABLE_FPGA)
@@ -114,20 +112,18 @@ target_link_libraries(algorithms_libs
         Gflags::gflags
         Gnuradio::runtime
         Gnuradio::blocks
-        Volk::volk ${ORC_LIBRARIES}
-        Volkgnsssdr::volkgnsssdr
-        core_system_parameters
         ${OPT_LIBRARIES}
     PRIVATE
+        core_system_parameters
+        Volk::volk ${ORC_LIBRARIES}
+        Volkgnsssdr::volkgnsssdr
         Boost::filesystem
-        Gflags::gflags
         Glog::glog
 )
 
 target_include_directories(algorithms_libs
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
-        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 target_compile_definitions(algorithms_libs
@@ -139,15 +135,6 @@ set_property(TARGET algorithms_libs
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
-if(OS_IS_MACOSX)
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
-        target_compile_definitions(algorithms_libs
-            PUBLIC
-                -DBOOST_ASIO_HAS_STD_STRING_VIEW
-        )
-    endif()
-endif()
-
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(algorithms_libs

src/algorithms/libs/beidou_b1i_signal_processing.h

@@ -35,7 +35,7 @@
 
 #include <complex>
 #include <cstdint>
-#include <iostream>
+
 
 //! Generates int32_t GPS L1 C/A code for the desired SV ID and code shift
 void beidou_b1i_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift);

src/algorithms/libs/byte_x2_to_complex_byte.cc

@@ -31,7 +31,10 @@
 
 #include "byte_x2_to_complex_byte.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <algorithm>  // for max
+#include <complex>    // for complex
+#include <cstdint>    // for int8_t
 
 
 byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte()
@@ -44,7 +47,7 @@ byte_x2_to_complex_byte::byte_x2_to_complex_byte() : sync_block("byte_x2_to_comp
                                                          gr::io_signature::make(2, 2, sizeof(int8_t)),    // int8_t, defined in stdint.h and included in volk.h (signed char)
                                                          gr::io_signature::make(1, 1, sizeof(lv_8sc_t)))  // lv_8sc_t is a Volk's typedef for std::complex<signed char>
 {
-    const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t);
+    const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_8sc_t);
     set_alignment(std::max(1, alignment_multiple));
 }
 

src/algorithms/libs/byte_x2_to_complex_byte.h

@@ -34,6 +34,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class byte_x2_to_complex_byte;
 
@@ -49,10 +50,9 @@ class byte_x2_to_complex_byte : public gr::sync_block
 {
 private:
     friend byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte();
-
-public:
     byte_x2_to_complex_byte();
 
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/complex_byte_to_float_x2.cc

@@ -32,6 +32,7 @@
 #include "complex_byte_to_float_x2.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <algorithm>  // for max
 
 
 complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2()

src/algorithms/libs/complex_byte_to_float_x2.h

@@ -34,6 +34,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class complex_byte_to_float_x2;
 
@@ -49,10 +50,9 @@ class complex_byte_to_float_x2 : public gr::sync_block
 {
 private:
     friend complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2();
-
-public:
     complex_byte_to_float_x2();
-
+    
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/complex_float_to_complex_byte.cc

@@ -32,7 +32,7 @@
 #include "complex_float_to_complex_byte.h"
 #include <gnuradio/io_signature.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-
+#include <algorithm>  // for max
 
 complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte()
 {

src/algorithms/libs/complex_float_to_complex_byte.h

@@ -33,6 +33,8 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
+
 
 class complex_float_to_complex_byte;
 
@@ -47,10 +49,9 @@ class complex_float_to_complex_byte : public gr::sync_block
 {
 private:
     friend complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte();
-
-public:
     complex_float_to_complex_byte();
-
+    
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/conjugate_cc.cc

@@ -31,6 +31,7 @@
 #include "conjugate_cc.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <algorithm>  // for max
 
 
 conjugate_cc_sptr make_conjugate_cc()

src/algorithms/libs/conjugate_cc.h

@@ -33,6 +33,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class conjugate_cc;
 
@@ -48,10 +49,9 @@ class conjugate_cc : public gr::sync_block
 {
 private:
     friend conjugate_cc_sptr make_conjugate_cc();
-
-public:
     conjugate_cc();
-
+    
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/conjugate_ic.cc

@@ -31,6 +31,7 @@
 #include "conjugate_ic.h"
 #include <gnuradio/io_signature.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <algorithm>  // for max
 
 
 conjugate_ic_sptr make_conjugate_ic()

src/algorithms/libs/conjugate_ic.h

@@ -33,6 +33,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class conjugate_ic;
 
@@ -48,10 +49,9 @@ class conjugate_ic : public gr::sync_block
 {
 private:
     friend conjugate_ic_sptr make_conjugate_ic();
-
-public:
     conjugate_ic();
 
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/conjugate_sc.cc

@@ -31,7 +31,7 @@
 #include "conjugate_sc.h"
 #include <gnuradio/io_signature.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-
+#include <algorithm>  // for max
 
 conjugate_sc_sptr make_conjugate_sc()
 {

src/algorithms/libs/conjugate_sc.h

@@ -33,6 +33,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class conjugate_sc;
 
@@ -48,10 +49,9 @@ class conjugate_sc : public gr::sync_block
 {
 private:
     friend conjugate_sc_sptr make_conjugate_sc();
-
-public:
     conjugate_sc();
-
+    
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/cshort_to_float_x2.cc

@@ -32,6 +32,7 @@
 #include "cshort_to_float_x2.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <algorithm>  // for max
 
 
 cshort_to_float_x2_sptr make_cshort_to_float_x2()

src/algorithms/libs/cshort_to_float_x2.h

@@ -34,6 +34,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class cshort_to_float_x2;
 
@@ -49,10 +50,9 @@ class cshort_to_float_x2 : public gr::sync_block
 {
 private:
     friend cshort_to_float_x2_sptr make_cshort_to_float_x2();
-
-public:
     cshort_to_float_x2();
 
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/libs/gnss_sdr_fpga_sample_counter.cc

@@ -33,12 +33,13 @@
 #include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include <cinttypes>
-#include <cmath>
-#include <fcntl.h>  // libraries used by the GIPO
-#include <iostream>
-#include <string>
-#include <sys/mman.h>  // libraries used by the GIPO
+#include <pmt/pmt.h>        // for from_double
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for round
+#include <fcntl.h>          // for O_RDWR, libraries used by the GIPO
+#include <iostream>         // for operator<<, endl
+#include <sys/mman.h>       // libraries used by the GIPO
+#include <unistd.h>         // for write, close, read, ssize_t
 
 
 #define PAGE_SIZE 0x10000             // default page size for the multicorrelator memory map

src/algorithms/libs/gnss_sdr_fpga_sample_counter.h

@@ -35,6 +35,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 #include <cstdint>
 #include <string>
 

src/algorithms/libs/gnss_sdr_sample_counter.cc

@@ -32,9 +32,11 @@
 #include "gnss_sdr_sample_counter.h"
 #include "gnss_synchro.h"
 #include <gnuradio/io_signature.h>
-#include <cmath>
-#include <iostream>
-#include <string>
+#include <pmt/pmt.h>        // for from_double
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for round
+#include <iostream>         // for operator<<
+#include <string>           // for string
 
 gnss_sdr_sample_counter::gnss_sdr_sample_counter(
     double _fs,

src/algorithms/libs/gnss_sdr_sample_counter.h

@@ -33,6 +33,8 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_decimator.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
+#include <cstddef>           // for size_t
 #include <cstdint>
 
 

src/algorithms/libs/gnss_sdr_time_counter.cc

@@ -32,7 +32,6 @@
 #include "gnss_sdr_time_counter.h"
 #include "gnss_synchro.h"
 #include <gnuradio/io_signature.h>
-#include <cmath>
 #include <iostream>
 #include <string>
 

src/algorithms/libs/gnss_sdr_time_counter.h

@@ -33,6 +33,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 #include <cstdint>
 
 class gnss_sdr_time_counter;

src/algorithms/libs/pass_through.cc

@@ -33,8 +33,10 @@
 #include "pass_through.h"
 #include "configuration_interface.h"
 #include <glog/logging.h>
-#include <volk/volk.h>
-#include <complex>
+#include <gnuradio/gr_complex.h>
+#include <volk/volk_complex.h>
+#include <cstdint>  // for int8_t
+#include <ostream>  // for operator<<
 
 
 Pass_Through::Pass_Through(ConfigurationInterface* configuration, const std::string& role,

src/algorithms/libs/pass_through.h

@@ -38,7 +38,8 @@
 #include "conjugate_sc.h"
 #include "gnss_block_interface.h"
 #include <gnuradio/blocks/copy.h>
-#include <gnuradio/hier_block2.h>
+#include <gnuradio/runtime_types.h>
+#include <cstddef>
 #include <string>
 
 

src/algorithms/libs/rtklib/CMakeLists.txt

@@ -66,9 +66,8 @@ source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 add_library(algorithms_libs_rtklib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 
 target_link_libraries(algorithms_libs_rtklib
-    PUBLIC
-        core_system_parameters
     PRIVATE
+        core_system_parameters
         Gflags::gflags
         Glog::glog
 )

src/algorithms/libs/rtklib/rtklib_conversions.cc

@@ -29,7 +29,20 @@
  */
 
 #include "rtklib_conversions.h"
+#include "MATH_CONSTANTS.h"          // for PI, PI_2
+#include "beidou_dnav_ephemeris.h"   // for Beidou_Dnav_Ephemeris
+#include "galileo_almanac.h"         // for Galileo_Almanac
+#include "galileo_ephemeris.h"       // for Galileo_Ephemeris
+#include "glonass_gnav_ephemeris.h"  // for Glonass_Gnav_Ephemeris
+#include "glonass_gnav_utc_model.h"  // for Glonass_Gnav_Utc_Model
+#include "gnss_obs_codes.h"          // for CODE_L1C, CODE_L2S, CODE_L5X
+#include "gnss_synchro.h"            // for Gnss_Synchro
+#include "gps_almanac.h"             // for Gps_Almanac
+#include "gps_cnav_ephemeris.h"      // for Gps_CNAV_Ephemeris
+#include "gps_ephemeris.h"           // for Gps_Ephemeris
 #include "rtklib_rtkcmn.h"
+#include <cmath>
+#include <cstdint>
 
 obsd_t insert_obs_to_rtklib(obsd_t& rtklib_obs, const Gnss_Synchro& gnss_synchro, int week, int band)
 {

src/algorithms/libs/rtklib/rtklib_conversions.h

@@ -31,17 +31,18 @@
 #ifndef GNSS_SDR_RTKLIB_CONVERSIONS_H_
 #define GNSS_SDR_RTKLIB_CONVERSIONS_H_
 
-#include "beidou_dnav_ephemeris.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "glonass_gnav_ephemeris.h"
-#include "glonass_gnav_utc_model.h"
-#include "gnss_synchro.h"
-#include "gps_almanac.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_ephemeris.h"
 #include "rtklib.h"
 
+class Beidou_Dnav_Ephemeris;
+class Galileo_Almanac;
+class Galileo_Ephemeris;
+class Glonass_Gnav_Ephemeris;
+class Glonass_Gnav_Utc_Model;
+class Gnss_Synchro;
+class Gps_Almanac;
+class Gps_CNAV_Ephemeris;
+class Gps_Ephemeris;
+
 eph_t eph_to_rtklib(const Galileo_Ephemeris& gal_eph);
 eph_t eph_to_rtklib(const Gps_Ephemeris& gps_eph);
 eph_t eph_to_rtklib(const Gps_CNAV_Ephemeris& gps_cnav_eph);

src/algorithms/libs/short_x2_to_cshort.cc

@@ -31,8 +31,9 @@
 
 #include "short_x2_to_cshort.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
-
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <algorithm>  // for max
+#include <complex>    // for complex
 
 short_x2_to_cshort_sptr make_short_x2_to_cshort()
 {
@@ -44,7 +45,7 @@ short_x2_to_cshort::short_x2_to_cshort() : sync_block("short_x2_to_cshort",
                                                gr::io_signature::make(2, 2, sizeof(int16_t)),
                                                gr::io_signature::make(1, 1, sizeof(lv_16sc_t)))
 {
-    const int alignment_multiple = volk_get_alignment() / sizeof(lv_16sc_t);
+    const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_16sc_t);
     set_alignment(std::max(1, alignment_multiple));
 }
 
@@ -61,7 +62,6 @@ int short_x2_to_cshort::work(int noutput_items,
     int16_t imag_part;
     for (int number = 0; number < noutput_items; number++)
         {
-            // lv_cmake(r, i) defined at volk/volk_complex.h
             real_part = *in0++;
             imag_part = *in1++;
             *out++ = lv_cmake(real_part, imag_part);

src/algorithms/libs/short_x2_to_cshort.h

@@ -34,6 +34,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 
 class short_x2_to_cshort;
 
@@ -48,10 +49,9 @@ class short_x2_to_cshort : public gr::sync_block
 {
 private:
     friend short_x2_to_cshort_sptr make_short_x2_to_cshort();
-
-public:
     short_x2_to_cshort();
 
+public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);

src/algorithms/observables/adapters/hybrid_observables.cc

@@ -33,6 +33,7 @@
 #include "hybrid_observables.h"
 #include "configuration_interface.h"
 #include <glog/logging.h>
+#include <ostream>  // for operator<<
 
 
 HybridObservables::HybridObservables(ConfigurationInterface* configuration,
@@ -44,7 +45,7 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration,
     dump_mat_ = configuration->property(role + ".dump_mat", true);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
 
-    observables_ = hybrid_make_observables_gs(in_streams_, out_streams_, dump_, dump_mat_, dump_filename_);
+    observables_ = hybrid_observables_gs_make(in_streams_, out_streams_, dump_, dump_mat_, dump_filename_);
     DLOG(INFO) << "Observables block ID (" << observables_->unique_id() << ")";
 }
 

src/algorithms/observables/adapters/hybrid_observables.h

@@ -36,6 +36,9 @@
 
 #include "hybrid_observables_gs.h"
 #include "observables_interface.h"
+#include <gnuradio/gr_complex.h>     // for gr_complex
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/observables/gnuradio_blocks/CMakeLists.txt

@@ -37,13 +37,13 @@ target_link_libraries(obs_gr_blocks
     PUBLIC
         Boost::boost
         Gnuradio::blocks
-        core_system_parameters
     PRIVATE
+        algorithms_libs
+        core_system_parameters
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Matio::matio
-        algorithms_libs
 )
 
 if(ENABLE_CLANG_TIDY)

src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc

@@ -30,23 +30,24 @@
  */
 
 #include "hybrid_observables_gs.h"
-#include "GPS_L1_CA.h"
-#include "display.h"
+#include "GPS_L1_CA.h"       // for GPS_STARTOFFSET_MS, GPS_TWO_PI
+#include "MATH_CONSTANTS.h"  // for SPEED_OF_LIGHT
+#include "gnss_circular_deque.h"
 #include "gnss_sdr_create_directory.h"
+#include "gnss_synchro.h"
 #include <boost/filesystem/path.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <exception>
-#include <iostream>
-#include <limits>
-#include <utility>
+#include <cmath>      // for round
+#include <cstdlib>    // for size_t, llabs
+#include <exception>  // for exception
+#include <iostream>   // for cerr, cout
+#include <limits>     // for numeric_limits
+#include <utility>    // for move
 
 
-hybrid_observables_gs_sptr hybrid_make_observables_gs(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename)
+hybrid_observables_gs_sptr hybrid_observables_gs_make(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename)
 {
     return hybrid_observables_gs_sptr(new hybrid_observables_gs(nchannels_in, nchannels_out, dump, dump_mat, std::move(dump_filename)));
 }

src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h

@@ -34,21 +34,24 @@
 #ifndef GNSS_SDR_HYBRID_OBSERVABLES_GS_H
 #define GNSS_SDR_HYBRID_OBSERVABLES_GS_H
 
-#include "gnss_circular_deque.h"
-#include "gnss_synchro.h"
-#include <boost/dynamic_bitset.hpp>
-#include <gnuradio/block.h>
-#include <fstream>
-#include <string>
-#include <utility>
-
+#include <boost/circular_buffer.hpp>  // for boost::curcular_buffer
+#include <boost/shared_ptr.hpp>       // for boost::shared_ptr
+#include <gnuradio/block.h>           // for block
+#include <gnuradio/types.h>           // for gr_vector_int
+#include <cstdint>                    // for int32_t
+#include <fstream>                    // for string, ofstream
+#include <vector>                     // for vector
 
+class Gnss_Synchro;
 class hybrid_observables_gs;
 
+template <class T>
+class Gnss_circular_deque;
+
 using hybrid_observables_gs_sptr = boost::shared_ptr<hybrid_observables_gs>;
 
 hybrid_observables_gs_sptr
-hybrid_make_observables_gs(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename);
+hybrid_observables_gs_make(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename);
 
 /*!
  * \brief This class implements a block that computes observables
@@ -63,7 +66,7 @@ public:
 
 private:
     friend hybrid_observables_gs_sptr
-    hybrid_make_observables_gs(uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, std::string dump_filename);
+    hybrid_observables_gs_make(uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, std::string dump_filename);
     hybrid_observables_gs(uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, std::string dump_filename);
     bool interpolate_data(Gnss_Synchro& out, const uint32_t& ch, const double& ti);
     bool interp_trk_obs(Gnss_Synchro& interpolated_obs, const uint32_t& ch, const uint64_t& rx_clock);

src/algorithms/signal_source/libs/gnss_sdr_valve.cc

@@ -32,11 +32,12 @@
  */
 
 #include "gnss_sdr_valve.h"
-#include "control_message_factory.h"
-#include <glog/logging.h>
-#include <gnuradio/io_signature.h>
-#include <algorithm>  // for min
-#include <cstring>    // for memcpy
+#include "control_message_factory.h"  // for ControlMessageFactory
+#include <glog/logging.h>             // for LOG
+#include <gnuradio/io_signature.h>    // for io_signature
+#include <algorithm>                  // for min
+#include <cstring>                    // for memcpy
+#include <unistd.h>                   // for usleep
 #include <utility>
 
 Gnss_Sdr_Valve::Gnss_Sdr_Valve(size_t sizeof_stream_item,

src/algorithms/signal_source/libs/gnss_sdr_valve.h

@@ -35,8 +35,10 @@
 #define GNSS_SDR_GNSS_SDR_VALVE_H_
 
 #include <boost/shared_ptr.hpp>
-#include <gnuradio/msg_queue.h>
-#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>   // for msg_queue, msg_queue::sptr
+#include <gnuradio/sync_block.h>  // for sync_block
+#include <gnuradio/types.h>       // for gr_vector_const_void_star
+#include <cstddef>                // for size_t
 #include <cstdint>
 
 boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,

src/algorithms/signal_source/libs/rtl_tcp_commands.cc

@@ -31,7 +31,9 @@
  */
 
 #include "rtl_tcp_commands.h"
-#include <string>
+#include <boost/asio/buffer.hpp>                  // for buffer
+#include <boost/asio/detail/impl/socket_ops.ipp>  // for host_to_network_long
+#include <cstring>                                // for memcpy
 
 boost::system::error_code rtl_tcp_command(RTL_TCP_COMMAND id, unsigned param, boost::asio::ip::tcp::socket &socket)
 {

src/algorithms/signal_source/libs/rtl_tcp_commands.h

@@ -32,7 +32,8 @@
 #ifndef GNSS_SDR_RTL_TCP_COMMANDS_H
 #define GNSS_SDR_RTL_TCP_COMMANDS_H
 
-#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/tcp.hpp>        // for tcp, tcp::socket
+#include <boost/system/error_code.hpp>  // for error_code
 
 /// Command IDs for configuration rtl_tcp
 enum RTL_TCP_COMMAND

src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc

@@ -31,13 +31,8 @@
 
 
 #include "beidou_b1i_telemetry_decoder.h"
-#include "beidou_dnav_almanac.h"
-#include "beidou_dnav_ephemeris.h"
-#include "beidou_dnav_iono.h"
-#include "beidou_dnav_utc_model.h"
 #include "configuration_interface.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 BeidouB1iTelemetryDecoder::BeidouB1iTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h

@@ -35,7 +35,10 @@
 #define GNSS_SDR_BEIDOU_B1I_TELEMETRY_DECODER_H_
 
 #include "beidou_b1i_telemetry_decoder_gs.h"
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc

@@ -33,12 +33,7 @@
 
 #include "galileo_e1b_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "galileo_iono.h"
-#include "galileo_utc_model.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h

@@ -38,6 +38,8 @@
 #include "galileo_telemetry_decoder_gs.h"
 #include "gnss_satellite.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 

src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc

@@ -36,12 +36,7 @@
 
 #include "galileo_e5a_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "galileo_iono.h"
-#include "galileo_utc_model.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h

@@ -38,7 +38,10 @@
 #define GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_H_
 
 #include "galileo_telemetry_decoder_gs.h"
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc

@@ -33,11 +33,7 @@
 
 #include "glonass_l1_ca_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
-#include "glonass_gnav_utc_model.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h

@@ -35,7 +35,10 @@
 #define GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_H_
 
 #include "glonass_l1_ca_telemetry_decoder_gs.h"
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc

@@ -32,11 +32,7 @@
 
 #include "glonass_l2_ca_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
-#include "glonass_gnav_utc_model.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GlonassL2CaTelemetryDecoder::GlonassL2CaTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h

@@ -33,8 +33,11 @@
 #ifndef GNSS_SDR_GLONASS_L2_CA_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GLONASS_L2_CA_TELEMETRY_DECODER_H_
 
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "glonass_l2_ca_telemetry_decoder_gs.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc

@@ -32,12 +32,7 @@
 
 #include "gps_l1_ca_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "gps_almanac.h"
-#include "gps_ephemeris.h"
-#include "gps_iono.h"
-#include "gps_utc_model.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h

@@ -33,8 +33,11 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_
 
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "gps_l1_ca_telemetry_decoder_gs.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc

@@ -32,12 +32,7 @@
 
 #include "gps_l2c_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "gps_almanac.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
-#include "gps_cnav_utc_model.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h

@@ -33,8 +33,11 @@
 #ifndef GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H_
 
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "gps_l2c_telemetry_decoder_gs.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc

@@ -33,7 +33,6 @@
 #include "gps_l5_telemetry_decoder.h"
 #include "configuration_interface.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h

@@ -37,6 +37,8 @@
 #include "gnss_satellite.h"
 #include "gps_l5_telemetry_decoder_gs.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 

src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc

@@ -32,10 +32,7 @@
 
 #include "sbas_l1_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "sbas_ephemeris.h"
-#include "sbas_l1_telemetry_decoder_gs.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 
 
 SbasL1TelemetryDecoder::SbasL1TelemetryDecoder(ConfigurationInterface* configuration,

src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h

@@ -34,8 +34,11 @@
 #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_
 
 
+#include "gnss_satellite.h"  // for Gnss_Satellite
 #include "sbas_l1_telemetry_decoder_gs.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
+#include <cstddef>                   // for size_t
 #include <string>
 
 

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc

@@ -1,7 +1,6 @@
 /*!
  * \file beidou_b1i_telemetry_decoder_gs.cc
- * \brief Implementation of an adapter of a BEIDOU BI1 DNAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a BEIDOU BI1 DNAV data decoder block
  * \note Code added as part of GSoC 2018 program
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.es
@@ -33,14 +32,22 @@
 
 
 #include "beidou_b1i_telemetry_decoder_gs.h"
+#include "Beidou_B1I.h"
+#include "beidou_dnav_almanac.h"
+#include "beidou_dnav_ephemeris.h"
+#include "beidou_dnav_utc_model.h"
 #include "convolutional.h"
 #include "display.h"
 #include "gnss_synchro.h"
-#include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include <iostream>
+#include <cstdlib>    // for abs
+#include <exception>  // for exception
+#include <iostream>   // for cout
+#include <memory>     // for shared_ptr, make_shared
 
 #define CRC_ERROR_LIMIT 8
 
@@ -314,8 +321,12 @@ void beidou_b1i_telemetry_decoder_gs::set_satellite(const Gnss_Satellite &satell
             volk_gnsssdr_free(d_secondary_code_symbols);
             volk_gnsssdr_free(d_subframe_symbols);
 
+            d_samples_per_symbol = (BEIDOU_B1I_CODE_RATE_HZ / BEIDOU_B1I_CODE_LENGTH_CHIPS) / BEIDOU_D2NAV_SYMBOL_RATE_SPS;
+            d_symbols_per_preamble = BEIDOU_DNAV_PREAMBLE_LENGTH_SYMBOLS;
+            d_samples_per_preamble = BEIDOU_DNAV_PREAMBLE_LENGTH_SYMBOLS * d_samples_per_symbol;
             d_secondary_code_symbols = nullptr;
             d_preamble_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(d_samples_per_preamble * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+            d_preamble_period_samples = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS * d_samples_per_symbol;
 
             // Setting samples of preamble code
             int32_t n = 0;

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h

@@ -1,9 +1,8 @@
 /*!
  * \file beidou_b1i_telemetry_decoder_gs.h
- * \brief Implementation of an adapter of a BEIDOU BI1 DNAV data decoder block
- * to a TelemetryDecoderInterface
- * \details Code added as part of GSoC 2018 program. However new modifications included to mimic
- * decoding of existing signals
+ * \brief Implementation of a BEIDOU BI1 DNAV data decoder block
+ * \details Code added as part of GSoC 2018 program. However new modifications
+ * included to mimic decoding of existing signals
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.es
  *
@@ -35,17 +34,16 @@
 #ifndef GNSS_SDR_BEIDOU_B1I_TELEMETRY_DECODER_GS_H
 #define GNSS_SDR_BEIDOU_B1I_TELEMETRY_DECODER_GS_H
 
-#include "Beidou_B1I.h"
-#include "beidou_dnav_almanac.h"
-#include "beidou_dnav_ephemeris.h"
-#include "beidou_dnav_navigation_message.h"
-#include "beidou_dnav_utc_model.h"
+
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
+#include "beidou_dnav_navigation_message.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>
+#include <gnuradio/types.h>                  // for gr_vector_const_void_star
 #include <fstream>
 #include <string>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <cstdint>
 
 
 class beidou_b1i_telemetry_decoder_gs;

src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc

@@ -30,14 +30,25 @@
 
 
 #include "galileo_telemetry_decoder_gs.h"
+#include "Galileo_E1.h"   // for GALILEO_E1_CODE_PERIOD_MS
+#include "Galileo_E5a.h"  // for GALILEO_E5A_CODE_PERIO...
 #include "convolutional.h"
 #include "display.h"
+#include "galileo_almanac_helper.h"  // for Galileo_Almanac_Helper
+#include "galileo_ephemeris.h"       // for Galileo_Ephemeris
+#include "galileo_iono.h"            // for Galileo_Iono
+#include "galileo_utc_model.h"       // for Galileo_Utc_Model
 #include "gnss_synchro.h"
-#include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include <iostream>
+#include <cmath>      // for fmod
+#include <cstdlib>    // for abs
+#include <exception>  // for exception
+#include <iostream>   // for cout
+#include <memory>     // for shared_ptr, make_shared
 
 
 #define CRC_ERROR_LIMIT 6

src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h

@@ -33,20 +33,16 @@
 #define GNSS_SDR_GALILEO_TELEMETRY_DECODER_GS_H
 
 
-#include "Galileo_E1.h"
-#include "Galileo_E5a.h"
-#include "galileo_almanac_helper.h"
-#include "galileo_ephemeris.h"
 #include "galileo_fnav_message.h"
-#include "galileo_iono.h"
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
 #include "galileo_navigation_message.h"
-#include "galileo_utc_model.h"
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>
 #include <fstream>
 #include <string>
+#include <cstdint>
 
 class galileo_telemetry_decoder_gs;
 

src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc

@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l1_ca_telemetry_decoder_gs.cc
- * \brief Implementation of an adapter of a GLONASS L1 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L1 C/A NAV data decoder block
  * \note Code added as part of GSoC 2017 program
  * \author Damian Miralles, 2017. dmiralles2009(at)gmail.com
  *
@@ -32,10 +31,19 @@
 
 
 #include "glonass_l1_ca_telemetry_decoder_gs.h"
-#include <boost/lexical_cast.hpp>
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for floor, round
+#include <cstdlib>          // for abs, malloc
+#include <cstring>          // for memcpy
+#include <exception>        // for exception
+#include <iostream>         // for cout
+#include <memory>           // for shared_ptr, make_shared
 
 #define CRC_ERROR_LIMIT 6
 

src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h

@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l1_ca_telemetry_decoder_gs.h
- * \brief Implementation of an adapter of a GLONASS L1 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L1 C/A NAV data decoder block
  * \note Code added as part of GSoC 2017 program
  * \author Damian Miralles, 2017. dmiralles2009(at)gmail.com
  *
@@ -35,15 +34,15 @@
 
 
 #include "GLONASS_L1_L2_CA.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_navigation_message.h"
-#include "glonass_gnav_utc_model.h"
 #include "gnss_satellite.h"
 #include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/block.h>
-#include <fstream>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/block.h>      // for block
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
+#include <cstdint>
+#include <fstream>  // for ofstream
 #include <string>
 
 

src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc

@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l2_ca_telemetry_decoder_gs.cc
- * \brief Implementation of an adapter of a GLONASS L1 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L2 C/A NAV data decoder block
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  *
  * -------------------------------------------------------------------------
@@ -32,10 +31,19 @@
 
 #include "glonass_l2_ca_telemetry_decoder_gs.h"
 #include "display.h"
-#include <boost/lexical_cast.hpp>
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for floor, round
+#include <cstdlib>          // for abs, malloc
+#include <cstring>          // for memcpy
+#include <exception>        // for exception
+#include <iostream>         // for cout
+#include <memory>           // for shared_ptr, make_shared
 
 #define CRC_ERROR_LIMIT 6
 

src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h

@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l2_ca_telemetry_decoder_gs.h
- * \brief Implementation of an adapter of a GLONASS L2 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L2 C/A NAV data decoder block
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  *
  * -------------------------------------------------------------------------
@@ -34,14 +33,14 @@
 
 
 #include "GLONASS_L1_L2_CA.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_navigation_message.h"
-#include "glonass_gnav_utc_model.h"
 #include "gnss_satellite.h"
 #include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
+#include <cstdint>
 #include <fstream>
 #include <string>
 
@@ -53,10 +52,10 @@ using glonass_l2_ca_telemetry_decoder_gs_sptr = boost::shared_ptr<glonass_l2_ca_
 glonass_l2_ca_telemetry_decoder_gs_sptr glonass_l2_ca_make_telemetry_decoder_gs(const Gnss_Satellite &satellite, bool dump);
 
 /*!
- * \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1
- * \see <a href="http://russianspacesystems.ru/wp-content/uploads/2016/08/ICD_GLONASS_eng_v5.1.pdf">GLONASS ICD</a>
- *
- */
+* \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1
+* \see <a href="http://russianspacesystems.ru/wp-content/uploads/2016/08/ICD_GLONASS_eng_v5.1.pdf">GLONASS ICD</a>
+*
+*/
 class glonass_l2_ca_telemetry_decoder_gs : public gr::block
 {
 public:
@@ -65,8 +64,8 @@ public:
     void set_channel(int32_t channel);                    //!< Set receiver's channel
 
     /*!
-     * \brief This is where all signal processing takes place
-     */
+    * \brief This is where all signal processing takes place
+    */
     int general_work(int noutput_items, gr_vector_int &ninput_items,
         gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
 

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc

@@ -30,10 +30,19 @@
  */
 
 #include "gps_l1_ca_telemetry_decoder_gs.h"
-#include <boost/lexical_cast.hpp>
+#include "gps_ephemeris.h"  // for Gps_Ephemeris
+#include "gps_iono.h"       // for Gps_Iono
+#include "gps_utc_model.h"  // for Gps_Utc_Model
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>      // for round
+#include <cstring>    // for memcpy
+#include <exception>  // for exception
+#include <iostream>   // for cout
+#include <memory>     // for shared_ptr
 
 
 #ifndef _rotl

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h

@@ -33,12 +33,16 @@
 
 #include "GPS_L1_CA.h"
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
 #include "gps_navigation_message.h"
+#include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/block.h>
-#include <fstream>
-#include <string>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/block.h>      // for block
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
+#include <cstdint>               // for int32_t
+#include <fstream>               // for ofstream
+#include <string>                // for string
+
 
 class gps_l1_ca_telemetry_decoder_gs;
 

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc

@@ -31,14 +31,21 @@
 
 
 #include "gps_l2c_telemetry_decoder_gs.h"
+#include "GPS_L2C.h"  // for GPS_L2_CNAV_DATA_PAGE_BITS, GPS_L...
 #include "display.h"
 #include "gnss_synchro.h"
-#include <boost/lexical_cast.hpp>
+#include "gps_cnav_ephemeris.h"  // for Gps_CNAV_Ephemeris
+#include "gps_cnav_iono.h"       // for Gps_CNAV_Iono
+#include "gps_cnav_utc_model.h"  // for Gps_CNAV_Utc_Model
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include <bitset>
-#include <iostream>
-#include <sstream>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
+#include <bitset>           // for bitset
+#include <cmath>            // for round
+#include <exception>        // for exception
+#include <iostream>         // for cout
+#include <memory>           // for shared_ptr, make_shared
 
 
 gps_l2c_telemetry_decoder_gs_sptr

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h

@@ -32,24 +32,18 @@
 #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_GS_H
 
 
-#include "GPS_L2C.h"
 #include "gnss_satellite.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
 #include "gps_cnav_navigation_message.h"
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
-#include <algorithm>  // for copy
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 #include <cstdint>
 #include <fstream>
 #include <string>
-#include <utility>  // for pair
-#include <vector>
 
 extern "C"
 {
-#include "bits.h"
 #include "cnav_msg.h"
-#include "edc.h"
 }
 
 

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc

@@ -34,12 +34,16 @@
 #include "gnss_synchro.h"
 #include "gps_cnav_ephemeris.h"
 #include "gps_cnav_iono.h"
-#include <boost/lexical_cast.hpp>
+#include "gps_cnav_utc_model.h"  // for Gps_CNAV_Utc_Model
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <bitset>
+#include <cstdlib>    // for abs
+#include <exception>  // for exception
 #include <iostream>
-#include <sstream>
+#include <memory>  // for shared_ptr, make_shared
 
 
 gps_l5_telemetry_decoder_gs_sptr

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h

@@ -31,23 +31,20 @@
 #define GNSS_SDR_GPS_L5_TELEMETRY_DECODER_GS_H
 
 
-#include "GPS_L5.h"
-#include "gnss_satellite.h"
-#include "gps_cnav_navigation_message.h"
+#include "GPS_L5.h"                       // for GPS_L5I_NH_CODE_LENGTH
+#include "gnss_satellite.h"               // for Gnss_Satellite
+#include "gps_cnav_navigation_message.h"  // for Gps_CNAV_Navigation_Message
 #include <boost/circular_buffer.hpp>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
-#include <algorithm>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 #include <cstdint>
 #include <fstream>
 #include <string>
-#include <utility>
-#include <vector>
 
 extern "C"
 {
-#include "bits.h"
 #include "cnav_msg.h"
-#include "edc.h"
 }
 
 

src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc

@@ -30,11 +30,13 @@
 
 #include "sbas_l1_telemetry_decoder_gs.h"
 #include "gnss_synchro.h"
-#include <boost/lexical_cast.hpp>
+#include "viterbi_decoder.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include <sstream>
-
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for abs
+#include <exception>        // for exception
+#include <iomanip>          // for operator<<, setw
 
 // logging levels
 #define EVENT 2      // logs important events which don't occur every block