From 6ba77c5f2889cacf62ff1391a99ab3cb777d9f22 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 4 Mar 2019 08:12:50 +0100 Subject: [PATCH] Sort includes: include what you use --- src/algorithms/PVT/adapters/CMakeLists.txt | 1 + src/algorithms/PVT/adapters/rtklib_pvt.cc | 1 + .../PVT/gnuradio_blocks/rtklib_pvt_gs.h | 27 ++++++++++++----- src/algorithms/PVT/libs/gpx_printer.h | 1 - src/algorithms/PVT/libs/kml_printer.h | 1 - src/algorithms/PVT/libs/ls_pvt.cc | 1 - src/algorithms/PVT/libs/pvt_conf.h | 1 - src/algorithms/PVT/libs/pvt_solution.cc | 2 +- src/algorithms/PVT/libs/rtklib_solver.cc | 3 ++ src/algorithms/PVT/libs/rtklib_solver.h | 29 ++++++++++++++----- src/algorithms/channel/adapters/channel.cc | 8 +++++ src/algorithms/channel/adapters/channel.h | 3 ++ src/algorithms/channel/libs/CMakeLists.txt | 2 ++ src/algorithms/channel/libs/channel_fsm.cc | 9 +++--- src/algorithms/channel/libs/channel_fsm.h | 5 ++-- .../channel/libs/channel_msg_receiver_cc.cc | 29 ++++++++++--------- .../channel/libs/channel_msg_receiver_cc.h | 2 ++ .../adapters/array_signal_conditioner.cc | 1 + .../adapters/array_signal_conditioner.h | 8 ++--- .../adapters/signal_conditioner.cc | 1 + .../conditioner/adapters/signal_conditioner.h | 6 ++-- src/core/receiver/gnss_block_factory.cc | 1 + ...cps_ambiguous_acquisition_gsoc2013_test.cc | 20 ++++++------- ...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 20 ++++++------- ...cps_acquisition_gsoc2014_gensource_test.cc | 21 +++++++------- .../pvt/nmea_printer_test.cc | 1 + src/utils/front-end-cal/front_end_cal.cc | 1 + src/utils/front-end-cal/front_end_cal.h | 1 - src/utils/rinex2assist/main.cc | 3 +- 29 files changed, 129 insertions(+), 80 deletions(-) diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index 538a7ddcf..013fcdd83 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/src/algorithms/PVT/adapters/CMakeLists.txt @@ -32,6 +32,7 @@ add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS}) target_link_libraries(pvt_adapters PUBLIC pvt_gr_blocks + algorithms_libs_rtklib core_system_parameters PRIVATE gnss_sdr_flags diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc index af1f1e8ad..3c6370177 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.cc +++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc @@ -33,6 +33,7 @@ #include "configuration_interface.h" #include "gnss_sdr_flags.h" #include "pvt_conf.h" +#include "rtklib_rtkpos.h" #include #if OLD_BOOST #include diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h index 951dedacc..30503ce01 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h @@ -81,6 +81,10 @@ private: const Pvt_Conf& conf_, const rtk_t& rtk); + rtklib_pvt_gs(uint32_t nchannels, + const Pvt_Conf& conf_, + const rtk_t& rtk); + void msg_handler_telemetry(const pmt::pmt_t& msg); bool d_dump; @@ -135,7 +139,7 @@ private: int sysv_msqid; typedef struct { - long mtype; //required by sys v message + long mtype; // NOLINT(google-runtime-int) required by SysV queue messaging double ttff; } ttff_msgbuf; bool send_sys_v_ttff_msg(ttff_msgbuf ttff); @@ -158,31 +162,40 @@ private: std::vector split_string(const std::string& s, char delim) const; public: - rtklib_pvt_gs(uint32_t nchannels, - const Pvt_Conf& conf_, - const rtk_t& rtk); - ~rtklib_pvt_gs(); //!< Default destructor /*! * \brief Get latest set of GPS ephemeris from PVT block - * */ std::map get_gps_ephemeris_map() const; + /*! + * \brief Get latest set of GPS almanac from PVT block + */ std::map get_gps_almanac_map() const; + /*! + * \brief Get latest set of Galileo ephemeris from PVT block + */ std::map get_galileo_ephemeris_map() const; + /*! + * \brief Get latest set of Galileo almanac from PVT block + */ std::map get_galileo_almanac_map() const; + /*! + * \brief Get latest set of BeiDou DNAV ephemeris from PVT block + */ std::map get_beidou_dnav_ephemeris_map() const; + /*! + * \brief Get latest set of BeiDou DNAV almanac from PVT block + */ std::map get_beidou_dnav_almanac_map() const; /*! * \brief Clear all ephemeris information and the almanacs for GPS and Galileo - * */ void clear_ephemeris(); diff --git a/src/algorithms/PVT/libs/gpx_printer.h b/src/algorithms/PVT/libs/gpx_printer.h index c584eba4c..740be545c 100644 --- a/src/algorithms/PVT/libs/gpx_printer.h +++ b/src/algorithms/PVT/libs/gpx_printer.h @@ -33,7 +33,6 @@ #ifndef GNSS_SDR_GPX_PRINTER_H_ #define GNSS_SDR_GPX_PRINTER_H_ -#include "pvt_solution.h" #include "rtklib_solver.h" #include #include diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h index 1608158b4..bc2db1198 100644 --- a/src/algorithms/PVT/libs/kml_printer.h +++ b/src/algorithms/PVT/libs/kml_printer.h @@ -33,7 +33,6 @@ #ifndef GNSS_SDR_KML_PRINTER_H_ #define GNSS_SDR_KML_PRINTER_H_ -#include "pvt_solution.h" #include "rtklib_solver.h" #include #include diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc index 52e09199d..694b7d946 100644 --- a/src/algorithms/PVT/libs/ls_pvt.cc +++ b/src/algorithms/PVT/libs/ls_pvt.cc @@ -33,7 +33,6 @@ #include "GPS_L1_CA.h" #include "geofunctions.h" #include -#include #include diff --git a/src/algorithms/PVT/libs/pvt_conf.h b/src/algorithms/PVT/libs/pvt_conf.h index 45c960c2f..484961cb2 100644 --- a/src/algorithms/PVT/libs/pvt_conf.h +++ b/src/algorithms/PVT/libs/pvt_conf.h @@ -31,7 +31,6 @@ #ifndef GNSS_SDR_PVT_CONF_H_ #define GNSS_SDR_PVT_CONF_H_ -#include #include #include #include diff --git a/src/algorithms/PVT/libs/pvt_solution.cc b/src/algorithms/PVT/libs/pvt_solution.cc index 60ccf8f02..7e04c58ce 100644 --- a/src/algorithms/PVT/libs/pvt_solution.cc +++ b/src/algorithms/PVT/libs/pvt_solution.cc @@ -33,7 +33,6 @@ #include "GPS_L1_CA.h" #include "geofunctions.h" #include -#include Pvt_Solution::Pvt_Solution() @@ -54,6 +53,7 @@ Pvt_Solution::Pvt_Solution() d_rx_dt_s = 0.0; } + arma::vec Pvt_Solution::rotateSatellite(double const traveltime, const arma::vec &X_sat) { /* diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 46076586f..5ee330eb4 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -57,6 +57,7 @@ #include "GPS_L1_CA.h" #include "Galileo_E1.h" #include "rtklib_conversions.h" +#include "rtklib_rtkpos.h" #include "rtklib_solution.h" #include #include @@ -479,11 +480,13 @@ double Rtklib_Solver::get_vdop() const return dop_[3]; } + Monitor_Pvt Rtklib_Solver::get_monitor_pvt() const { return monitor_pvt; } + bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_map, bool flag_averaging) { std::map::const_iterator gnss_observables_iter; diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h index 9f8bd86f9..929097de8 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.h +++ b/src/algorithms/PVT/libs/rtklib_solver.h @@ -55,16 +55,28 @@ #define GNSS_SDR_RTKLIB_SOLVER_H_ -#include "beidou_dnav_navigation_message.h" +#include "beidou_dnav_almanac.h" +#include "beidou_dnav_ephemeris.h" +#include "beidou_dnav_iono.h" +#include "beidou_dnav_utc_model.h" #include "galileo_almanac.h" -#include "galileo_navigation_message.h" -#include "glonass_gnav_navigation_message.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_navigation_message.h" -#include "gps_navigation_message.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 "monitor_pvt.h" #include "pvt_solution.h" -#include "rtklib_rtkpos.h" +#include "rtklib.h" #include #include #include @@ -89,12 +101,13 @@ private: Monitor_Pvt monitor_pvt; public: - sol_t pvt_sol; - ssat_t pvt_ssat[MAXSAT]; Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk); ~Rtklib_Solver(); bool get_PVT(const std::map& gnss_observables_map, bool flag_averaging); + + sol_t pvt_sol; + ssat_t pvt_ssat[MAXSAT]; double get_hdop() const; double get_vdop() const; double get_pdop() const; diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 6f0dc5d5c..976a957e8 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -30,10 +30,14 @@ */ #include "channel.h" +#include "acquisition_interface.h" #include "configuration_interface.h" #include "gnss_sdr_flags.h" +#include "telemetry_decoder_interface.h" +#include "tracking_interface.h" #include #include +#include // Constructor @@ -157,16 +161,19 @@ gr::basic_block_sptr Channel::get_left_block() return nullptr; } + gr::basic_block_sptr Channel::get_left_block_trk() { return trk_->get_left_block(); } + gr::basic_block_sptr Channel::get_left_block_acq() { return acq_->get_left_block(); } + gr::basic_block_sptr Channel::get_right_block() { return nav_->get_right_block(); @@ -201,6 +208,7 @@ void Channel::stop_channel() << "Channel stop_channel()"; } + void Channel::start_acquisition() { std::lock_guard lk(mx); diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 9eda9e474..ce554784a 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -38,9 +38,12 @@ #include "channel_fsm.h" #include "channel_interface.h" #include "channel_msg_receiver_cc.h" +#include "gnss_signal.h" #include "gnss_synchro.h" #include #include +#include +#include #include #include #include diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index c055123bc..415b118ec 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -36,8 +36,10 @@ add_library(channel_libs ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS}) target_link_libraries(channel_libs PUBLIC Gnuradio::runtime + Gnuradio::pmt core_system_parameters PRIVATE + Boost::boost Gflags::gflags Glog::glog core_receiver diff --git a/src/algorithms/channel/libs/channel_fsm.cc b/src/algorithms/channel/libs/channel_fsm.cc index 7d917154f..cd8e97b26 100644 --- a/src/algorithms/channel/libs/channel_fsm.cc +++ b/src/algorithms/channel/libs/channel_fsm.cc @@ -32,7 +32,7 @@ #include "channel_fsm.h" #include "control_message_factory.h" #include - +#include ChannelFsm::ChannelFsm() { @@ -57,13 +57,13 @@ bool ChannelFsm::Event_stop_channel() DLOG(INFO) << "CH = " << channel_ << ". Ev stop channel"; switch (d_state) { - case 0: //already in stanby + case 0: // already in stanby break; - case 1: //acquisition + case 1: // acquisition d_state = 0; stop_acquisition(); break; - case 2: //tracking + case 2: // tracking d_state = 0; stop_tracking(); break; @@ -73,6 +73,7 @@ bool ChannelFsm::Event_stop_channel() return true; } + bool ChannelFsm::Event_start_acquisition() { std::lock_guard lk(mx); diff --git a/src/algorithms/channel/libs/channel_fsm.h b/src/algorithms/channel/libs/channel_fsm.h index 2ecc6eb20..8242058cb 100644 --- a/src/algorithms/channel/libs/channel_fsm.h +++ b/src/algorithms/channel/libs/channel_fsm.h @@ -33,7 +33,6 @@ #define GNSS_SDR_CHANNEL_FSM_H #include "acquisition_interface.h" -#include "telemetry_decoder_interface.h" #include "tracking_interface.h" #include #include @@ -55,7 +54,7 @@ public: void set_queue(gr::msg_queue::sptr queue); void set_channel(uint32_t channel); - //FSM EVENTS + // FSM EVENTS bool Event_start_acquisition(); bool Event_valid_acquisition(); bool Event_stop_channel(); @@ -79,4 +78,4 @@ private: std::mutex mx; }; -#endif /*GNSS_SDR_CHANNEL_FSM_H*/ +#endif // GNSS_SDR_CHANNEL_FSM_H diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 1ec5dcf4d..8fb4aa47e 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -30,10 +30,13 @@ #include "channel_msg_receiver_cc.h" +#include +#include #include #include #include #include +#include channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat) @@ -42,6 +45,19 @@ channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat) : gr::block("channel_msg_receiver_cc", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) +{ + this->message_port_register_in(pmt::mp("events")); + this->set_msg_handler(pmt::mp("events"), boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1)); + + d_channel_fsm = std::move(channel_fsm); + d_repeat = repeat; +} + + +channel_msg_receiver_cc::~channel_msg_receiver_cc() = default; + + void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg) { bool result = false; @@ -80,16 +96,3 @@ void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg) LOG(WARNING) << "msg_handler_telemetry invalid event"; } } - - -channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr channel_fsm, bool repeat) : gr::block("channel_msg_receiver_cc", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) -{ - this->message_port_register_in(pmt::mp("events")); - this->set_msg_handler(pmt::mp("events"), boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1)); - - d_channel_fsm = std::move(channel_fsm); - d_repeat = repeat; -} - - -channel_msg_receiver_cc::~channel_msg_receiver_cc() = default; diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h index cc05892d8..40c542dde 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h @@ -33,6 +33,8 @@ #include "channel_fsm.h" #include +#include +#include class channel_msg_receiver_cc; diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc index da928c9b5..d82535e6c 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc @@ -30,6 +30,7 @@ */ #include "array_signal_conditioner.h" +#include "configuration_interface.h" #include #include diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h index 76809be53..b8f43de03 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h @@ -34,14 +34,14 @@ #include "gnss_block_interface.h" -#include +#include +#include +#include #include class ConfigurationInterface; -class AcquisitionInterface; -class TrackingInterface; -class TelemetryDecoderInterface; + /*! * \brief This class wraps blocks to change data_type_adapter, input_filter and resampler diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc index 2fef4a7da..72b6ab404 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc @@ -30,6 +30,7 @@ */ #include "signal_conditioner.h" +#include "configuration_interface.h" #include #include diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index 85dc8396c..455c6e287 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -33,12 +33,12 @@ #define GNSS_SDR_SIGNAL_CONDITIONER_H_ #include "gnss_block_interface.h" +#include +#include +#include #include class ConfigurationInterface; -class AcquisitionInterface; -class TrackingInterface; -class TelemetryDecoderInterface; /*! * \brief This class wraps blocks to change data_type_adapter, input_filter and resampler diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 14b165c1a..0c7860a55 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -166,6 +166,7 @@ #endif #include +#include #include #include #include diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index 346e59e79..b9c692c4b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -31,16 +31,6 @@ */ -#include -#include -#include -#include -#include -#ifdef GR_GREATER_38 -#include -#else -#include -#endif #include "fir_filter.h" #include "galileo_e1_pcps_ambiguous_acquisition.h" #include "gen_signal_source.h" @@ -50,8 +40,18 @@ #include "in_memory_configuration.h" #include "signal_generator.h" #include "signal_generator_c.h" +#include +#include #include #include +#include +#include +#include +#ifdef GR_GREATER_38 +#include +#else +#include +#endif // ######## GNURADIO BLOCK MESSAGE RECEVER ######### diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index 06ec5811c..591f7bf25 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -41,8 +41,18 @@ */ +#include "galileo_e1_pcps_ambiguous_acquisition.h" +#include "gnss_block_factory.h" +#include "gnss_block_interface.h" +#include "gnss_sdr_valve.h" +#include "gnss_signal.h" +#include "gnss_synchro.h" +#include "in_memory_configuration.h" #include #include +#include +#include +#include #include #include #include @@ -51,16 +61,6 @@ #else #include #endif -#include "galileo_e1_pcps_ambiguous_acquisition.h" -#include "gnss_block_factory.h" -#include "gnss_block_interface.h" -#include "gnss_sdr_valve.h" -#include "gnss_signal.h" -#include "gnss_synchro.h" -#include "in_memory_configuration.h" -#include -#include -#include // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index f90407d0d..652384472 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -29,16 +29,6 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include -#ifdef GR_GREATER_38 -#include -#else -#include -#endif #include "fir_filter.h" #include "galileo_e5a_noncoherent_iq_acquisition_caf.h" #include "gen_signal_source.h" @@ -49,9 +39,18 @@ #include "pass_through.h" #include "signal_generator.h" #include "signal_generator_c.h" +#include +#include #include #include - +#include +#include +#include +#ifdef GR_GREATER_38 +#include +#else +#include +#endif // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx; diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc index 89cbfad09..1d7580b96 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc @@ -30,6 +30,7 @@ #include "nmea_printer.h" +#include "rtklib_rtkpos.h" #include #include #include diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc index 58e38e067..781576efd 100644 --- a/src/utils/front-end-cal/front_end_cal.cc +++ b/src/utils/front-end-cal/front_end_cal.cc @@ -30,6 +30,7 @@ */ #include "front_end_cal.h" +#include "concurrent_map.h" #include "gnss_sdr_supl_client.h" #include "gps_almanac.h" #include "gps_cnav_ephemeris.h" diff --git a/src/utils/front-end-cal/front_end_cal.h b/src/utils/front-end-cal/front_end_cal.h index 261043461..551377ebd 100644 --- a/src/utils/front-end-cal/front_end_cal.h +++ b/src/utils/front-end-cal/front_end_cal.h @@ -32,7 +32,6 @@ #ifndef GNSS_SDR_FRONT_END_CAL_H_ #define GNSS_SDR_FRONT_END_CAL_H_ -#include "concurrent_map.h" #include "file_configuration.h" #include diff --git a/src/utils/rinex2assist/main.cc b/src/utils/rinex2assist/main.cc index f23b58ed7..c0d7f7a45 100644 --- a/src/utils/rinex2assist/main.cc +++ b/src/utils/rinex2assist/main.cc @@ -30,7 +30,7 @@ */ -#include "galileo_ephemeris.h" +#include "galileo_ephemeris.h" // IWYU pragma: keep #include "galileo_iono.h" #include "galileo_utc_model.h" #include "gps_ephemeris.h" @@ -45,6 +45,7 @@ #include #include #include +#include // for size_t #include #include