From c82c7225dd3381e991fb49eb3a30f77a1eebbdb4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 08:59:04 +0100 Subject: [PATCH 01/14] Improve includes with the aid of include-what-you-use (IWYU) See rationale at https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md --- src/algorithms/PVT/adapters/rtklib_pvt.cc | 16 ++++-- src/algorithms/PVT/adapters/rtklib_pvt.h | 23 ++++---- .../PVT/gnuradio_blocks/CMakeLists.txt | 1 + .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 29 ++++++++-- .../PVT/gnuradio_blocks/rtklib_pvt_gs.h | 57 ++++++++++--------- src/algorithms/libs/pass_through.cc | 6 +- src/algorithms/libs/pass_through.h | 3 +- src/algorithms/libs/rtklib/CMakeLists.txt | 3 +- .../libs/rtklib/rtklib_conversions.cc | 13 +++++ .../libs/rtklib/rtklib_conversions.h | 19 ++++--- .../adapters/hybrid_observables.cc | 3 +- .../observables/adapters/hybrid_observables.h | 3 + .../gnuradio_blocks/CMakeLists.txt | 4 +- .../gnuradio_blocks/hybrid_observables_gs.cc | 21 +++---- .../gnuradio_blocks/hybrid_observables_gs.h | 23 ++++---- .../signal_source/libs/gnss_sdr_valve.cc | 11 ++-- .../signal_source/libs/gnss_sdr_valve.h | 6 +- .../signal_source/libs/rtl_tcp_commands.cc | 4 +- .../signal_source/libs/rtl_tcp_commands.h | 3 +- .../adapters/beidou_b1i_telemetry_decoder.cc | 1 - .../adapters/beidou_b1i_telemetry_decoder.h | 3 + .../adapters/galileo_e1b_telemetry_decoder.cc | 1 - .../adapters/galileo_e1b_telemetry_decoder.h | 2 + .../adapters/galileo_e5a_telemetry_decoder.cc | 1 - .../adapters/galileo_e5a_telemetry_decoder.h | 3 + .../glonass_l1_ca_telemetry_decoder.cc | 1 - .../glonass_l1_ca_telemetry_decoder.h | 3 + .../glonass_l2_ca_telemetry_decoder.cc | 1 - .../glonass_l2_ca_telemetry_decoder.h | 3 + .../adapters/gps_l1_ca_telemetry_decoder.cc | 1 - .../adapters/gps_l1_ca_telemetry_decoder.h | 3 + .../adapters/gps_l2c_telemetry_decoder.cc | 1 - .../adapters/gps_l2c_telemetry_decoder.h | 3 + .../adapters/gps_l5_telemetry_decoder.cc | 1 - .../adapters/gps_l5_telemetry_decoder.h | 2 + .../adapters/sbas_l1_telemetry_decoder.cc | 2 - .../adapters/sbas_l1_telemetry_decoder.h | 3 + .../beidou_b1i_telemetry_decoder_gs.cc | 1 - .../galileo_telemetry_decoder_gs.cc | 1 - .../glonass_l1_ca_telemetry_decoder_gs.cc | 1 - .../glonass_l2_ca_telemetry_decoder_gs.cc | 1 - .../gps_l1_ca_telemetry_decoder_gs.cc | 1 - .../gps_l2c_telemetry_decoder_gs.cc | 1 - .../gps_l5_telemetry_decoder_gs.cc | 1 - .../sbas_l1_telemetry_decoder_gs.cc | 1 - .../telemetry_decoder/libs/viterbi_decoder.cc | 2 + .../gnuradio_blocks/dll_pll_veml_tracking.cc | 18 +++--- .../gnuradio_blocks/dll_pll_veml_tracking.h | 16 +++--- src/core/receiver/CMakeLists.txt | 1 + src/core/receiver/control_message_factory.cc | 3 +- src/core/receiver/control_thread.cc | 52 ++++++++++------- src/core/receiver/control_thread.h | 30 +++++----- src/core/receiver/gnss_block_factory.cc | 13 ++--- src/core/receiver/gnss_block_factory.h | 9 +-- src/core/receiver/gnss_flowgraph.cc | 32 +++++++---- src/core/receiver/gnss_flowgraph.h | 30 +++++----- .../system_parameters/agnss_ref_location.h | 1 - src/core/system_parameters/agnss_ref_time.h | 1 - .../system_parameters/beidou_dnav_almanac.h | 1 - .../beidou_dnav_navigation_message.cc | 9 +-- .../beidou_dnav_navigation_message.h | 36 +++++------- .../system_parameters/galileo_fnav_message.cc | 5 +- src/core/system_parameters/galileo_iono.h | 1 + .../galileo_navigation_message.h | 1 - .../glonass_gnav_ephemeris.cc | 3 +- .../glonass_gnav_ephemeris.h | 2 +- .../glonass_gnav_navigation_message.cc | 3 + .../glonass_gnav_navigation_message.h | 3 + src/core/system_parameters/gnss_satellite.h | 1 + .../system_parameters/gps_cnav_ephemeris.cc | 2 + .../system_parameters/gps_cnav_ephemeris.h | 3 +- src/core/system_parameters/gps_cnav_iono.h | 1 - .../system_parameters/gps_cnav_utc_model.h | 1 - src/core/system_parameters/gps_ephemeris.h | 1 - src/core/system_parameters/gps_iono.h | 1 - .../gps_navigation_message.h | 1 - src/main/CMakeLists.txt | 1 - src/main/main.cc | 26 ++++----- 78 files changed, 343 insertions(+), 258 deletions(-) diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc index 3c6370177..7a6ae02ce 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.cc +++ b/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 +#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 // for LOG +#include // for operator<< #if OLD_BOOST #include namespace bc = boost::math; diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h index fd3fe7737..b61e25604 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.h +++ b/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 -#include - +#include "pvt_interface.h" // for PvtInterface +#include "rtklib.h" // for rtk_t +#include "rtklib_pvt_gs.h" // for rtklib_pvt_gs_sptr +#include // for gr_complex +#include // for basic_block_sptr, top_block_sptr +#include // for size_t +#include // for time_t +#include // for map +#include // 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 diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index d6ec638a5..485fc9711 100644 --- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt @@ -30,6 +30,7 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS}) target_link_libraries(pvt_gr_blocks PUBLIC + algorithms_libs_rtklib pvt_libs core_system_parameters Boost::date_time diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index c7b622f68..352cbe316 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -29,23 +29,43 @@ */ #include "rtklib_pvt_gs.h" +#include "beidou_dnav_almanac.h" +#include "beidou_dnav_ephemeris.h" #include "display.h" +#include "galileo_almanac.h" #include "galileo_almanac_helper.h" +#include "galileo_ephemeris.h" +#include "geojson_printer.h" #include "gnss_sdr_create_directory.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 // for any_cast, any #include #include -#include +#include // for bind_t, bind +#include +#include #include #include -#include -#include -#include +#include // for nvp, make_nvp +#include // for LOG +#include // for io_signature +#include // for mp #include #include #include #include #include +#include // for IPC_CREAT +#include // for msgctl #if OLD_BOOST #include namespace bc = boost::math; @@ -149,7 +169,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) { diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h index 30503ce01..4e3df2672 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h +++ b/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 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include // for boost::shared_ptr +#include // for sync_block +#include // for gr_vector_const_void_star +#include // for pmt_t +#include // for system_clock +#include // for int32_t +#include // for time_t +#include // for map +#include // for shared_ptr, unique_ptr +#include // for string +#include // for key_t +#include // for pair +#include // 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; diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index 2cb98fef8..a64ecba18 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -33,9 +33,9 @@ #include "pass_through.h" #include "configuration_interface.h" #include -#include -#include - +#include +#include +#include // for operator<< Pass_Through::Pass_Through(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h index 7ef1838bf..ec8046862 100644 --- a/src/algorithms/libs/pass_through.h +++ b/src/algorithms/libs/pass_through.h @@ -38,7 +38,8 @@ #include "conjugate_sc.h" #include "gnss_block_interface.h" #include -#include +#include +#include #include diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt index 6a85ff21b..f15c1c074 100644 --- a/src/algorithms/libs/rtklib/CMakeLists.txt +++ b/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 ) diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.cc b/src/algorithms/libs/rtklib/rtklib_conversions.cc index 6008fdfd4..280d81ebe 100644 --- a/src/algorithms/libs/rtklib/rtklib_conversions.cc +++ b/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 +#include obsd_t insert_obs_to_rtklib(obsd_t& rtklib_obs, const Gnss_Synchro& gnss_synchro, int week, int band) { diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.h b/src/algorithms/libs/rtklib/rtklib_conversions.h index de2b7baaf..a46d90c5f 100644 --- a/src/algorithms/libs/rtklib/rtklib_conversions.h +++ b/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); diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index cfb0f9cb6..e038e47ff 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -33,6 +33,7 @@ #include "hybrid_observables.h" #include "configuration_interface.h" #include +#include // 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() << ")"; } diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h index dcc1bc006..7e2d6c674 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.h +++ b/src/algorithms/observables/adapters/hybrid_observables.h @@ -36,6 +36,9 @@ #include "hybrid_observables_gs.h" #include "observables_interface.h" +#include // for gr_complex +#include // for basic_block_sptr, top_block_sptr +#include #include class ConfigurationInterface; diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 34a2f3c0d..90bc7236b 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/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) diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 52610e20a..93564f34a 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/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 #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include // for round +#include // for size_t, llabs +#include // for exception +#include // for cerr, cout +#include // for numeric_limits +#include // 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))); } diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h index 5a31674a7..170396761 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h +++ b/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 -#include -#include -#include -#include - +#include // for boost::curcular_buffer +#include // for boost::shared_ptr +#include // for block +#include // for gr_vector_int +#include // for int32_t +#include // for string, ofstream +#include // for vector +class Gnss_Synchro; class hybrid_observables_gs; +template +class Gnss_circular_deque; + using hybrid_observables_gs_sptr = boost::shared_ptr; 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); diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc index 5e0d6f4cd..19626a5d4 100644 --- a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc +++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc @@ -32,11 +32,12 @@ */ #include "gnss_sdr_valve.h" -#include "control_message_factory.h" -#include -#include -#include // for min -#include // for memcpy +#include "control_message_factory.h" // for ControlMessageFactory +#include // for LOG +#include // for io_signature +#include // for min +#include // for memcpy +#include // for usleep #include Gnss_Sdr_Valve::Gnss_Sdr_Valve(size_t sizeof_stream_item, diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h index 16a141cd4..76ddc9cd6 100644 --- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h +++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h @@ -35,8 +35,10 @@ #define GNSS_SDR_GNSS_SDR_VALVE_H_ #include -#include -#include +#include // for msg_queue, msg_queue::sptr +#include // for sync_block +#include // for gr_vector_const_void_star +#include // for size_t #include boost::shared_ptr gnss_sdr_make_valve(size_t sizeof_stream_item, diff --git a/src/algorithms/signal_source/libs/rtl_tcp_commands.cc b/src/algorithms/signal_source/libs/rtl_tcp_commands.cc index 45bb25a9f..31466e612 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_commands.cc +++ b/src/algorithms/signal_source/libs/rtl_tcp_commands.cc @@ -31,7 +31,9 @@ */ #include "rtl_tcp_commands.h" -#include +#include // for buffer +#include // for host_to_network_long +#include // for memcpy boost::system::error_code rtl_tcp_command(RTL_TCP_COMMAND id, unsigned param, boost::asio::ip::tcp::socket &socket) { diff --git a/src/algorithms/signal_source/libs/rtl_tcp_commands.h b/src/algorithms/signal_source/libs/rtl_tcp_commands.h index 8dab2a0c8..0c5a694e1 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_commands.h +++ b/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 +#include // for tcp, tcp::socket +#include // for error_code /// Command IDs for configuration rtl_tcp enum RTL_TCP_COMMAND diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc index d7ba2697b..2daf11435 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc @@ -37,7 +37,6 @@ #include "beidou_dnav_utc_model.h" #include "configuration_interface.h" #include -#include BeidouB1iTelemetryDecoder::BeidouB1iTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h index 1373b867b..cfc09ebea 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc index cace56896..e5b12992c 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -38,7 +38,6 @@ #include "galileo_iono.h" #include "galileo_utc_model.h" #include -#include GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h index 0e36a8a4c..1d39b37e4 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc index 6091e3a9f..6922b133c 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -41,7 +41,6 @@ #include "galileo_iono.h" #include "galileo_utc_model.h" #include -#include GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h index 8c02818a8..1bfc7a6e4 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc index 893929c98..c48e2944d 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc @@ -37,7 +37,6 @@ #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_utc_model.h" #include -#include GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h index cdc78b432..3b5e13d15 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h @@ -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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc index e73a8aad6..0347cf958 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc @@ -36,7 +36,6 @@ #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_utc_model.h" #include -#include GlonassL2CaTelemetryDecoder::GlonassL2CaTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h index 1ac52ccbb..3a36b7deb 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc index 4f2b65d85..b4ff602a3 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc @@ -37,7 +37,6 @@ #include "gps_iono.h" #include "gps_utc_model.h" #include -#include GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index 8596863ed..b43f8f426 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -33,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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc index 173a1f51c..601c6054a 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -37,7 +37,6 @@ #include "gps_cnav_iono.h" #include "gps_cnav_utc_model.h" #include -#include GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h index 7a032004a..83263a0c8 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc index f837c536b..c50ec9f51 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc +++ b/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 -#include GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h index ff2e04437..56fc3afd3 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 07cc67205..16d1d5fcb 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -32,10 +32,8 @@ #include "sbas_l1_telemetry_decoder.h" #include "configuration_interface.h" -#include "sbas_ephemeris.h" #include "sbas_l1_telemetry_decoder_gs.h" #include -#include SbasL1TelemetryDecoder::SbasL1TelemetryDecoder(ConfigurationInterface* configuration, diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index a1408095b..b6f9a8564 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/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 // for basic_block_sptr, top_block_sptr +#include // for size_t #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc index d85414e10..8bb55eff2 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc @@ -36,7 +36,6 @@ #include "convolutional.h" #include "display.h" #include "gnss_synchro.h" -#include #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index 3925866b2..36898d1be 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -33,7 +33,6 @@ #include "convolutional.h" #include "display.h" #include "gnss_synchro.h" -#include #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc index aae203f02..f859d1644 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc @@ -32,7 +32,6 @@ #include "glonass_l1_ca_telemetry_decoder_gs.h" -#include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc index c558e626f..2b996d987 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc @@ -32,7 +32,6 @@ #include "glonass_l2_ca_telemetry_decoder_gs.h" #include "display.h" -#include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc index adfc06a39..e9f925def 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc @@ -30,7 +30,6 @@ */ #include "gps_l1_ca_telemetry_decoder_gs.h" -#include #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc index 4af93900d..e8cc9b830 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc @@ -33,7 +33,6 @@ #include "gps_l2c_telemetry_decoder_gs.h" #include "display.h" #include "gnss_synchro.h" -#include #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc index a718ff7d4..f6560157a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc @@ -34,7 +34,6 @@ #include "gnss_synchro.h" #include "gps_cnav_ephemeris.h" #include "gps_cnav_iono.h" -#include #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc index c50b4ed37..c33e85116 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc @@ -30,7 +30,6 @@ #include "sbas_l1_telemetry_decoder_gs.h" #include "gnss_synchro.h" -#include #include #include #include diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc index febb18294..9c1fe1c53 100644 --- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc +++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc @@ -31,6 +31,8 @@ #include "viterbi_decoder.h" #include +#include // for memset +#include // for operator<<, basic_ostream, char_traits, endl // logging #define EVENT 2 // logs important events which don't occur every block diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index d54357912..f86ebfe45 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -46,6 +46,7 @@ #include "galileo_e1_signal_processing.h" #include "galileo_e5_signal_processing.h" #include "gnss_sdr_create_directory.h" +#include "gnss_synchro.h" #include "gps_l2c_signal.h" #include "gps_l5_signal.h" #include "gps_sdr_signal_processing.h" @@ -53,15 +54,16 @@ #include "tracking_discriminators.h" #include #include -#include -#include +#include // for io_signature +#include // for scoped_lock +#include // for Mat_VarCreate +#include // for mp #include -#include -#include -#include -#include -#include -#include +#include // for fill_n +#include // for fmod, round, floor +#include // for exception +#include // for cout, cerr +#include dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(const Dll_Pll_Conf &conf_) diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h index bcf605eb5..c1c9d6532 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h @@ -34,17 +34,19 @@ #include "cpu_multicorrelator_real_codes.h" #include "dll_pll_conf.h" -#include "gnss_synchro.h" #include "tracking_2nd_DLL_filter.h" #include "tracking_2nd_PLL_filter.h" #include -#include -#include -#include -#include -#include -#include +#include // for boost::shared_ptr +#include // for block +#include // for gr_complex +#include // for gr_vector_int, gr_vector... +#include // for pmt_t +#include // for int32_t +#include // for string, ofstream +#include // for pair +class Gnss_Synchro; class dll_pll_veml_tracking; using dll_pll_veml_tracking_sptr = boost::shared_ptr; diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index a9225792d..469960d47 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -143,6 +143,7 @@ target_link_libraries(core_receiver core_libs core_monitor PRIVATE + Boost::chrono Gflags::gflags Glog::glog signal_source_adapters diff --git a/src/core/receiver/control_message_factory.cc b/src/core/receiver/control_message_factory.cc index a9fb94702..566f884a4 100644 --- a/src/core/receiver/control_message_factory.cc +++ b/src/core/receiver/control_message_factory.cc @@ -30,7 +30,8 @@ #include "control_message_factory.h" #include - +#include // for memcpy +#include // for operator<<, basic_ostream // Constructor ControlMessageFactory::ControlMessageFactory() = default; diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 6d40c030d..b6f81b8a0 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -35,6 +35,7 @@ #include "control_thread.h" #include "concurrent_map.h" #include "concurrent_queue.h" +#include "configuration_interface.h" #include "control_message_factory.h" #include "file_configuration.h" #include "galileo_almanac.h" @@ -45,29 +46,36 @@ #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_utc_model.h" #include "gnss_flowgraph.h" +#include "gnss_satellite.h" #include "gnss_sdr_flags.h" -#include "gps_almanac.h" -#include "gps_ephemeris.h" -#include "gps_iono.h" -#include "gps_utc_model.h" -#include "pvt_interface.h" -#include "rtklib_conversions.h" -#include "rtklib_ephemeris.h" -#include "rtklib_rtkcmn.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "gps_acq_assist.h" // for Gps_Acq_Assist +#include "gps_almanac.h" // for Gps_Almanac +#include "gps_cnav_ephemeris.h" // for Gps_CNAV_Ephemeris +#include "gps_cnav_utc_model.h" // for Gps_CNAV_Utc_Model +#include "gps_ephemeris.h" // for Gps_Ephemeris +#include "gps_iono.h" // for Gps_Iono +#include "gps_utc_model.h" // for Gps_Utc_Model +#include "pvt_interface.h" // for PvtInterface +#include "rtklib.h" // for gtime_t, alm_t +#include "rtklib_conversions.h" // for alm_to_rtklib +#include "rtklib_ephemeris.h" // for alm2pos, eph2pos +#include "rtklib_rtkcmn.h" // for utc2gpst +#include // for bad_lexical_cast +#include // for LOG +#include // for message::sptr +#include // for make_any +#include // for find, min +#include // for milliseconds +#include // for floor, fmod, log +#include // for gmtime, strftime +#include // for exception +#include // for operator<<, endl +#include // for numeric_limits +#include // for map +#include // for pthread_cancel +#include // for invalid_argument +#include // for IPC_CREAT +#include // for msgctl, msgget extern Concurrent_Map global_gps_acq_assist_map; diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h index a1ecc5c1a..7d58226e9 100644 --- a/src/core/receiver/control_thread.h +++ b/src/core/receiver/control_thread.h @@ -35,20 +35,24 @@ #ifndef GNSS_SDR_CONTROL_THREAD_H_ #define GNSS_SDR_CONTROL_THREAD_H_ -#include "agnss_ref_location.h" -#include "agnss_ref_time.h" -#include "configuration_interface.h" -#include "control_message_factory.h" -#include "gnss_flowgraph.h" -#include "gnss_satellite.h" -#include "gnss_sdr_supl_client.h" -#include "tcp_cmd_interface.h" -#include -#include -#include -#include -#include +#include "agnss_ref_location.h" // for Agnss_Ref_Location +#include "agnss_ref_time.h" // for Agnss_Ref_Time +#include "control_message_factory.h" // for ControlMessage +#include "gnss_sdr_supl_client.h" // for Gnss_Sdr_Supl_Client +#include "tcp_cmd_interface.h" // for TcpCmdInterface +#include // for arma::vec +#include // for boost::thread +#include // for msg_queue, msg_queue::sptr +#include // for time_t +#include // for shared_ptr +#include // for string +#include // for std::thread +#include // for pair +#include // for vector +class ConfigurationInterface; +class GNSSFlowgraph; +class Gnss_Satellite; /*! * \brief This class represents the main thread of the application, so the name is ControlThread. diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 0c7860a55..81df9c0f8 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -36,6 +36,7 @@ #include "gnss_block_factory.h" +#include "acquisition_interface.h" // for AcquisitionInterface #include "array_signal_conditioner.h" #include "beamformer_filter.h" #include "beidou_b1i_dll_pll_tracking.h" @@ -105,8 +106,13 @@ #include "signal_conditioner.h" #include "spir_file_signal_source.h" #include "spir_gss6450_file_signal_source.h" +#include "telemetry_decoder_interface.h" +#include "tracking_interface.h" #include "two_bit_cpx_file_signal_source.h" #include "two_bit_packed_file_signal_source.h" +#include +#include // for exception +#include // for move #if RAW_UDP #include "custom_udp_signal_source.h" @@ -165,13 +171,6 @@ #include "gps_l1_ca_dll_pll_tracking_gpu.h" #endif -#include -#include -#include -#include -#include -#include - GNSSBlockFactory::GNSSBlockFactory() = default; diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index 2b2acc8b6..830349733 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -37,10 +37,11 @@ #ifndef GNSS_SDR_BLOCK_FACTORY_H_ #define GNSS_SDR_BLOCK_FACTORY_H_ -#include -#include -#include -#include +#include // for boost::shared_ptr +#include // for msg_queue::sptr, msg_queue +#include // for unique_ptr, shared_ptr +#include // for string +#include // for vector class ConfigurationInterface; diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 5b7d671d5..5881a3c49 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -42,16 +42,28 @@ #include "channel_interface.h" #include "configuration_interface.h" #include "gnss_block_factory.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "gnss_block_interface.h" +#include "gnss_satellite.h" +#include "gnss_synchro_monitor.h" +#include // for boost::lexical_cast +#include // for boost::shared_ptr +#include // for boost::tokenizer +#include // for LOG +#include // for basic_block +#include // for gr::filter::firdes +#include // for io_signature +#include // for top_block, make_top_block +#include // for mp +#include // for transform, sort, unique +#include // for floor +#include // for size_t +#include // for exception +#include // for operator<< +#include // for insert_iterator, inserter +#include // for set +#include // for invalid_argument +#include // for thread +#include // for move #ifdef GR_GREATER_38 #include #else diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h index 0a95eb60b..700783df1 100644 --- a/src/core/receiver/gnss_flowgraph.h +++ b/src/core/receiver/gnss_flowgraph.h @@ -37,29 +37,27 @@ #ifndef GNSS_SDR_GNSS_FLOWGRAPH_H_ #define GNSS_SDR_GNSS_FLOWGRAPH_H_ -#include "GPS_L1_CA.h" -#include "channel_interface.h" -#include "configuration_interface.h" -#include "gnss_block_factory.h" -#include "gnss_block_interface.h" #include "gnss_sdr_sample_counter.h" #include "gnss_signal.h" -#include "gnss_synchro_monitor.h" #include "pvt_interface.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include // for msg_queue, msg_queue::sptr +#include // for basic_block_sptr, top_block_sptr +#include // for pmt_t +#include // for list +#include // for map +#include // for for shared_ptr, dynamic_pointer_cast +#include // for mutex +#include // for string +#include // for pair +#include // for vector #if ENABLE_FPGA #include "gnss_sdr_fpga_sample_counter.h" #endif +class ChannelInterface; +class ConfigurationInterface; +class GNSSBlockInterface; +class Gnss_Satellite; /*! \brief This class represents a GNSS flow graph. * diff --git a/src/core/system_parameters/agnss_ref_location.h b/src/core/system_parameters/agnss_ref_location.h index 083305987..2fb96f6ea 100644 --- a/src/core/system_parameters/agnss_ref_location.h +++ b/src/core/system_parameters/agnss_ref_location.h @@ -32,7 +32,6 @@ #ifndef GNSS_SDR_AGNSS_REF_LOCATION_H_ #define GNSS_SDR_AGNSS_REF_LOCATION_H_ -#include #include diff --git a/src/core/system_parameters/agnss_ref_time.h b/src/core/system_parameters/agnss_ref_time.h index 574d9106a..e938ab013 100644 --- a/src/core/system_parameters/agnss_ref_time.h +++ b/src/core/system_parameters/agnss_ref_time.h @@ -32,7 +32,6 @@ #ifndef GNSS_SDR_AGNSS_REF_TIME_H_ #define GNSS_SDR_AGNSS_REF_TIME_H_ -#include #include diff --git a/src/core/system_parameters/beidou_dnav_almanac.h b/src/core/system_parameters/beidou_dnav_almanac.h index 5c31df3f6..ad6739123 100644 --- a/src/core/system_parameters/beidou_dnav_almanac.h +++ b/src/core/system_parameters/beidou_dnav_almanac.h @@ -34,7 +34,6 @@ #define GNSS_SDR_BEIDOU_DNAV_ALMANAC_H_ #include -#include /*! diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc index e280d07f8..40cabe10a 100644 --- a/src/core/system_parameters/beidou_dnav_navigation_message.cc +++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc @@ -32,13 +32,8 @@ #include "beidou_dnav_navigation_message.h" #include "gnss_satellite.h" -#include // for boost::crc_basic, boost::crc_optimal -#include -#include -#include -#include -#include -#include +#include // for cos, sin, fmod, sqrt, atan2, fabs, floor +#include // for string, operator<<, cout, ostream, endl void Beidou_Dnav_Navigation_Message::reset() diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h index 93c1c9a24..f2ca11e39 100644 --- a/src/core/system_parameters/beidou_dnav_navigation_message.h +++ b/src/core/system_parameters/beidou_dnav_navigation_message.h @@ -35,11 +35,11 @@ #include "Beidou_B1I.h" -#include "beidou_dnav_almanac.h" #include "beidou_dnav_ephemeris.h" #include "beidou_dnav_iono.h" #include "beidou_dnav_utc_model.h" #include +#include #include #include #include @@ -47,9 +47,7 @@ /*! - * \brief This class decodes a BeiDou D1 NAV Data message as described in IS-GPS-200E - * - * See http://www.gps.gov/technical/icwg/IS-GPS-200E.pdf Appendix II + * \brief This class decodes a BeiDou D1 NAV Data message */ class Beidou_Dnav_Navigation_Message { @@ -61,13 +59,17 @@ private: /* * Accounts for the beginning or end of week crossover * - * See paragraph 20.3.3.3.3.1 (IS-GPS-200E) * \param[in] - time in seconds * \param[out] - corrected time, in seconds */ double check_t(double time); public: + /*! + * Default constructor + */ + Beidou_Dnav_Navigation_Message(); + // System flags for data processing bool flag_eph_valid; bool flag_utc_model_valid; @@ -119,7 +121,7 @@ public: double d_Toe_sf2; //!< Ephemeris data reference time of week in subframe 2, D1 Message double d_Toe_sf3; //!< Ephemeris data reference time of week in subframe 3, D1 Message double d_Toe; //!< Ephemeris data reference time of week in subframe 1, D2 Message - double d_Toc; //!< clock data reference time (Ref. 20.3.3.3.3.1 IS-GPS-200E) [s] + double d_Toc; //!< clock data reference time [s] double d_Cic; //!< Amplitude of the Cosine Harmonic Correction Term to the Angle of Inclination [rad] double d_OMEGA0; //!< Longitude of Ascending Node of Orbit Plane at Weekly Epoch [semi-circles] double d_Cis; //!< Amplitude of the Sine Harmonic Correction Term to the Angle of Inclination [rad] @@ -218,8 +220,8 @@ public: double d_beta3; //!< Coefficient 3 of a cubic equation representing the period of the model [s(semi-circle)^3] // UTC parameters - double d_A1UTC; //!< 1st order term of a model that relates GPS and UTC time (ref. 20.3.3.5.2.4 IS-GPS-200E) [s/s] - double d_A0UTC; //!< Constant of a model that relates GPS and UTC time (ref. 20.3.3.5.2.4 IS-GPS-200E) [s] + double d_A1UTC; //!< 1st order term of a model that relates GPS and UTC time [s/s] + double d_A0UTC; //!< Constant of a model that relates GPS and UTC time [s] double d_DeltaT_LS; //!< delta time due to leap seconds [s]. Number of leap seconds since 6-Jan-1980 as transmitted by the GPS almanac. int32_t i_WN_LSF; //!< Week number at the end of which the leap second becomes effective [weeks] int32_t i_DN; //!< Day number (DN) at the end of which the leap second becomes effective [days] @@ -249,26 +251,24 @@ public: double d_satvel_Y; //!< Earth-fixed velocity coordinate y of the satellite [m] double d_satvel_Z; //!< Earth-fixed velocity coordinate z of the satellite [m] - // public functions void reset(); /*! - * \brief Obtain a GPS SV Ephemeris class filled with current SV data + * \brief Obtain a BDS SV Ephemeris class filled with current SV data */ Beidou_Dnav_Ephemeris get_ephemeris(); /*! - * \brief Obtain a GPS ionospheric correction parameters class filled with current SV data + * \brief Obtain a BDS ionospheric correction parameters class filled with current SV data */ Beidou_Dnav_Iono get_iono(); /*! - * \brief Obtain a GPS UTC model parameters class filled with current SV data + * \brief Obtain a BDS UTC model parameters class filled with current SV data */ Beidou_Dnav_Utc_Model get_utc_model(); - /*! * \brief Decodes the BDS D1 NAV message */ @@ -281,20 +281,18 @@ public: /*! * \brief Computes the position of the satellite - * - * Implementation of Table 20-IV (IS-GPS-200E) */ void satellitePosition(double transmitTime); /*! * \brief Sets (\a d_satClkCorr) according to the User Algorithm for SV Clock Correction - * and returns the corrected clock (IS-GPS-200E, 20.3.3.3.3.1) + * and returns the corrected clock */ double sv_clock_correction(double transmitTime); /*! * \brief Computes the Coordinated Universal Time (UTC) and - * returns it in [s] (IS-GPS-200E, 20.3.3.5.2.4) + * returns it in [s] */ double utc_time(const double beidoutime_corrected) const; @@ -319,10 +317,6 @@ public: * \brief Returns true if new UTC model has arrived. The flag is set to false when the function is executed */ bool have_new_almanac(); - /*! - * Default constructor - */ - Beidou_Dnav_Navigation_Message(); }; #endif diff --git a/src/core/system_parameters/galileo_fnav_message.cc b/src/core/system_parameters/galileo_fnav_message.cc index 689d8e339..9dc6eb49e 100644 --- a/src/core/system_parameters/galileo_fnav_message.cc +++ b/src/core/system_parameters/galileo_fnav_message.cc @@ -38,8 +38,9 @@ #include // for boost::crc_basic, boost::crc_optimal #include #include -#include - +#include // for reverse +#include // for string, operator<< +#include // for back_insert_iterator using CRC_Galileo_FNAV_type = boost::crc_optimal<24, 0x1864CFBu, 0x0, 0x0, false, false>; diff --git a/src/core/system_parameters/galileo_iono.h b/src/core/system_parameters/galileo_iono.h index ab36199c0..5fb5a3755 100644 --- a/src/core/system_parameters/galileo_iono.h +++ b/src/core/system_parameters/galileo_iono.h @@ -33,6 +33,7 @@ #define GNSS_SDR_GALILEO_IONO_H_ #include +#include /*! * \brief This class is a storage for the GALILEO IONOSPHERIC data as described in Galileo ICD paragraph 5.1.6 diff --git a/src/core/system_parameters/galileo_navigation_message.h b/src/core/system_parameters/galileo_navigation_message.h index cf1eb0a0f..6d8b0363a 100644 --- a/src/core/system_parameters/galileo_navigation_message.h +++ b/src/core/system_parameters/galileo_navigation_message.h @@ -40,7 +40,6 @@ #include "galileo_utc_model.h" #include #include -#include #include #include #include diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.cc b/src/core/system_parameters/glonass_gnav_ephemeris.cc index 1e0941dd7..9059b5940 100644 --- a/src/core/system_parameters/glonass_gnav_ephemeris.cc +++ b/src/core/system_parameters/glonass_gnav_ephemeris.cc @@ -32,7 +32,8 @@ #include "glonass_gnav_ephemeris.h" #include "GLONASS_L1_L2_CA.h" -#include "gnss_satellite.h" +#include +#include #include diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.h b/src/core/system_parameters/glonass_gnav_ephemeris.h index 6f53a992f..b5cf60f66 100644 --- a/src/core/system_parameters/glonass_gnav_ephemeris.h +++ b/src/core/system_parameters/glonass_gnav_ephemeris.h @@ -35,7 +35,7 @@ #define GNSS_SDR_GLONASS_GNAV_EPHEMERIS_H_ -#include +#include // for ptime #include #include diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc index 4433efc8a..c3d4176cd 100644 --- a/src/core/system_parameters/glonass_gnav_navigation_message.cc +++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc @@ -31,8 +31,11 @@ */ #include "glonass_gnav_navigation_message.h" +#include "MATH_CONSTANTS.h" // for TWO_N20, TWO_N30, TWO_N14, TWO_N15, TWO_N18 #include "gnss_satellite.h" #include +#include +#include // for operator<< void Glonass_Gnav_Navigation_Message::reset() diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.h b/src/core/system_parameters/glonass_gnav_navigation_message.h index 6f1f92312..3c2af1243 100644 --- a/src/core/system_parameters/glonass_gnav_navigation_message.h +++ b/src/core/system_parameters/glonass_gnav_navigation_message.h @@ -41,6 +41,9 @@ #include "glonass_gnav_utc_model.h" #include #include +#include // for pair +#include // for vector +#include /*! diff --git a/src/core/system_parameters/gnss_satellite.h b/src/core/system_parameters/gnss_satellite.h index 064b34b2e..0e97c5ce3 100644 --- a/src/core/system_parameters/gnss_satellite.h +++ b/src/core/system_parameters/gnss_satellite.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/src/core/system_parameters/gps_cnav_ephemeris.cc b/src/core/system_parameters/gps_cnav_ephemeris.cc index cb96a8a73..6a6609366 100644 --- a/src/core/system_parameters/gps_cnav_ephemeris.cc +++ b/src/core/system_parameters/gps_cnav_ephemeris.cc @@ -31,8 +31,10 @@ */ #include "gps_cnav_ephemeris.h" +#include "MATH_CONSTANTS.h" // for PI, SPEED_OF_LIGHT #include + Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris() { i_satellite_PRN = 0U; diff --git a/src/core/system_parameters/gps_cnav_ephemeris.h b/src/core/system_parameters/gps_cnav_ephemeris.h index 5f39454ea..aed92612b 100644 --- a/src/core/system_parameters/gps_cnav_ephemeris.h +++ b/src/core/system_parameters/gps_cnav_ephemeris.h @@ -32,9 +32,8 @@ #ifndef GNSS_SDR_GPS_CNAV_EPHEMERIS_H_ #define GNSS_SDR_GPS_CNAV_EPHEMERIS_H_ -#include "GPS_CNAV.h" -#include #include +#include /*! diff --git a/src/core/system_parameters/gps_cnav_iono.h b/src/core/system_parameters/gps_cnav_iono.h index fa60b6a9b..ae4c57526 100644 --- a/src/core/system_parameters/gps_cnav_iono.h +++ b/src/core/system_parameters/gps_cnav_iono.h @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_CNAV_IONO_H_ -#include #include diff --git a/src/core/system_parameters/gps_cnav_utc_model.h b/src/core/system_parameters/gps_cnav_utc_model.h index 555c7c640..abe801cf9 100644 --- a/src/core/system_parameters/gps_cnav_utc_model.h +++ b/src/core/system_parameters/gps_cnav_utc_model.h @@ -32,7 +32,6 @@ #ifndef GNSS_SDR_GPS_CNAV_UTC_MODEL_H_ #define GNSS_SDR_GPS_CNAV_UTC_MODEL_H_ -#include #include #include diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h index 683eb9135..b07a4ca4c 100644 --- a/src/core/system_parameters/gps_ephemeris.h +++ b/src/core/system_parameters/gps_ephemeris.h @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_EPHEMERIS_H_ -#include #include #include #include diff --git a/src/core/system_parameters/gps_iono.h b/src/core/system_parameters/gps_iono.h index 8a87e21d4..069fa20cb 100644 --- a/src/core/system_parameters/gps_iono.h +++ b/src/core/system_parameters/gps_iono.h @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_IONO_H_ -#include #include diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h index 1e79a02c9..b2a7b5bb3 100644 --- a/src/core/system_parameters/gps_navigation_message.h +++ b/src/core/system_parameters/gps_navigation_message.h @@ -34,7 +34,6 @@ #include "GPS_L1_CA.h" -#include "gps_almanac.h" #include "gps_ephemeris.h" #include "gps_iono.h" #include "gps_utc_model.h" diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index ad785f0f0..4561b7119 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(gnss-sdr Glog::glog Threads::Threads core_receiver - gnss_sdr_flags ) target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}") diff --git a/src/main/main.cc b/src/main/main.cc index 0a90f4a14..696ff412b 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -42,20 +42,20 @@ #include "concurrent_map.h" #include "concurrent_queue.h" #include "control_thread.h" -#include "gnss_sdr_flags.h" #include "gps_acq_assist.h" -#include -#include // for exception -#include // for create_directories, exists -#include // for path, operator<< -#include // for error_code -#include -#include -#include -#include -#include -#include -#include +#include // for diagnostic_informatio +#include // for exception +#include // for create_directories, exists +#include // for path, operator<< +#include // for error_code +#include // for thread_resource_error +#include // for ShutDownCommandLineFlags +#include // for FLAGS_log_dir +#include // for time_point +#include // for exception +#include // for operator<<, endl +#include // for unique_ptr +#include // for string #if CUDA_GPU_ACCEL // For the CUDA runtime routines (prefixed with "cuda_") From e6cfbadbf3c8c173e32506e3a62cdc0eef2d0e11 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 09:55:59 +0100 Subject: [PATCH 02/14] Improve includes with IWYU Fix for old Boost --- src/core/libs/gnss_sdr_supl_client.cc | 11 +++- src/core/libs/gnss_sdr_supl_client.h | 4 -- src/core/receiver/control_thread.cc | 56 +++++++++---------- .../galileo_navigation_message.cc | 9 +-- src/core/system_parameters/gps_ephemeris.h | 1 - .../gps_navigation_message.cc | 5 +- .../gps_navigation_message.h | 2 +- 7 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc index 366d628ae..fb429b7f4 100644 --- a/src/core/libs/gnss_sdr_supl_client.cc +++ b/src/core/libs/gnss_sdr_supl_client.cc @@ -32,10 +32,17 @@ */ #include "gnss_sdr_supl_client.h" +#include "GPS_L1_CA.h" +#include +#include +#include #include #include -#include -#include +#include // for pow +#include // for strcpy +#include // for exception +#include // for cerr +#include // for pair Gnss_Sdr_Supl_Client::Gnss_Sdr_Supl_Client() { diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h index af78c9f16..478fe7127 100644 --- a/src/core/libs/gnss_sdr_supl_client.h +++ b/src/core/libs/gnss_sdr_supl_client.h @@ -38,7 +38,6 @@ extern "C" { #include "supl.h" } -#include "GPS_L1_CA.h" #include "agnss_ref_location.h" #include "agnss_ref_time.h" #include "galileo_almanac.h" @@ -54,9 +53,6 @@ extern "C" #include "gps_ephemeris.h" #include "gps_iono.h" #include "gps_utc_model.h" -#include -#include -#include #include #include #include diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index b6f81b8a0..e92646586 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -48,34 +48,34 @@ #include "gnss_flowgraph.h" #include "gnss_satellite.h" #include "gnss_sdr_flags.h" -#include "gps_acq_assist.h" // for Gps_Acq_Assist -#include "gps_almanac.h" // for Gps_Almanac -#include "gps_cnav_ephemeris.h" // for Gps_CNAV_Ephemeris -#include "gps_cnav_utc_model.h" // for Gps_CNAV_Utc_Model -#include "gps_ephemeris.h" // for Gps_Ephemeris -#include "gps_iono.h" // for Gps_Iono -#include "gps_utc_model.h" // for Gps_Utc_Model -#include "pvt_interface.h" // for PvtInterface -#include "rtklib.h" // for gtime_t, alm_t -#include "rtklib_conversions.h" // for alm_to_rtklib -#include "rtklib_ephemeris.h" // for alm2pos, eph2pos -#include "rtklib_rtkcmn.h" // for utc2gpst -#include // for bad_lexical_cast -#include // for LOG -#include // for message::sptr -#include // for make_any -#include // for find, min -#include // for milliseconds -#include // for floor, fmod, log -#include // for gmtime, strftime -#include // for exception -#include // for operator<<, endl -#include // for numeric_limits -#include // for map -#include // for pthread_cancel -#include // for invalid_argument -#include // for IPC_CREAT -#include // for msgctl, msgget +#include "gps_acq_assist.h" // for Gps_Acq_Assist +#include "gps_almanac.h" // for Gps_Almanac +#include "gps_cnav_ephemeris.h" // for Gps_CNAV_Ephemeris +#include "gps_cnav_utc_model.h" // for Gps_CNAV_Utc_Model +#include "gps_ephemeris.h" // for Gps_Ephemeris +#include "gps_iono.h" // for Gps_Iono +#include "gps_utc_model.h" // for Gps_Utc_Model +#include "pvt_interface.h" // for PvtInterface +#include "rtklib.h" // for gtime_t, alm_t +#include "rtklib_conversions.h" // for alm_to_rtklib +#include "rtklib_ephemeris.h" // for alm2pos, eph2pos +#include "rtklib_rtkcmn.h" // for utc2gpst +#include // for bad_lexical_cast +#include // for LOG +#include // for message::sptr +#include // for make_any +#include // for find, min +#include // for milliseconds +#include // for floor, fmod, log +#include // for gmtime, strftime +#include // for exception +#include // for operator<<, endl +#include // for numeric_limits +#include // for map +#include // for pthread_cancel +#include // for invalid_argument +#include // for IPC_CREAT +#include // for msgctl, msgget extern Concurrent_Map global_gps_acq_assist_map; diff --git a/src/core/system_parameters/galileo_navigation_message.cc b/src/core/system_parameters/galileo_navigation_message.cc index 263294057..62fe2d243 100644 --- a/src/core/system_parameters/galileo_navigation_message.cc +++ b/src/core/system_parameters/galileo_navigation_message.cc @@ -31,10 +31,11 @@ */ #include "galileo_navigation_message.h" -#include // for boost::crc_basic, boost::crc_optimal -#include -#include -#include +#include // for boost::crc_basic, boost::crc_optimal +#include // for boost::dynamic_bitset +#include // for DLOG +#include // for reverse +#include // for operator<< using CRC_Galileo_INAV_type = boost::crc_optimal<24, 0x1864CFBu, 0x0, 0x0, false, false>; diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h index b07a4ca4c..e78b34207 100644 --- a/src/core/system_parameters/gps_ephemeris.h +++ b/src/core/system_parameters/gps_ephemeris.h @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_EPHEMERIS_H_ -#include #include #include #include diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc index e551551dc..8013d4d5f 100644 --- a/src/core/system_parameters/gps_navigation_message.cc +++ b/src/core/system_parameters/gps_navigation_message.cc @@ -32,8 +32,9 @@ m * \file gps_navigation_message.cc #include "gps_navigation_message.h" #include "gnss_satellite.h" -#include -#include +#include // for fmod, abs, floor +#include // for memcpy +#include // for operator<<, cout, endl void Gps_Navigation_Message::reset() diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h index b2a7b5bb3..21a4aa4cd 100644 --- a/src/core/system_parameters/gps_navigation_message.h +++ b/src/core/system_parameters/gps_navigation_message.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include // for pair #include From 809097f4814133178fcfba0cd5c2b95605e268e3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 10:01:08 +0100 Subject: [PATCH 03/14] Add missing header --- src/core/receiver/tcp_cmd_interface.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc index 0096c26a1..63064b244 100644 --- a/src/core/receiver/tcp_cmd_interface.cc +++ b/src/core/receiver/tcp_cmd_interface.cc @@ -32,6 +32,7 @@ #include "tcp_cmd_interface.h" #include "control_message_factory.h" #include +#include // for setprecision #include #include From 6eb81f52eedffb3e7af20dfbfac527601b023d81 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 12:33:54 +0100 Subject: [PATCH 04/14] Improve includes with IWYU Rtcm class moved to PVT/libs --- src/algorithms/PVT/libs/CMakeLists.txt | 15 ++++++++++++--- src/algorithms/{ => PVT}/libs/rtcm.cc | 1 - src/algorithms/{ => PVT}/libs/rtcm.h | 2 ++ .../channel/adapters/CMakeLists.txt | 1 + src/algorithms/channel/adapters/channel.cc | 6 +++--- src/algorithms/channel/adapters/channel.h | 2 +- src/algorithms/libs/CMakeLists.txt | 19 +++---------------- .../libs/byte_x2_to_complex_byte.cc | 7 +++++-- src/algorithms/libs/byte_x2_to_complex_byte.h | 4 ++-- .../libs/complex_byte_to_float_x2.cc | 1 + .../libs/complex_byte_to_float_x2.h | 6 +++--- .../libs/complex_float_to_complex_byte.cc | 2 +- .../libs/complex_float_to_complex_byte.h | 7 ++++--- src/algorithms/libs/conjugate_cc.cc | 1 + src/algorithms/libs/conjugate_cc.h | 6 +++--- src/algorithms/libs/conjugate_ic.cc | 1 + src/algorithms/libs/conjugate_ic.h | 4 ++-- src/algorithms/libs/conjugate_sc.cc | 2 +- src/algorithms/libs/conjugate_sc.h | 6 +++--- src/algorithms/libs/cshort_to_float_x2.cc | 1 + src/algorithms/libs/cshort_to_float_x2.h | 4 ++-- src/algorithms/libs/pass_through.cc | 2 ++ src/algorithms/libs/short_x2_to_cshort.cc | 8 ++++---- src/algorithms/libs/short_x2_to_cshort.h | 4 ++-- 24 files changed, 60 insertions(+), 52 deletions(-) rename src/algorithms/{ => PVT}/libs/rtcm.cc (99%) rename src/algorithms/{ => PVT}/libs/rtcm.h (99%) diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index d04fa0cb5..879dd9cba 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/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 diff --git a/src/algorithms/libs/rtcm.cc b/src/algorithms/PVT/libs/rtcm.cc similarity index 99% rename from src/algorithms/libs/rtcm.cc rename to src/algorithms/PVT/libs/rtcm.cc index 6e3b858c0..177ea25f6 100644 --- a/src/algorithms/libs/rtcm.cc +++ b/src/algorithms/PVT/libs/rtcm.cc @@ -40,7 +40,6 @@ #include // for std::fmod #include // for strtol #include // for std::stringstream -#include Rtcm::Rtcm(uint16_t port) diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/PVT/libs/rtcm.h similarity index 99% rename from src/algorithms/libs/rtcm.h rename to src/algorithms/PVT/libs/rtcm.h index 9196a0968..6fd9208af 100644 --- a/src/algorithms/libs/rtcm.h +++ b/src/algorithms/PVT/libs/rtcm.h @@ -43,7 +43,9 @@ #include #include #include +#include // for size_t #include +#include // for memcpy #include #include #include diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt index 7bf49e73d..7f439ce56 100644 --- a/src/algorithms/channel/adapters/CMakeLists.txt +++ b/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 diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 976a957e8..a6f0bba1c 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/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 -#include +#include // for memcpy #include @@ -204,8 +205,7 @@ void Channel::stop_channel() LOG(WARNING) << "Invalid channel event"; return; } - DLOG(INFO) - << "Channel stop_channel()"; + DLOG(INFO) << "Channel stop_channel()"; } diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index ce554784a..81030fd51 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/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, diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 78878897b..4e2a1962b 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/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 $ ) -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 diff --git a/src/algorithms/libs/byte_x2_to_complex_byte.cc b/src/algorithms/libs/byte_x2_to_complex_byte.cc index a3a78c067..f14474959 100644 --- a/src/algorithms/libs/byte_x2_to_complex_byte.cc +++ b/src/algorithms/libs/byte_x2_to_complex_byte.cc @@ -31,7 +31,10 @@ #include "byte_x2_to_complex_byte.h" #include -#include +#include +#include // for max +#include // for complex +#include // 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 { - const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t); + const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_8sc_t); set_alignment(std::max(1, alignment_multiple)); } diff --git a/src/algorithms/libs/byte_x2_to_complex_byte.h b/src/algorithms/libs/byte_x2_to_complex_byte.h index 05db6cb2d..d0a4e5dd2 100644 --- a/src/algorithms/libs/byte_x2_to_complex_byte.h +++ b/src/algorithms/libs/byte_x2_to_complex_byte.h @@ -34,6 +34,7 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/complex_byte_to_float_x2.cc b/src/algorithms/libs/complex_byte_to_float_x2.cc index 04f4a54b2..1126ad014 100644 --- a/src/algorithms/libs/complex_byte_to_float_x2.cc +++ b/src/algorithms/libs/complex_byte_to_float_x2.cc @@ -32,6 +32,7 @@ #include "complex_byte_to_float_x2.h" #include #include +#include // for max complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2() diff --git a/src/algorithms/libs/complex_byte_to_float_x2.h b/src/algorithms/libs/complex_byte_to_float_x2.h index 170cd6033..f13859633 100644 --- a/src/algorithms/libs/complex_byte_to_float_x2.h +++ b/src/algorithms/libs/complex_byte_to_float_x2.h @@ -34,6 +34,7 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/complex_float_to_complex_byte.cc b/src/algorithms/libs/complex_float_to_complex_byte.cc index d7106bedd..f4b9e44c0 100644 --- a/src/algorithms/libs/complex_float_to_complex_byte.cc +++ b/src/algorithms/libs/complex_float_to_complex_byte.cc @@ -32,7 +32,7 @@ #include "complex_float_to_complex_byte.h" #include #include - +#include // for max complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte() { diff --git a/src/algorithms/libs/complex_float_to_complex_byte.h b/src/algorithms/libs/complex_float_to_complex_byte.h index f8368543e..2e74ae11a 100644 --- a/src/algorithms/libs/complex_float_to_complex_byte.h +++ b/src/algorithms/libs/complex_float_to_complex_byte.h @@ -33,6 +33,8 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/conjugate_cc.cc b/src/algorithms/libs/conjugate_cc.cc index 67077ba23..c3080ffa5 100644 --- a/src/algorithms/libs/conjugate_cc.cc +++ b/src/algorithms/libs/conjugate_cc.cc @@ -31,6 +31,7 @@ #include "conjugate_cc.h" #include #include +#include // for max conjugate_cc_sptr make_conjugate_cc() diff --git a/src/algorithms/libs/conjugate_cc.h b/src/algorithms/libs/conjugate_cc.h index 56a3ece78..6ceb32f6f 100644 --- a/src/algorithms/libs/conjugate_cc.h +++ b/src/algorithms/libs/conjugate_cc.h @@ -33,6 +33,7 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/conjugate_ic.cc b/src/algorithms/libs/conjugate_ic.cc index d3d00932e..2f2c6a81e 100644 --- a/src/algorithms/libs/conjugate_ic.cc +++ b/src/algorithms/libs/conjugate_ic.cc @@ -31,6 +31,7 @@ #include "conjugate_ic.h" #include #include +#include // for max conjugate_ic_sptr make_conjugate_ic() diff --git a/src/algorithms/libs/conjugate_ic.h b/src/algorithms/libs/conjugate_ic.h index 4acc7af3a..2ffaf9e4c 100644 --- a/src/algorithms/libs/conjugate_ic.h +++ b/src/algorithms/libs/conjugate_ic.h @@ -33,6 +33,7 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/conjugate_sc.cc b/src/algorithms/libs/conjugate_sc.cc index e23f1c1a4..e32c39c45 100644 --- a/src/algorithms/libs/conjugate_sc.cc +++ b/src/algorithms/libs/conjugate_sc.cc @@ -31,7 +31,7 @@ #include "conjugate_sc.h" #include #include - +#include // for max conjugate_sc_sptr make_conjugate_sc() { diff --git a/src/algorithms/libs/conjugate_sc.h b/src/algorithms/libs/conjugate_sc.h index a26b39ad7..7f1935d5c 100644 --- a/src/algorithms/libs/conjugate_sc.h +++ b/src/algorithms/libs/conjugate_sc.h @@ -33,6 +33,7 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/cshort_to_float_x2.cc b/src/algorithms/libs/cshort_to_float_x2.cc index cfde3f79c..a3e8a8a21 100644 --- a/src/algorithms/libs/cshort_to_float_x2.cc +++ b/src/algorithms/libs/cshort_to_float_x2.cc @@ -32,6 +32,7 @@ #include "cshort_to_float_x2.h" #include #include +#include // for max cshort_to_float_x2_sptr make_cshort_to_float_x2() diff --git a/src/algorithms/libs/cshort_to_float_x2.h b/src/algorithms/libs/cshort_to_float_x2.h index 87a5d89a7..74c3ab356 100644 --- a/src/algorithms/libs/cshort_to_float_x2.h +++ b/src/algorithms/libs/cshort_to_float_x2.h @@ -34,6 +34,7 @@ #include #include +#include // 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); diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index a64ecba18..1a517a96b 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -35,8 +35,10 @@ #include #include #include +#include // for int8_t #include // for operator<< + Pass_Through::Pass_Through(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/libs/short_x2_to_cshort.cc b/src/algorithms/libs/short_x2_to_cshort.cc index 90ce99a7e..4561c7a46 100644 --- a/src/algorithms/libs/short_x2_to_cshort.cc +++ b/src/algorithms/libs/short_x2_to_cshort.cc @@ -31,8 +31,9 @@ #include "short_x2_to_cshort.h" #include -#include - +#include +#include // for max +#include // 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); diff --git a/src/algorithms/libs/short_x2_to_cshort.h b/src/algorithms/libs/short_x2_to_cshort.h index 1591c5412..eb1c24a06 100644 --- a/src/algorithms/libs/short_x2_to_cshort.h +++ b/src/algorithms/libs/short_x2_to_cshort.h @@ -34,6 +34,7 @@ #include #include +#include // 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); From 3f4a1dba096c9fb285963e1e6518b20376f37352 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 12:53:27 +0100 Subject: [PATCH 05/14] Remove unused include --- .../tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index dd1dda144..7715e2f8c 100644 --- 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,7 +41,6 @@ #include "Galileo_E1.h" #include "Galileo_E5a.h" #include "MATH_CONSTANTS.h" -#include "control_message_factory.h" #include "galileo_e1_signal_processing.h" #include "galileo_e5_signal_processing.h" #include "gnss_sdr_create_directory.h" From 287fe632be30e6f4f269c5e9bba9cc9cfdd12fc1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 13:20:45 +0100 Subject: [PATCH 06/14] Remove boost/shared_ptr.hpp include --- src/core/receiver/gnss_block_factory.cc | 4 ++-- src/core/receiver/gnss_block_factory.h | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 81df9c0f8..c058938cb 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -582,7 +582,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5X( std::unique_ptr GNSSBlockFactory::GetChannel_1G( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - boost::shared_ptr queue) + gr::msg_queue::sptr queue) { std::stringstream stream; stream << channel; @@ -650,7 +650,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1G( std::unique_ptr GNSSBlockFactory::GetChannel_2G( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - boost::shared_ptr queue) + gr::msg_queue::sptr queue) { std::stringstream stream; stream << channel; diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index 830349733..673d5ce26 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -37,8 +37,7 @@ #ifndef GNSS_SDR_BLOCK_FACTORY_H_ #define GNSS_SDR_BLOCK_FACTORY_H_ -#include // for boost::shared_ptr -#include // for msg_queue::sptr, msg_queue +#include // for msg_queue::sptr #include // for unique_ptr, shared_ptr #include // for string #include // for vector @@ -101,15 +100,15 @@ private: std::unique_ptr GetChannel_1G(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - boost::shared_ptr queue); + gr::msg_queue::sptr queue); std::unique_ptr GetChannel_2G(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - boost::shared_ptr queue); + gr::msg_queue::sptr queue); std::unique_ptr GetChannel_B1(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - boost::shared_ptr queue); + gr::msg_queue::sptr queue); std::unique_ptr GetAcqBlock( const std::shared_ptr& configuration, From c938093f6df2eba3553812703151e29cc596c4ab Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 19:31:41 +0100 Subject: [PATCH 07/14] Improve includes (IWYU) --- .../PVT/gnuradio_blocks/CMakeLists.txt | 2 +- .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 36 +++++++++++++------ src/core/receiver/tcp_cmd_interface.cc | 11 +++--- src/core/receiver/tcp_cmd_interface.h | 8 ++--- src/tests/single_test_main.cc | 12 +------ src/tests/test_main.cc | 25 ++----------- .../arithmetic/complex_carrier_test.cc | 1 + .../gps_l1_ca_pcps_acquisition_test_fpga.cc | 1 + 8 files changed, 41 insertions(+), 55 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index 485fc9711..936f4c05f 100644 --- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt @@ -31,12 +31,12 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS}) target_link_libraries(pvt_gr_blocks PUBLIC algorithms_libs_rtklib - pvt_libs core_system_parameters Boost::date_time Gnuradio::pmt Gnuradio::runtime PRIVATE + pvt_libs algorithms_libs Gflags::gflags Glog::glog diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 352cbe316..da71df27f 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -31,41 +31,55 @@ #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 "rinex_printer.h" #include "rtcm_printer.h" #include "rtklib_solver.h" -#include // for any_cast, any -#include -#include -#include // for bind_t, bind +#include // for any_cast, any +#include // for xml_iarchive +#include // for xml_oarchive +#include // for bind_t, bind #include #include #include #include #include // for nvp, make_nvp +#include // for error_code #include // for LOG #include // for io_signature #include // for mp -#include -#include -#include -#include -#include -#include // for IPC_CREAT -#include // for msgctl +#include // for sort, unique +#include // for exception +#include // for ofstream +#include // for operator<< +#include // for length_error +#include // for IPC_CREAT +#include // for msgctl #if OLD_BOOST #include namespace bc = boost::math; diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc index 63064b244..f6f549735 100644 --- a/src/core/receiver/tcp_cmd_interface.cc +++ b/src/core/receiver/tcp_cmd_interface.cc @@ -31,10 +31,13 @@ #include "tcp_cmd_interface.h" #include "control_message_factory.h" -#include -#include // for setprecision -#include -#include +#include "pvt_interface.h" +#include +#include // for isnan +#include // for exception +#include // for setprecision +#include // for stringstream +#include // for move TcpCmdInterface::TcpCmdInterface() diff --git a/src/core/receiver/tcp_cmd_interface.h b/src/core/receiver/tcp_cmd_interface.h index 2e75298ec..e5658a6d9 100644 --- a/src/core/receiver/tcp_cmd_interface.h +++ b/src/core/receiver/tcp_cmd_interface.h @@ -31,20 +31,18 @@ #ifndef GNSS_SDR_TCP_CMD_INTERFACE_H_ #define GNSS_SDR_TCP_CMD_INTERFACE_H_ -#include "pvt_interface.h" + #include -#include -#include #include -#include #include #include #include -#include +#include #include #include #include +class PvtInterface; class TcpCmdInterface { diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc index 2fa1a0e59..aa981c48a 100644 --- a/src/tests/single_test_main.cc +++ b/src/tests/single_test_main.cc @@ -29,24 +29,14 @@ * ------------------------------------------------------------------------- */ -#include "agnss_ref_location.h" -#include "agnss_ref_time.h" + #include "concurrent_map.h" #include "concurrent_queue.h" -#include "galileo_navigation_message.h" #include "gps_acq_assist.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" -#include "gps_ephemeris.h" -#include "gps_navigation_message.h" -#include #include #include -#include #include -#include #include -#include Concurrent_Queue global_gps_acq_assist_queue; diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index c4621c13a..c7a8d6304 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -31,32 +31,11 @@ #include "concurrent_map.h" #include "concurrent_queue.h" -#include "control_thread.h" -#include "galileo_almanac.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 "gps_almanac.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" -#include "gps_ephemeris.h" -#include "gps_iono.h" -#include "gps_navigation_message.h" -#include "gps_utc_model.h" -#include "sbas_ephemeris.h" -#include -#include +#include "gps_acq_assist.h" #include #include -#include #include -#include #include -#include -#include DECLARE_string(log_dir); @@ -71,7 +50,7 @@ DECLARE_string(log_dir); #include "unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc" #endif // EXTRA_TESTS -#else +#else // UNIT_TESTING_MINIMAL #include "unit-tests/arithmetic/matio_test.cc" #include "unit-tests/arithmetic/code_generation_test.cc" diff --git a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc index 72e12bcc0..bd87a3da7 100644 --- a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc +++ b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc @@ -29,6 +29,7 @@ * ------------------------------------------------------------------------- */ +#include "GPS_L1_CA.h" #include "gnss_signal_processing.h" #include #include diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc index b99db53b6..58dd36719 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc @@ -46,6 +46,7 @@ #include #include #include +#include // for O_WRONLY #include #include #ifdef GR_GREATER_38 From 3b5b4ccf33a0d02034514ad453b32be3e1c38283 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 22:17:09 +0100 Subject: [PATCH 08/14] Improve includes with IWYU --- .../adapters/beidou_b1i_telemetry_decoder.cc | 4 ---- .../adapters/galileo_e1b_telemetry_decoder.cc | 4 ---- .../adapters/galileo_e5a_telemetry_decoder.cc | 4 ---- .../glonass_l1_ca_telemetry_decoder.cc | 3 --- .../glonass_l2_ca_telemetry_decoder.cc | 3 --- .../adapters/gps_l1_ca_telemetry_decoder.cc | 4 ---- .../adapters/gps_l2c_telemetry_decoder.cc | 4 ---- .../adapters/sbas_l1_telemetry_decoder.cc | 1 - .../beidou_b1i_telemetry_decoder_gs.cc | 14 ++++++++--- .../beidou_b1i_telemetry_decoder_gs.h | 18 +++++++------- .../galileo_telemetry_decoder_gs.cc | 14 ++++++++++- .../galileo_telemetry_decoder_gs.h | 17 +++++++------ .../glonass_l1_ca_telemetry_decoder_gs.cc | 16 ++++++++++--- .../glonass_l1_ca_telemetry_decoder_gs.h | 15 ++++++------ .../glonass_l2_ca_telemetry_decoder_gs.cc | 16 ++++++++++--- .../glonass_l2_ca_telemetry_decoder_gs.h | 24 +++++++++---------- .../gps_l1_ca_telemetry_decoder_gs.cc | 11 +++++++++ .../gps_l1_ca_telemetry_decoder_gs.h | 12 ++++++---- .../gps_l2c_telemetry_decoder_gs.cc | 14 ++++++++--- .../gps_l2c_telemetry_decoder_gs.h | 10 ++------ .../gps_l5_telemetry_decoder_gs.cc | 7 +++++- .../gps_l5_telemetry_decoder_gs.h | 13 ++++------ .../sbas_l1_telemetry_decoder_gs.cc | 7 ++++-- .../sbas_l1_telemetry_decoder_gs.h | 7 ++++-- 24 files changed, 140 insertions(+), 102 deletions(-) diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc index 2daf11435..db650d264 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc @@ -31,10 +31,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc index e5b12992c..f6614cd5f 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -33,10 +33,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc index 6922b133c..7c1dff20f 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -36,10 +36,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc index c48e2944d..fce316a5d 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc @@ -33,9 +33,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc index 0347cf958..2c8aad54f 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc @@ -32,9 +32,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc index b4ff602a3..5fadb8025 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc @@ -32,10 +32,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc index 601c6054a..eccee3f2d 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -32,10 +32,6 @@ #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 diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 16d1d5fcb..2621402ab 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -32,7 +32,6 @@ #include "sbas_l1_telemetry_decoder.h" #include "configuration_interface.h" -#include "sbas_l1_telemetry_decoder_gs.h" #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc index 8bb55eff2..506a4ff5e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc +++ b/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,13 +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 #include +#include // for make_any +#include // for mp #include -#include +#include // for abs +#include // for exception +#include // for cout +#include // for shared_ptr, make_shared #define CRC_ERROR_LIMIT 8 diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h index 0cd2da284..e38bfd206 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h +++ b/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 #include +#include // for gr_vector_const_void_star #include #include +#include // for boost::shared_ptr +#include class beidou_b1i_telemetry_decoder_gs; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index 36898d1be..c311342f1 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -30,13 +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 #include +#include // for make_any +#include // for mp #include -#include +#include // for fmod +#include // for abs +#include // for exception +#include // for cout +#include // for shared_ptr, make_shared #define CRC_ERROR_LIMIT 6 diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h index 83dc8118a..89988f8d6 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h @@ -33,20 +33,23 @@ #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_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 // for boost::shared_ptr +#include // for gr_vector_const_void_star +//#include "galileo_iono.h" #include "galileo_navigation_message.h" -#include "galileo_utc_model.h" +//#include "galileo_utc_model.h" #include "gnss_satellite.h" -#include "gnss_synchro.h" +//#include "gnss_synchro.h" #include #include #include #include +#include class galileo_telemetry_decoder_gs; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc index f859d1644..535917043 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc +++ b/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,9 +31,20 @@ #include "glonass_l1_ca_telemetry_decoder_gs.h" +#include "glonass_gnav_almanac.h" +#include "glonass_gnav_ephemeris.h" +#include "glonass_gnav_utc_model.h" +#include "gnss_synchro.h" #include #include - +#include // for make_any +#include // for mp +#include // for floor, round +#include // for abs, malloc +#include // for memcpy +#include // for exception +#include // for cout +#include // for shared_ptr, make_shared #define CRC_ERROR_LIMIT 6 diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h index b8cf5f25a..bdf1fd0d2 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h +++ b/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,17 +34,17 @@ #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 -#include -#include +#include // for boost::shared_ptr +#include // for block +#include // for gr_vector_const_void_star +#include +#include // for ofstream #include +class Gnss_Synchro; class glonass_l1_ca_telemetry_decoder_gs; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc index 2b996d987..8d901cb3a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc +++ b/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,9 +31,20 @@ #include "glonass_l2_ca_telemetry_decoder_gs.h" #include "display.h" +#include "glonass_gnav_almanac.h" +#include "glonass_gnav_ephemeris.h" +#include "glonass_gnav_utc_model.h" +#include "gnss_synchro.h" #include #include - +#include // for make_any +#include // for mp +#include // for floor, round +#include // for abs, malloc +#include // for memcpy +#include // for exception +#include // for cout +#include // for shared_ptr, make_shared #define CRC_ERROR_LIMIT 6 diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h index 13ec3876c..f4ba8c231 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h +++ b/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,18 +33,19 @@ #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 +#include // for boost::shared_ptr #include +#include // for gr_vector_const_void_star +#include #include #include +class Gnss_Synchro; + class glonass_l2_ca_telemetry_decoder_gs; using glonass_l2_ca_telemetry_decoder_gs_sptr = boost::shared_ptr; @@ -53,10 +53,10 @@ using glonass_l2_ca_telemetry_decoder_gs_sptr = boost::shared_ptrGLONASS ICD - * - */ +* \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1 +* \see GLONASS ICD +* +*/ class glonass_l2_ca_telemetry_decoder_gs : public gr::block { public: @@ -65,8 +65,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); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc index e9f925def..e12aa6b89 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc @@ -30,9 +30,20 @@ */ #include "gps_l1_ca_telemetry_decoder_gs.h" +#include "gnss_synchro.h" +#include "gps_ephemeris.h" // for Gps_Ephemeris +#include "gps_iono.h" // for Gps_Iono +#include "gps_utc_model.h" // for Gps_Utc_Model #include #include +#include // for make_any +#include // for mp #include +#include // for round +#include // for memcpy +#include // for exception +#include // for cout +#include // for shared_ptr #ifndef _rotl diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h index 38c51af5f..135311b4d 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h +++ b/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 -#include -#include -#include +#include // for boost::shared_ptr +#include // for block +#include // for gr_vector_const_void_star +#include // for int32_t +#include // for ofstream +#include // for string + +class Gnss_Synchro; class gps_l1_ca_telemetry_decoder_gs; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc index e8cc9b830..246173919 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc @@ -31,13 +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 "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 #include -#include -#include -#include +#include // for make_any +#include // for mp +#include // for bitset +#include // for round +#include // for exception +#include // for cout +#include // for shared_ptr, make_shared gps_l2c_telemetry_decoder_gs_sptr diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h index 4503753eb..241ac81e7 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h +++ b/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 // for boost::shared_ptr #include -#include // for copy +#include // for gr_vector_const_void_star #include #include #include -#include // for pair -#include extern "C" { -#include "bits.h" #include "cnav_msg.h" -#include "edc.h" } diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc index f6560157a..a70aaebb1 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc @@ -34,11 +34,16 @@ #include "gnss_synchro.h" #include "gps_cnav_ephemeris.h" #include "gps_cnav_iono.h" +#include "gps_cnav_utc_model.h" // for Gps_CNAV_Utc_Model #include #include +#include // for make_any +#include // for mp #include +#include // for abs +#include // for exception #include -#include +#include // for shared_ptr, make_shared gps_l5_telemetry_decoder_gs_sptr diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h index c8f55eb8f..e3fbd2e05 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h +++ b/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 +#include // for boost::shared_ptr #include -#include +#include // for gr_vector_const_void_star #include #include #include -#include -#include extern "C" { -#include "bits.h" #include "cnav_msg.h" -#include "edc.h" } diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc index c33e85116..30da62d4f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc @@ -30,10 +30,13 @@ #include "sbas_l1_telemetry_decoder_gs.h" #include "gnss_synchro.h" +#include "viterbi_decoder.h" #include #include -#include - +#include // for mp +#include // for abs +#include // for exception +#include // for operator<<, setw // logging levels #define EVENT 2 // logs important events which don't occur every block diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h index d0c9a25dc..bf9742a91 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h @@ -32,10 +32,12 @@ #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_GS_H #include "gnss_satellite.h" -#include "viterbi_decoder.h" #include +#include // for boost::shared_ptr #include -#include // for copy +#include // for gr_vector_const_void_star +#include // for copy +#include // for size_t #include #include #include @@ -43,6 +45,7 @@ #include // for pair #include +class Viterbi_Decoder; class sbas_l1_telemetry_decoder_gs; From 96f1823c724a7ea228713ad4508b9a05f52166ef Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 23:09:02 +0100 Subject: [PATCH 09/14] No forward declaration for Gnss_Synchro --- .../gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc | 1 - .../gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h | 2 +- .../gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc | 1 - .../gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h | 3 +-- .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc index 535917043..e39c84852 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc @@ -34,7 +34,6 @@ #include "glonass_gnav_almanac.h" #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_utc_model.h" -#include "gnss_synchro.h" #include #include #include // for make_any diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h index bdf1fd0d2..3b82aa5f2 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h @@ -36,6 +36,7 @@ #include "GLONASS_L1_L2_CA.h" #include "glonass_gnav_navigation_message.h" #include "gnss_satellite.h" +#include "gnss_synchro.h" #include #include // for boost::shared_ptr #include // for block @@ -44,7 +45,6 @@ #include // for ofstream #include -class Gnss_Synchro; class glonass_l1_ca_telemetry_decoder_gs; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc index 8d901cb3a..6f671bb9b 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc @@ -34,7 +34,6 @@ #include "glonass_gnav_almanac.h" #include "glonass_gnav_ephemeris.h" #include "glonass_gnav_utc_model.h" -#include "gnss_synchro.h" #include #include #include // for make_any diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h index f4ba8c231..40737fd85 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h @@ -35,6 +35,7 @@ #include "GLONASS_L1_L2_CA.h" #include "glonass_gnav_navigation_message.h" #include "gnss_satellite.h" +#include "gnss_synchro.h" #include #include // for boost::shared_ptr #include @@ -44,8 +45,6 @@ #include -class Gnss_Synchro; - class glonass_l2_ca_telemetry_decoder_gs; using glonass_l2_ca_telemetry_decoder_gs_sptr = boost::shared_ptr; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h index 135311b4d..ef22e17ca 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h @@ -34,6 +34,7 @@ #include "GPS_L1_CA.h" #include "gnss_satellite.h" #include "gps_navigation_message.h" +#include "gnss_synchro.h" #include #include // for boost::shared_ptr #include // for block @@ -42,7 +43,6 @@ #include // for ofstream #include // for string -class Gnss_Synchro; class gps_l1_ca_telemetry_decoder_gs; From d6ac1100e8a5ee227059cf1a0d1d6f504640acd2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Mar 2019 23:23:17 +0100 Subject: [PATCH 10/14] Remove unused / commented includes --- .../gnuradio_blocks/galileo_telemetry_decoder_gs.h | 7 ------- .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc | 1 - .../gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h | 3 +-- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h index 89988f8d6..3fbbabd68 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h @@ -33,18 +33,11 @@ #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 // for boost::shared_ptr #include // for gr_vector_const_void_star -//#include "galileo_iono.h" #include "galileo_navigation_message.h" -//#include "galileo_utc_model.h" #include "gnss_satellite.h" -//#include "gnss_synchro.h" #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc index e12aa6b89..9125f12de 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc @@ -30,7 +30,6 @@ */ #include "gps_l1_ca_telemetry_decoder_gs.h" -#include "gnss_synchro.h" #include "gps_ephemeris.h" // for Gps_Ephemeris #include "gps_iono.h" // for Gps_Iono #include "gps_utc_model.h" // for Gps_Utc_Model diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h index bf9742a91..35306340c 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h @@ -32,11 +32,10 @@ #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_GS_H #include "gnss_satellite.h" -#include +#include // for crc_optimal #include // for boost::shared_ptr #include #include // for gr_vector_const_void_star -#include // for copy #include // for size_t #include #include From b822bec184b9274da176bec299dc56f257ebfba3 Mon Sep 17 00:00:00 2001 From: Damian Miralles Date: Tue, 5 Mar 2019 19:45:44 -0600 Subject: [PATCH 11/14] bds_b1i: fixing bug with D2 messages --- .../gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc | 5 +++++ src/utils/matlab/hybrid_observables_plot_sample.m | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc index 6f50fd1c5..b60dd8f63 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc @@ -317,8 +317,13 @@ void beidou_b1i_telemetry_decoder_cc::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(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; + //d_subframe_length_symbols = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; // Setting samples of preamble code int32_t n = 0; diff --git a/src/utils/matlab/hybrid_observables_plot_sample.m b/src/utils/matlab/hybrid_observables_plot_sample.m index 9105c5bbd..2a8a784e5 100644 --- a/src/utils/matlab/hybrid_observables_plot_sample.m +++ b/src/utils/matlab/hybrid_observables_plot_sample.m @@ -29,10 +29,10 @@ clearvars; close all; addpath('./libs'); -samplingFreq = 6625000; %[Hz] -channels=5; -path='/archive/'; -observables_log_path=[path 'glo_observables.dat']; +samplingFreq = 25000000; %[Hz] +channels=10; +path='/home/dmiralles/Documents/gnss-sdr/'; +observables_log_path=[path 'observables.dat']; GNSS_observables= read_hybrid_observables_dump(channels,observables_log_path); %% From 68173b0920690d270e3fc7e92e0846b67eb19f98 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 6 Mar 2019 08:54:29 +0100 Subject: [PATCH 12/14] Apply clang-format --- .../gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc index d08d40c35..020fcb980 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc @@ -326,8 +326,7 @@ void beidou_b1i_telemetry_decoder_gs::set_satellite(const Gnss_Satellite &satell d_samples_per_preamble = BEIDOU_DNAV_PREAMBLE_LENGTH_SYMBOLS * d_samples_per_symbol; d_secondary_code_symbols = nullptr; d_preamble_samples = static_cast(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; - //d_subframe_length_symbols = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; + d_preamble_period_samples = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS * d_samples_per_symbol; // Setting samples of preamble code int32_t n = 0; From 5b8ab9f5910e54e9fcc4d7345986fc74f6a32318 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 6 Mar 2019 13:49:14 +0100 Subject: [PATCH 13/14] Improve includes (IWYU) --- .../acquisition/adapters/CMakeLists.txt | 4 +- ...ileo_e1_pcps_ambiguous_acquisition_fpga.cc | 8 ++ ...lileo_e1_pcps_ambiguous_acquisition_fpga.h | 7 +- .../galileo_e5a_pcps_acquisition_fpga.cc | 10 ++- .../galileo_e5a_pcps_acquisition_fpga.h | 7 +- .../gps_l1_ca_pcps_acquisition_fpga.cc | 8 +- .../gps_l1_ca_pcps_acquisition_fpga.h | 6 +- .../gps_l2_m_pcps_acquisition_fpga.cc | 9 +- .../adapters/gps_l2_m_pcps_acquisition_fpga.h | 7 +- .../adapters/gps_l5i_pcps_acquisition_fpga.cc | 9 +- .../adapters/gps_l5i_pcps_acquisition_fpga.h | 7 +- .../gnuradio_blocks/pcps_acquisition_fpga.cc | 10 ++- .../gnuradio_blocks/pcps_acquisition_fpga.h | 89 ++++++++++--------- .../acquisition/libs/CMakeLists.txt | 1 - .../acquisition/libs/fpga_acquisition.cc | 68 +++++++------- .../acquisition/libs/fpga_acquisition.h | 8 +- .../libs/beidou_b1i_signal_processing.h | 2 +- .../libs/gnss_sdr_fpga_sample_counter.cc | 13 +-- .../libs/gnss_sdr_fpga_sample_counter.h | 1 + .../libs/gnss_sdr_sample_counter.cc | 8 +- src/algorithms/libs/gnss_sdr_sample_counter.h | 2 + src/algorithms/libs/gnss_sdr_time_counter.cc | 1 - src/algorithms/libs/gnss_sdr_time_counter.h | 1 + src/utils/front-end-cal/front_end_cal.cc | 11 +-- src/utils/front-end-cal/front_end_cal.h | 4 +- src/utils/front-end-cal/main.cc | 32 ++++--- 26 files changed, 202 insertions(+), 131 deletions(-) diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index bfe54fa8e..6ce7c7298 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/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 ) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc index 1c3d594bf..cc3cfc31c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc +++ b/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 +#include // for fft_complex +#include // for gr_complex +#include // for volk_32fc_conjugate_32fc +#include +#include // for abs, pow, floor +#include // for complex +#include // for memcpy GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index 7f71790ac..38a096c58 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/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 #include -#include +#include // for basic_block_sptr, top_... +#include // for lv_16sc_t +#include // for size_t #include - +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index ef1dcc215..9c1535261 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/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 +#include "gnss_synchro.h" #include -#include +#include // for fft_complex +#include // for gr_complex +#include // for volk_32fc_conjugate_32fc +#include +#include // for abs, pow, floor +#include // for complex +#include // for strcpy, memcpy GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration, diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index 462235a43..d312e9955 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/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 -#include +#include // for basic_block_sptr, top_... +#include // for lv_16sc_t +#include // for size_t +#include #include +class Gnss_Synchro; class ConfigurationInterface; class GalileoE5aPcpsAcquisitionFpga : public AcquisitionInterface diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc index 3c50cb3b7..42f0fef79 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc +++ b/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 #include -#include +#include // for gr_complex +#include // for volk_32fc_conjugate_32fc +#include +#include // for abs, pow, floor +#include // for complex +#include // for memcpy #define NUM_PRNs 32 diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index e5310414c..1977fd69b 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/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 +#include // for basic_block_sptr, top_block_sptr +#include // for lv_16sc_t +#include #include +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc index 27115e024..9599fe91d 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc +++ b/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 #include +#include // for fft_complex +#include // for gr_complex +#include // for volk_32fc_conjugate_32fc +#include +#include // for abs, pow, floor +#include // for complex +#include // for memcpy #define NUM_PRNs 32 diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index 743fb6062..cd0ced64c 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/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 #include -#include +#include +#include // for lv_16sc_t +#include #include - +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc index 5a56ee241..943cdc422 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc +++ b/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 #include +#include // for fft_complex +#include // for gr_complex +#include // for volk_32fc_conjugate_32fc +#include +#include // for abs, pow, floor +#include // for complex +#include // for memcpy #define NUM_PRNs 32 diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index 8a9a9e748..1f7106a87 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/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 #include -#include +#include // for basic_block_sptr, top_... +#include // for lv_16sc_t +#include // for size_t #include - +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index 52441f0ea..d54b572b9 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -33,9 +33,15 @@ #include "pcps_acquisition_fpga.h" +#include "gnss_synchro.h" #include #include -#include +#include // for from_long +#include // for mp +#include // for ceil +#include // for operator<< +#include // 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 diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index 58f23928f..ce78f6a47 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -42,8 +42,15 @@ #include "fpga_acquisition.h" -#include "gnss_synchro.h" -#include +#include +#include // for block +#include // for gr_vector_const_void_star +#include // for lv_16sc_t +#include // for uint32_t +#include // for shared_ptr +#include // 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_*/ diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt index 4b8eefec8..43a60629a 100644 --- a/src/algorithms/acquisition/libs/CMakeLists.txt +++ b/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 diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.cc b/src/algorithms/acquisition/libs/fpga_acquisition.cc index e429e8c8e..d42c27833 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.cc +++ b/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
    *
  • Marc Majoral, 2019. mmajoral(at)cttc.cat *
* - * 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 -#include // libraries used by the GIPO -#include -#include // libraries used by the GIPO -#include +#include "GPS_L1_CA.h" // for GPS_TWO_PI +#include // for LOG +#include // for log2 +#include // libraries used by the GIPO +#include // for operator<< +#include // libraries used by the GIPO +#include // for write, close, read, ssize_t +#include // 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; diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.h b/src/algorithms/acquisition/libs/fpga_acquisition.h index 2be464c97..b64e25e4d 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.h +++ b/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
    *
  • Marc Majoral, 2019. mmajoral(at)cttc.cat *
* - * 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 -#include +#include // for lv_16sc_t #include +#include /*! * \brief Class that implements carrier wipe-off and correlators. diff --git a/src/algorithms/libs/beidou_b1i_signal_processing.h b/src/algorithms/libs/beidou_b1i_signal_processing.h index 2e420eaae..e653dc3cf 100644 --- a/src/algorithms/libs/beidou_b1i_signal_processing.h +++ b/src/algorithms/libs/beidou_b1i_signal_processing.h @@ -35,7 +35,7 @@ #include #include -#include + //! 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); diff --git a/src/algorithms/libs/gnss_sdr_fpga_sample_counter.cc b/src/algorithms/libs/gnss_sdr_fpga_sample_counter.cc index 777382909..95baf7a24 100644 --- a/src/algorithms/libs/gnss_sdr_fpga_sample_counter.cc +++ b/src/algorithms/libs/gnss_sdr_fpga_sample_counter.cc @@ -33,12 +33,13 @@ #include "gnss_synchro.h" #include #include -#include -#include -#include // libraries used by the GIPO -#include -#include -#include // libraries used by the GIPO +#include // for from_double +#include // for mp +#include // for round +#include // for O_RDWR, libraries used by the GIPO +#include // for operator<<, endl +#include // libraries used by the GIPO +#include // for write, close, read, ssize_t #define PAGE_SIZE 0x10000 // default page size for the multicorrelator memory map diff --git a/src/algorithms/libs/gnss_sdr_fpga_sample_counter.h b/src/algorithms/libs/gnss_sdr_fpga_sample_counter.h index dd508c33d..f30bb78c0 100644 --- a/src/algorithms/libs/gnss_sdr_fpga_sample_counter.h +++ b/src/algorithms/libs/gnss_sdr_fpga_sample_counter.h @@ -35,6 +35,7 @@ #include #include +#include // for gr_vector_const_void_star #include #include diff --git a/src/algorithms/libs/gnss_sdr_sample_counter.cc b/src/algorithms/libs/gnss_sdr_sample_counter.cc index e7d939582..954d5d674 100644 --- a/src/algorithms/libs/gnss_sdr_sample_counter.cc +++ b/src/algorithms/libs/gnss_sdr_sample_counter.cc @@ -32,9 +32,11 @@ #include "gnss_sdr_sample_counter.h" #include "gnss_synchro.h" #include -#include -#include -#include +#include // for from_double +#include // for mp +#include // for round +#include // for operator<< +#include // for string gnss_sdr_sample_counter::gnss_sdr_sample_counter( double _fs, diff --git a/src/algorithms/libs/gnss_sdr_sample_counter.h b/src/algorithms/libs/gnss_sdr_sample_counter.h index ed065b193..d1b215916 100644 --- a/src/algorithms/libs/gnss_sdr_sample_counter.h +++ b/src/algorithms/libs/gnss_sdr_sample_counter.h @@ -33,6 +33,8 @@ #include #include +#include // for gr_vector_const_void_star +#include // for size_t #include diff --git a/src/algorithms/libs/gnss_sdr_time_counter.cc b/src/algorithms/libs/gnss_sdr_time_counter.cc index 0cd06517b..2bf29fa77 100644 --- a/src/algorithms/libs/gnss_sdr_time_counter.cc +++ b/src/algorithms/libs/gnss_sdr_time_counter.cc @@ -32,7 +32,6 @@ #include "gnss_sdr_time_counter.h" #include "gnss_synchro.h" #include -#include #include #include diff --git a/src/algorithms/libs/gnss_sdr_time_counter.h b/src/algorithms/libs/gnss_sdr_time_counter.h index dcf7ca018..e52795573 100644 --- a/src/algorithms/libs/gnss_sdr_time_counter.h +++ b/src/algorithms/libs/gnss_sdr_time_counter.h @@ -33,6 +33,7 @@ #include #include +#include // for gr_vector_const_void_star #include class gnss_sdr_time_counter; diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc index 781576efd..4940f6082 100644 --- a/src/utils/front-end-cal/front_end_cal.cc +++ b/src/utils/front-end-cal/front_end_cal.cc @@ -30,20 +30,21 @@ */ #include "front_end_cal.h" +#include "GPS_L1_CA.h" // for GPS_L1_FREQ_HZ #include "concurrent_map.h" +#include "configuration_interface.h" #include "gnss_sdr_supl_client.h" +#include "gps_acq_assist.h" // for Gps_Acq_Assist #include "gps_almanac.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" #include "gps_ephemeris.h" #include "gps_iono.h" -#include "gps_navigation_message.h" #include "gps_utc_model.h" #include #include +#include // for min #include -#include -#include +#include // for operator<< +#include #include extern Concurrent_Map global_gps_ephemeris_map; diff --git a/src/utils/front-end-cal/front_end_cal.h b/src/utils/front-end-cal/front_end_cal.h index 551377ebd..6bb495c4c 100644 --- a/src/utils/front-end-cal/front_end_cal.h +++ b/src/utils/front-end-cal/front_end_cal.h @@ -32,9 +32,11 @@ #ifndef GNSS_SDR_FRONT_END_CAL_H_ #define GNSS_SDR_FRONT_END_CAL_H_ -#include "file_configuration.h" #include +#include +#include +class ConfigurationInterface; class FrontEndCal { diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index b0dc512a5..989ba2348 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -32,51 +32,57 @@ #define FRONT_END_CAL_VERSION "0.0.1" #endif +#include "GPS_L1_CA.h" // for GPS_L1_CA_COD... #include "concurrent_map.h" #include "concurrent_queue.h" +#include "configuration_interface.h" // for Configuration... #include "file_configuration.h" #include "front_end_cal.h" -#include "galileo_almanac.h" -#include "galileo_ephemeris.h" -#include "galileo_iono.h" -#include "galileo_utc_model.h" #include "gnss_block_factory.h" +#include "gnss_block_interface.h" // for GNSSBlockInte... #include "gnss_sdr_flags.h" -#include "gnss_sdr_supl_client.h" -#include "gnss_signal.h" #include "gnss_synchro.h" +#include "gps_acq_assist.h" // for Gps_Acq_Assist #include "gps_almanac.h" -#include "gps_cnav_ephemeris.h" -#include "gps_cnav_iono.h" #include "gps_ephemeris.h" #include "gps_iono.h" #include "gps_l1_ca_pcps_acquisition_fine_doppler.h" -#include "gps_navigation_message.h" #include "gps_utc_model.h" -#include "sbas_ephemeris.h" -#include +#include // for bad_any_cast +#include +#include #include #include +#include #include +#include // for block #include #include #include #include #include +#include // for gr_complex +#include // for io_signature #include +#include // for block_sptr #include +#include // for pmt_t, to_long +#include // for mp #include +#include // for round #include #include #include // for ctime #include +#include +#include #include -#include +#include // for logic_error +#include #include #include #include - DECLARE_string(log_dir); Concurrent_Map global_gps_ephemeris_map; From 502bf32d8380fe7f04fd586ff82a8cd98e31259e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 6 Mar 2019 14:36:51 +0100 Subject: [PATCH 14/14] Improve includes (IWYU) --- src/algorithms/PVT/libs/rinex_printer.cc | 24 +++++++++++- src/algorithms/PVT/libs/rinex_printer.h | 38 +++++++++++-------- .../tracking/adapters/CMakeLists.txt | 1 + .../galileo_e1_dll_pll_veml_tracking_fpga.cc | 5 +++ .../galileo_e1_dll_pll_veml_tracking_fpga.h | 5 ++- .../galileo_e5a_dll_pll_tracking_fpga.cc | 7 ++++ .../galileo_e5a_dll_pll_tracking_fpga.h | 5 ++- .../gps_l1_ca_dll_pll_tracking_fpga.cc | 5 +++ .../gps_l1_ca_dll_pll_tracking_fpga.h | 3 ++ .../gps_l2_m_dll_pll_tracking_fpga.cc | 6 +++ .../adapters/gps_l2_m_dll_pll_tracking_fpga.h | 6 ++- .../adapters/gps_l5_dll_pll_tracking_fpga.cc | 5 +++ .../adapters/gps_l5_dll_pll_tracking_fpga.h | 4 ++ .../dll_pll_veml_tracking_fpga.cc | 14 +++---- .../dll_pll_veml_tracking_fpga.h | 17 ++++++--- 15 files changed, 112 insertions(+), 33 deletions(-) diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index c6ff89fca..2e4b55a37 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/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 #include #include @@ -38,8 +59,9 @@ #include #include // for min and max #include // for floor -#include // for getenv() +#include // for memcpy #include +#include // for cout #include #include #include diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h index 0e189dc80..09acc2c5b 100644 --- a/src/algorithms/PVT/libs/rinex_printer.h +++ b/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 -#include -#include +#include // for int32_t +#include // for strtol, strtod +#include // for fstream #include // for setprecision -#include +#include // for map #include // for stringstream -#include +#include // 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 diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index 199abc7c7..8795eee51 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -98,6 +98,7 @@ target_link_libraries(tracking_adapters tracking_gr_blocks algorithms_libs gnss_sdr_flags + Gnuradio::runtime PRIVATE Volkgnsssdr::volkgnsssdr ) diff --git 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 index b9f6cf626..531f64560 100644 --- 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 #include +#include // for round +#include // for memcpy +#include // for operator<<, GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga( diff --git 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 index 79cf7b6a4..cbc45c45b 100644 --- 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 @@ -39,9 +39,12 @@ #include "dll_pll_veml_tracking_fpga.h" #include "tracking_interface.h" +#include // for basic_block_sptr, top_block_... +#include // for size_t +#include #include - +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc index b70ba9bd4..203e46357 100644 --- 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 +#include // for gr_complex #include +#include // for round +#include +#include // for memcpy +#include GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga( diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h index e6d736269..195cafcf5 100644 --- 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 +#include // for basic_block_sptr #include +#include // for size_t +#include +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git 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 index 9ff88bb64..bc0cfa72c 100644 --- 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 #include +#include // for round +#include // for memcpy +#include #define NUM_PRNs 32 diff --git 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 index b083495a5..680c903f2 100644 --- 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 +#include #include +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git 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 index 88bb84253..8fd0fdaa2 100644 --- 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 @@ -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 #include +#include // for round +#include // for memcpy +#include + #define NUM_PRNs 32 diff --git 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 index 77ab71f0d..7fbe24958 100644 --- 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 @@ -37,11 +37,13 @@ #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 +#include #include +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc index ed3ea37a0..41e86e726 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc @@ -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 #include +#include // for round +#include // for memcpy +#include #define NUM_PRNs 32 diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h index 1d6060f2f..3e2f8024b 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h @@ -40,8 +40,12 @@ #include "dll_pll_veml_tracking_fpga.h" #include "tracking_interface.h" +#include +#include +#include #include +class Gnss_Synchro; class ConfigurationInterface; /*! diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index 7715e2f8c..1cc9e7bdf 100644 --- 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 #include #include #include +#include // for mp #include #include #include +#include +#include // for abs, size_t #include #include -#include -#include +#include dll_pll_veml_tracking_fpga_sptr dll_pll_veml_make_tracking_fpga(const Dll_Pll_Conf_Fpga &conf_) diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h index 227939ded..681573639 100644 --- 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 +#include #include -#include -#include -#include +#include // for gr_complex +#include // for gr_vector_const_void_star +#include // for pmt_t +#include +#include // for deque +#include // for ofstream +#include // for shared_ptr +#include #include -//#include +class Fpga_Multicorrelator_8sc; +class Gnss_Synchro; class dll_pll_veml_tracking_fpga; using dll_pll_veml_tracking_fpga_sptr = boost::shared_ptr;