diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h index 242d73743..f37515323 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.h +++ b/src/algorithms/PVT/adapters/rtklib_pvt.h @@ -53,13 +53,13 @@ public: virtual ~RtklibPvt(); - std::string role() override + inline std::string role() override { return role_; } //! Returns "RTKLIB_Pvt" - std::string implementation() override + inline std::string implementation() override { return "RTKLIB_PVT"; } @@ -69,28 +69,25 @@ public: gr::basic_block_sptr get_left_block() override; gr::basic_block_sptr get_right_block() override; - void reset() override + inline void reset() override { return; } //! All blocks must have an item_size() function implementation. Returns sizeof(gr_complex) - size_t item_size() override + inline size_t item_size() override { return sizeof(gr_complex); } private: rtklib_pvt_cc_sptr pvt_; - rtk_t rtk; - bool dump_; std::string dump_filename_; std::string role_; unsigned int in_streams_; unsigned int out_streams_; - std::string eph_xml_filename_; bool save_assistance_to_XML(); }; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index 66e3ad2da..90e9d3488 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: virtual ~GalileoE1Pcps8msAmbiguousAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -62,12 +62,12 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index aa6b08244..3874e4df9 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -58,7 +58,7 @@ public: virtual ~GalileoE1PcpsAmbiguousAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -66,7 +66,7 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "Galileo_E1_PCPS_Ambiguous_Acquisition"; } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index d2aaf0ae2..1ae47ea54 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: virtual ~GalileoE1PcpsCccwsrAmbiguousAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -62,12 +62,12 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index 389899988..0e64dbf96 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: virtual ~GalileoE1PcpsQuickSyncAmbiguousAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -62,12 +62,12 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index e249da597..78f033572 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: virtual ~GalileoE1PcpsTongAmbiguousAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -62,12 +62,12 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index ac91d3394..ce23d5441 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -55,7 +55,7 @@ public: virtual ~GalileoE5aNoncoherentIQAcquisitionCaf(); - std::string role() override + inline std::string role() override { return role_; } @@ -63,12 +63,12 @@ public: /*! * \brief Returns "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF" */ - std::string implementation() override + inline std::string implementation() override { return "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index 0352b6b5a..0ff27c87f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -63,7 +63,7 @@ public: virtual ~GpsL1CaPcpsAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -71,12 +71,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h index 89b3160ec..4d1474a10 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h @@ -56,7 +56,7 @@ public: virtual ~GpsL1CaPcpsAcquisitionFineDoppler(); - std::string role() override + inline std::string role() override { return role_; } @@ -64,12 +64,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } 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 67c77a154..3a6115e6e 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 @@ -58,7 +58,7 @@ public: virtual ~GpsL1CaPcpsAcquisitionFpga(); - std::string role() override + inline std::string role() override { return role_; } @@ -66,12 +66,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_Acquisition_Fpga"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h index b5fc81791..ee7ac9b66 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h @@ -56,7 +56,7 @@ public: virtual ~GpsL1CaPcpsAssistedAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -64,12 +64,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Assisted_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_Assisted_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h index c00d21d9c..210fe0749 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h @@ -55,7 +55,7 @@ public: virtual ~GpsL1CaPcpsMultithreadAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -63,12 +63,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Multithread_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_Multithread_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index 325720f5a..606926155 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -55,7 +55,7 @@ public: virtual ~GpsL1CaPcpsOpenClAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -63,12 +63,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_OpenCl_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_OpenCl_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index 283c3bbaf..a43597ee8 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -57,7 +57,7 @@ public: virtual ~GpsL1CaPcpsQuickSyncAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -65,12 +65,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_QuickSync_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_QuickSync_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index dc7946a16..957688bad 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -54,7 +54,7 @@ public: virtual ~GpsL1CaPcpsTongAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -62,12 +62,12 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Tong_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L1_CA_PCPS_Tong_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index 38d64cd18..cbe2a09a1 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -61,7 +61,7 @@ public: virtual ~GpsL2MPcpsAcquisition(); - std::string role() override + inline std::string role() override { return role_; } @@ -69,12 +69,12 @@ public: /*! * \brief Returns "GPS_L2_M_PCPS_Acquisition" */ - std::string implementation() override + inline std::string implementation() override { return "GPS_L2_M_PCPS_Acquisition"; } - size_t item_size() override + inline size_t item_size() override { return item_size_; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h index d4d3b31d4..ab44e54c7 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h @@ -162,7 +162,7 @@ public: * to exchange synchronization data between acquisition and tracking blocks. * \param p_gnss_synchro Satellite information shared by the processing blocks. */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) + inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) { d_gnss_synchro = p_gnss_synchro; } @@ -170,7 +170,7 @@ public: /*! * \brief Returns the maximum peak of grid search. */ - unsigned int mag() + inline unsigned int mag() const { return d_mag; } @@ -191,7 +191,7 @@ public: * active mode * \param active - bool that activates/deactivates the block. */ - void set_active(bool active) + inline void set_active(bool active) { d_active = active; } @@ -207,7 +207,7 @@ public: * \brief Set acquisition channel unique ID * \param channel - receiver channel. */ - void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) { d_channel = channel; } @@ -217,7 +217,7 @@ public: * \param threshold - Threshold for signal detection (check \ref Navitec2012, * Algorithm 1, for a definition of this threshold). */ - void set_threshold(float threshold) + inline void set_threshold(float threshold) { d_threshold = threshold; } @@ -226,7 +226,7 @@ public: * \brief Set maximum Doppler grid search * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. */ - void set_doppler_max(unsigned int doppler_max) + inline void set_doppler_max(unsigned int doppler_max) { d_doppler_max = doppler_max; } @@ -235,12 +235,11 @@ public: * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. */ - void set_doppler_step(unsigned int doppler_step) + inline void set_doppler_step(unsigned int doppler_step) { d_doppler_step = doppler_step; } - /*! * \brief Parallel Code Phase Search Acquisition signal processing. */ diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h index 332b91083..267a5f6cf 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h @@ -116,7 +116,7 @@ public: * to exchange synchronization data between acquisition and tracking blocks. * \param p_gnss_synchro Satellite information shared by the processing blocks. */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) + inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) { d_gnss_synchro = p_gnss_synchro; } @@ -124,7 +124,7 @@ public: /*! * \brief Returns the maximum peak of grid search. */ - unsigned int mag() + inline unsigned int mag() const { return d_mag; } @@ -145,7 +145,7 @@ public: * active mode * \param active - bool that activates/deactivates the block. */ - void set_active(bool active) + inline void set_active(bool active) { d_active = active; } @@ -161,7 +161,7 @@ public: * \brief Set acquisition channel unique ID * \param channel - receiver channel. */ - void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) { d_channel = channel; } @@ -171,7 +171,7 @@ public: * \param threshold - Threshold for signal detection (check \ref Navitec2012, * Algorithm 1, for a definition of this threshold). */ - void set_threshold(float threshold) + inline void set_threshold(float threshold) { d_threshold = threshold; } @@ -180,7 +180,7 @@ public: * \brief Set maximum Doppler grid search * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. */ - void set_doppler_max(unsigned int doppler_max) + inline void set_doppler_max(unsigned int doppler_max) { d_doppler_max = doppler_max; } @@ -189,7 +189,7 @@ public: * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. */ - void set_doppler_step(unsigned int doppler_step) + inline void set_doppler_step(unsigned int doppler_step) { d_doppler_step = doppler_step; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h b/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h index 8e60689fd..561609109 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h @@ -15,7 +15,7 @@ * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency - * Approach", Birkha user, 2007. pp 81-84 + * Approach", Birkhauser, 2007. pp 81-84 * * \authors