mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Make use of the inline keyword where appropriate

Browse Source
This commit is contained in:
Carles Fernandez 2017-08-21 11:45:12 +02:00
parent 6e65705b47
commit 122ec19626
85 changed files with 387 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/algorithms/PVT/adapters/rtklib_pvt.h
View File

@ -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();
};

6
src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h
View File

@ -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_;
}

4
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
View File

@ -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";
}

6
src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h
View File

@ -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_;
}

6
src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
View File

@ -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_;
}

15
src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
View File

@ -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.
*/

14
src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
View File

@ -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;
}

14
src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h
View File

@ -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 <ul>
* <li> Marc Majoral, 2017. mmajoral(at)cttc.cat
@ -126,7 +126,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;
}
@ -134,7 +134,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -168,7 +168,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;
}
@ -178,7 +178,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;
}
@ -187,7 +187,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;
acquisition_fpga_8sc->set_doppler_max(doppler_max);
@ -197,7 +197,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;
acquisition_fpga_8sc->set_doppler_step(doppler_step);

16
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
View File

@ -14,7 +14,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 <ul>
* <li> Javier Arribas, 2011. jarribas(at)cttc.es
@ -143,7 +143,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)
{
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_gnss_synchro = p_gnss_synchro;
@ -152,7 +152,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -173,7 +173,7 @@ public:
* active mode
* \param active - bool that activates/deactivates the block.
*/
void set_active(bool active)
inline void set_active(bool active)
{
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_active = active;
@ -190,7 +190,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)
{
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_channel = channel;
@ -201,7 +201,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)
{
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_threshold = threshold;
@ -211,7 +211,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)
{
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_doppler_max = doppler_max;
@ -221,7 +221,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)
{
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_doppler_step = doppler_step;

16
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
View File

@ -14,7 +14,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 <ul>
* <li> Javier Arribas, 2013. jarribas(at)cttc.es
@ -147,7 +147,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;
}
@ -155,7 +155,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_test_statistics;
}
@ -176,7 +176,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;
}
@ -185,7 +185,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;
}
@ -195,7 +195,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;
}
@ -204,7 +204,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_config_doppler_max = doppler_max;
}
@ -215,7 +215,6 @@ public:
*/
void set_doppler_step(unsigned int doppler_step);
/*!
* \brief Parallel Code Phase Search Acquisition signal processing.
*/
@ -224,7 +223,6 @@ public:
gr_vector_void_star &output_items);
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
};
#endif /* pcps_acquisition_fine_doppler_cc*/

17
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h
View File

@ -14,7 +14,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 <ul>
* <li> Javier Arribas, 2011. jarribas(at)cttc.es
@ -144,7 +144,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;
}
@ -152,7 +152,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -173,7 +173,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;
}
@ -189,7 +189,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;
}
@ -199,7 +199,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;
}
@ -208,7 +208,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;
}
@ -217,12 +217,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.
*/

15
src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
View File

@ -14,7 +14,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 <ul>
* <li> Javier Arribas, 2013. jarribas(at)cttc.es
@ -148,7 +148,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;
}
@ -156,7 +156,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_test_statistics;
}
@ -177,7 +177,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;
}
@ -186,7 +186,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;
}
@ -196,7 +196,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;
}
@ -205,7 +205,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;
}
@ -216,7 +216,6 @@ public:
*/
void set_doppler_step(unsigned int doppler_step);
/*!
* \brief Parallel Code Phase Search Acquisition signal processing.
*/

14
src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
View File

@ -125,7 +125,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;
}
@ -133,7 +133,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -155,7 +155,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;
}
@ -171,7 +171,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;
}
@ -181,7 +181,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;
}
@ -190,7 +190,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;
}
@ -199,7 +199,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;
}

14
src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
View File

@ -99,7 +99,6 @@ private:
void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift,
int doppler_offset);
long d_fs_in;
long d_freq;
int d_samples_per_ms;
@ -149,7 +148,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;
}
@ -157,7 +156,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -178,7 +177,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;
}
@ -194,7 +193,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;
}
@ -213,7 +212,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;
}
@ -222,12 +221,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.
*/

14
src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
View File

@ -175,7 +175,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;
}
@ -183,7 +183,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -204,7 +204,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;
}
@ -220,7 +220,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;
}
@ -230,7 +230,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;
}
@ -239,7 +239,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;
}
@ -248,7 +248,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;
}

15
src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
View File

@ -161,7 +161,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;
}
@ -169,7 +169,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -190,7 +190,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;
}
@ -206,7 +206,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;
}
@ -216,7 +216,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;
}
@ -225,7 +225,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;
}
@ -234,12 +234,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.
*/

15
src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
View File

@ -140,7 +140,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;
}
@ -148,7 +148,7 @@ public:
/*!
* \brief Returns the maximum peak of grid search.
*/
unsigned int mag()
inline unsigned int mag() const
{
return d_mag;
}
@ -169,7 +169,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;
}
@ -185,7 +185,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;
}
@ -195,7 +195,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;
}
@ -204,7 +204,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;
}
@ -213,12 +213,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.
*/

14
src/algorithms/channel/adapters/channel.h
View File

@ -73,20 +73,20 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string role() override { return role_; }
inline std::string role() override { return role_; }
//! Returns "Channel"
std::string implementation() override { return implementation_; }
inline std::string implementation() override { return implementation_; }
size_t item_size() override { return 0; }
Gnss_Signal get_signal() const override { return gnss_signal_; }
inline size_t item_size() override { return 0; }
inline Gnss_Signal get_signal() const override { return gnss_signal_; }
void start_acquisition() override; //!< Start the State Machine
void set_signal(const Gnss_Signal& gnss_signal_) override; //!< Sets the channel GNSS signal
std::shared_ptr<AcquisitionInterface> acquisition(){ return acq_; }
std::shared_ptr<TrackingInterface> tracking(){ return trk_; }
std::shared_ptr<TelemetryDecoderInterface> telemetry(){ return nav_; }
inline std::shared_ptr<AcquisitionInterface> acquisition(){ return acq_; }
inline std::shared_ptr<TrackingInterface> tracking(){ return trk_; }
inline std::shared_ptr<TelemetryDecoderInterface> telemetry(){ return nav_; }
void msg_handler_events(pmt::pmt_t msg);

12
src/algorithms/conditioner/adapters/array_signal_conditioner.h
View File

@ -63,14 +63,14 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string role() override { return role_; }
inline std::string role() override { return role_; }
//! Returns "Array_Signal_Conditioner"
std::string implementation() override { return "Array_Signal_Conditioner"; }
size_t item_size() override { return 0; }
inline std::string implementation() override { return "Array_Signal_Conditioner"; }
inline size_t item_size() override { return 0; }
std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
inline std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
inline std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
inline std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
private:
std::shared_ptr<GNSSBlockInterface> data_type_adapt_;

12
src/algorithms/conditioner/adapters/signal_conditioner.h
View File

@ -61,15 +61,15 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string role() override { return role_; }
inline std::string role() override { return role_; }
std::string implementation() override { return "Signal_Conditioner"; } //!< Returns "Signal_Conditioner"
inline std::string implementation() override { return "Signal_Conditioner"; } //!< Returns "Signal_Conditioner"
size_t item_size() override { return 0; }
inline size_t item_size() override { return 0; }
std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
inline std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
inline std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
inline std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
private:
std::shared_ptr<GNSSBlockInterface> data_type_adapt_;

7
src/algorithms/data_type_adapter/adapters/byte_to_short.h
View File

@ -52,18 +52,18 @@ public:
virtual ~ByteToShort();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Byte_To_Short"
std::string implementation() override
inline std::string implementation() override
{
return "Byte_To_Short";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}
@ -87,4 +87,3 @@ private:
};
#endif

6
src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
View File

@ -53,18 +53,18 @@ public:
virtual ~IbyteToCbyte();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Ibyte_To_Cbyte"
std::string implementation() override
inline std::string implementation() override
{
return "Ibyte_To_Cbyte";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

8
src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
View File

@ -53,18 +53,18 @@ public:
virtual ~IbyteToComplex();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Ibyte_To_Complex"
std::string implementation() override
inline std::string implementation() override
{
return "Ibyte_To_Complex";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}
@ -88,5 +88,3 @@ private:
};
#endif

7
src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
View File

@ -53,18 +53,18 @@ public:
virtual ~IbyteToCshort();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Ibyte_To_Cshort"
std::string implementation() override
inline std::string implementation() override
{
return "Ibyte_To_Cshort";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}
@ -88,4 +88,3 @@ private:
};
#endif

7
src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
View File

@ -52,18 +52,18 @@ public:
virtual ~IshortToComplex();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Ishort_To_Complex"
std::string implementation() override
inline std::string implementation() override
{
return "Ishort_To_Complex";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}
@ -87,4 +87,3 @@ private:
};
#endif

7
src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
View File

@ -53,18 +53,18 @@ public:
virtual ~IshortToCshort();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Ishort_To_Cshort"
std::string implementation() override
inline std::string implementation() override
{
return "Ishort_To_Cshort";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}
@ -88,4 +88,3 @@ private:
};
#endif

6
src/algorithms/input_filter/adapters/beamformer_filter.h
View File

@ -51,18 +51,18 @@ public:
virtual ~BeamformerFilter();
std::string role() override
inline std::string role() override
{
return role_;
}
//! returns "Direct_Resampler"
std::string implementation() override
inline std::string implementation() override
{
return "Beamformer_Filter";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

6
src/algorithms/input_filter/adapters/fir_filter.h
View File

@ -71,18 +71,18 @@ public:
//! Destructor
virtual ~FirFilter();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Fir_Filter"
std::string implementation() override
inline std::string implementation() override
{
return "Fir_Filter";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

6
src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
View File

@ -69,18 +69,18 @@ public:
virtual ~FreqXlatingFirFilter();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Freq_Xlating_Fir_Filter"
std::string implementation() override
inline std::string implementation() override
{
return "Freq_Xlating_Fir_Filter";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

6
src/algorithms/input_filter/adapters/pulse_blanking_filter.h
View File

@ -51,18 +51,18 @@ public:
virtual ~PulseBlankingFilter();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Pulse_Blanking_Filter"
std::string implementation() override
inline std::string implementation() override
{
return "Pulse_Blanking_Filter";
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

24
src/algorithms/libs/pass_through.h
View File

@ -52,31 +52,37 @@ public:
unsigned int out_stream);
virtual ~Pass_Through();
std::string role()
inline std::string role() override
{
return role_;
}
//! returns "Pass_Through"
std::string implementation()
inline std::string implementation() override
{
return "Pass_Through";
}
std::string item_type()
inline std::string item_type() const
{
return item_type_;
}
size_t vector_size()
inline size_t vector_size() const
{
return vector_size_;
}
size_t item_size()
inline size_t item_size() override
{
return item_size_;
}
void connect(gr::top_block_sptr top_block);
void disconnect(gr::top_block_sptr top_block);
gr::basic_block_sptr get_left_block();
gr::basic_block_sptr get_right_block();
void connect(gr::top_block_sptr top_block) override;
void disconnect(gr::top_block_sptr top_block) override;
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
private:
std::string item_type_;

8
src/algorithms/observables/adapters/hybrid_observables.h
View File

@ -54,13 +54,13 @@ public:
virtual ~HybridObservables();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Hybrid_Observables"
std::string implementation() override
inline std::string implementation() override
{
return "Hybrid_Observables";
}
@ -70,13 +70,13 @@ 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
size_t item_size() override
inline size_t item_size() override
{
return sizeof(gr_complex);
}

6
src/algorithms/resampler/adapters/direct_resampler_conditioner.h
View File

@ -52,18 +52,18 @@ public:
virtual ~DirectResamplerConditioner();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Direct_Resampler"
std::string implementation() override
inline std::string implementation() override
{
return "Direct_Resampler";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

10
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
View File

@ -49,9 +49,7 @@ direct_resampler_make_conditioner_cb(double sample_freq_in,
*/
class direct_resampler_conditioner_cb: public gr::block
{
private:
friend direct_resampler_conditioner_cb_sptr
direct_resampler_make_conditioner_cb(double sample_freq_in,
double sample_freq_out);
@ -67,18 +65,20 @@ private:
double sample_freq_out);
public:
~direct_resampler_conditioner_cb();
unsigned int sample_freq_in() const
inline unsigned int sample_freq_in() const
{
return d_sample_freq_in;
}
unsigned int sample_freq_out() const
inline unsigned int sample_freq_out() const
{
return d_sample_freq_out;
}
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);

7
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
View File

@ -70,15 +70,18 @@ private:
public:
~direct_resampler_conditioner_cc();
unsigned int sample_freq_in() const
inline unsigned int sample_freq_in() const
{
return d_sample_freq_in;
}
unsigned int sample_freq_out() const
inline unsigned int sample_freq_out() const
{
return d_sample_freq_out;
}
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);

10
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
View File

@ -49,9 +49,7 @@ direct_resampler_make_conditioner_cs(double sample_freq_in,
*/
class direct_resampler_conditioner_cs: public gr::block
{
private:
friend direct_resampler_conditioner_cs_sptr
direct_resampler_make_conditioner_cs(double sample_freq_in,
double sample_freq_out);
@ -67,18 +65,20 @@ private:
double sample_freq_out);
public:
~direct_resampler_conditioner_cs();
unsigned int sample_freq_in() const
inline unsigned int sample_freq_in() const
{
return d_sample_freq_in;
}
unsigned int sample_freq_out() const
inline unsigned int sample_freq_out() const
{
return d_sample_freq_out;
}
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);

6
src/algorithms/signal_generator/adapters/signal_generator.h
View File

@ -58,7 +58,7 @@ public:
virtual ~SignalGenerator();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -66,12 +66,12 @@ public:
/*!
* \brief Returns "GNSSSignalGenerator".
*/
std::string implementation() override
inline std::string implementation() override
{
return "GNSSSignalGenerator";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

20
src/algorithms/signal_source/adapters/file_signal_source.h
View File

@ -59,7 +59,7 @@ public:
virtual ~FileSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -67,12 +67,12 @@ public:
/*!
* \brief Returns "File_Signal_Source".
*/
std::string implementation() override
inline std::string implementation() override
{
return "File_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}
@ -82,23 +82,27 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string filename()
inline std::string filename() const
{
return filename_;
}
std::string item_type()
inline std::string item_type() const
{
return item_type_;
}
bool repeat()
inline bool repeat() const
{
return repeat_;
}
long sampling_frequency()
inline long sampling_frequency() const
{
return sampling_frequency_;
}
long samples()
inline long samples() const
{
return samples_;
}

6
src/algorithms/signal_source/adapters/flexiband_signal_source.h
View File

@ -58,7 +58,7 @@ public:
virtual ~FlexibandSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -66,12 +66,12 @@ public:
/*!
* \brief Returns "Flexiband_Signal_Source".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Flexiband_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

8
src/algorithms/signal_source/adapters/gen_signal_source.h
View File

@ -57,13 +57,13 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string role() override { return role_; }
inline std::string role() override { return role_; }
//! Returns "Signal Source"
std::string implementation() override { return "Signal Source"; }
size_t item_size() override { return 0; }
inline std::string implementation() override { return "Signal Source"; }
inline size_t item_size() override { return 0; }
GNSSBlockInterface *signal_generator() { return signal_generator_; }
inline GNSSBlockInterface *signal_generator() const { return signal_generator_; }
private:
GNSSBlockInterface *signal_generator_;

6
src/algorithms/signal_source/adapters/gn3s_signal_source.h
View File

@ -53,7 +53,7 @@ public:
virtual ~Gn3sSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -61,12 +61,12 @@ public:
/*!
* \brief Returns "Gn3sSignalSource".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Gn3sSignalSource";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

16
src/algorithms/signal_source/adapters/nsr_file_signal_source.h
View File

@ -59,7 +59,7 @@ public:
boost::shared_ptr<gr::msg_queue> queue);
virtual ~NsrFileSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -67,12 +67,12 @@ public:
/*!
* \brief Returns "Nsr_File_Signal_Source".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Nsr_File_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}
@ -82,27 +82,27 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string filename()
inline std::string filename() const
{
return filename_;
}
std::string item_type()
inline std::string item_type() const
{
return item_type_;
}
bool repeat()
inline bool repeat() const
{
return repeat_;
}
long sampling_frequency()
inline long sampling_frequency() const
{
return sampling_frequency_;
}
long samples()
inline long samples() const
{
return samples_;
}

6
src/algorithms/signal_source/adapters/osmosdr_signal_source.h
View File

@ -56,7 +56,7 @@ public:
virtual ~OsmosdrSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -64,12 +64,12 @@ public:
/*!
* \brief Returns "Osmosdr_Signal_Source"
*/
std::string implementation() override
inline std::string implementation() override
{
return "Osmosdr_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

6
src/algorithms/signal_source/adapters/raw_array_signal_source.h
View File

@ -53,7 +53,7 @@ public:
virtual ~RawArraySignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -61,12 +61,12 @@ public:
/*!
* \brief Returns "RawArraySignalSource".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Raw_Array_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

6
src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
View File

@ -57,7 +57,7 @@ public:
virtual ~RtlTcpSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -65,12 +65,12 @@ public:
/*!
* \brief Returns "RtlTcp_Signal_Source"
*/
std::string implementation() override
inline std::string implementation() override
{
return "RtlTcp_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

16
src/algorithms/signal_source/adapters/spir_file_signal_source.h
View File

@ -56,7 +56,7 @@ public:
boost::shared_ptr<gr::msg_queue> queue);
virtual ~SpirFileSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -64,12 +64,12 @@ public:
/*!
* \brief Returns "Spir_File_Signal_Source".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Spir_File_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}
@ -79,27 +79,27 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string filename()
inline std::string filename() const
{
return filename_;
}
std::string item_type()
inline std::string item_type() const
{
return item_type_;
}
bool repeat()
inline bool repeat() const
{
return repeat_;
}
long sampling_frequency()
inline long sampling_frequency() const
{
return sampling_frequency_;
}
long samples()
inline long samples() const
{
return samples_;
}

16
src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
View File

@ -60,7 +60,7 @@ public:
boost::shared_ptr<gr::msg_queue> queue);
virtual ~TwoBitCpxFileSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -68,12 +68,12 @@ public:
/*!
* \brief Returns "Two_Bit_Cpx_File_Signal_Source".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Two_Bit_Cpx_File_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}
@ -83,27 +83,27 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string filename()
inline std::string filename() const
{
return filename_;
}
std::string item_type()
inline std::string item_type() const
{
return item_type_;
}
bool repeat()
inline bool repeat() const
{
return repeat_;
}
long sampling_frequency()
inline long sampling_frequency() const
{
return sampling_frequency_;
}
long samples()
inline long samples() const
{
return samples_;
}

25
src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
View File

@ -61,7 +61,7 @@ public:
boost::shared_ptr<gr::msg_queue> queue);
virtual ~TwoBitPackedFileSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -69,12 +69,12 @@ public:
/*!
* \brief Returns "Two_Bit_Packed_File_Signal_Source".
*/
std::string implementation() override
inline std::string implementation() override
{
return "Two_Bit_Packed_File_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}
@ -84,47 +84,47 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
std::string filename()
inline std::string filename() const
{
return filename_;
}
std::string item_type()
inline std::string item_type() const
{
return item_type_;
}
bool repeat()
inline bool repeat() const
{
return repeat_;
}
long sampling_frequency()
inline long sampling_frequency() const
{
return sampling_frequency_;
}
long samples()
inline long samples() const
{
return samples_;
}
bool big_endian_items()
inline bool big_endian_items() const
{
return big_endian_items_;
}
bool big_endian_bytes()
inline bool big_endian_bytes() const
{
return big_endian_bytes_;
}
bool is_complex()
inline bool is_complex() const
{
return is_complex_;
}
bool reverse_interleaving()
inline bool reverse_interleaving() const
{
return reverse_interleaving_;
}
@ -158,4 +158,3 @@ private:
};
#endif /*GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_*/

6
src/algorithms/signal_source/adapters/uhd_signal_source.h
View File

@ -55,7 +55,7 @@ public:
virtual ~UhdSignalSource();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -63,12 +63,12 @@ public:
/*!
* \brief Returns "UHD_Signal_Source"
*/
std::string implementation() override
inline std::string implementation() override
{
return "UHD_Signal_Source";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

10
src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
View File

@ -56,7 +56,7 @@ public:
virtual ~GalileoE1BTelemetryDecoder();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -64,7 +64,7 @@ public:
/*!
* \brief Returns "Galileo_E1B_Telemetry_Decoder"
*/
std::string implementation() override
inline std::string implementation() override
{
return "Galileo_E1B_Telemetry_Decoder";
}
@ -75,14 +75,14 @@ public:
gr::basic_block_sptr get_right_block() override;
void set_satellite(Gnss_Satellite satellite) override;
void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
void reset() override
inline void reset() override
{
return;
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

10
src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
View File

@ -57,7 +57,7 @@ public:
virtual ~GalileoE5aTelemetryDecoder();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -65,7 +65,7 @@ public:
/*!
* \brief Returns "Galileo_E5a_Telemetry_Decoder"
*/
std::string implementation() override
inline std::string implementation() override
{
return "Galileo_E5A_Telemetry_Decoder";
}
@ -76,14 +76,14 @@ public:
gr::basic_block_sptr get_right_block() override;
void set_satellite(Gnss_Satellite satellite) override;
void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
void reset() override
inline void reset() override
{
return;
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

11
src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
View File

@ -53,13 +53,13 @@ public:
virtual ~GpsL1CaTelemetryDecoder();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L1_CA_Telemetry_Decoder"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L1_CA_Telemetry_Decoder";
}
@ -70,13 +70,14 @@ public:
gr::basic_block_sptr get_right_block() override;
void set_satellite(Gnss_Satellite satellite) override;
void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
void reset() override
inline void reset() override
{
return;
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

10
src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
View File

@ -53,13 +53,13 @@ public:
virtual ~GpsL2CTelemetryDecoder();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L2C_Telemetry_Decoder"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L2C_Telemetry_Decoder";
}
@ -70,13 +70,13 @@ public:
gr::basic_block_sptr get_right_block() override;
void set_satellite(Gnss_Satellite satellite) override;
void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
void reset() override
inline void reset() override
{
return;
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

10
src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
View File

@ -54,7 +54,7 @@ public:
virtual ~SbasL1TelemetryDecoder();
std::string role() override
inline std::string role() override
{
return role_;
}
@ -62,7 +62,7 @@ public:
/*!
* \brief Returns "SBAS_L1_Telemetry_Decoder"
*/
std::string implementation() override
inline std::string implementation() override
{
return "SBAS_L1_Telemetry_Decoder";
}
@ -73,14 +73,14 @@ public:
gr::basic_block_sptr get_right_block() override;
void set_satellite(Gnss_Satellite satellite) override;
void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
void reset() override
inline void reset() override
{
return;
}
size_t item_size() override
inline size_t item_size() override
{
return 0;
}

13
src/algorithms/telemetry_decoder/libs/convolutional.h
View File

@ -57,7 +57,7 @@ const float MAXLOG = 1e7; /* Define infinity */
*
* This function is used by nsc_enc_bit(), rsc_enc_bit(), and rsc_tail()
*/
static int parity_counter(int symbol, int length)
inline static int parity_counter(int symbol, int length)
{
int counter;
int temp_parity = 0;
@ -71,7 +71,6 @@ static int parity_counter(int symbol, int length)
}
/*!
* \brief Convolutionally encodes a single bit using a rate 1/n encoder.
* Takes in one input bit at a time, and produces a n-bit output.
@ -86,7 +85,7 @@ static int parity_counter(int symbol, int length)
*
* This function is used by nsc_transit()
*/
static int nsc_enc_bit(int state_out_p[],
inline static int nsc_enc_bit(int state_out_p[],
int input,
int state_in,
int g[],
@ -113,11 +112,10 @@ static int nsc_enc_bit(int state_out_p[],
}
/*!
* \brief Function that creates the transit and output vectors
*/
static void nsc_transit(int output_p[],
inline static void nsc_transit(int output_p[],
int trans_p[],
int input,
int g[],
@ -138,7 +136,6 @@ static void nsc_transit(int output_p[],
}
/*!
* \brief Computes the branch metric used for decoding.
* \return (returned float) The metric between the hypothetical symbol and the received vector
@ -147,7 +144,7 @@ static void nsc_transit(int output_p[],
* \param[in] nn The length of the received vector
*
*/
static float Gamma(float rec_array[],
inline static float Gamma(float rec_array[],
int symbol,
int nn)
{
@ -177,7 +174,7 @@ static float Gamma(float rec_array[],
* \param[out] output_u_int[] Hard decisions on the data bits
*
*/
static void Viterbi(int output_u_int[],
inline static void Viterbi(int output_u_int[],
int out0[],
int state0[],
int out1[],

8
src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
View File

@ -7,7 +7,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -59,18 +59,18 @@ public:
virtual ~GalileoE1DllPllVemlTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Galileo_E1_DLL_PLL_VEML_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "Galileo_E1_DLL_PLL_VEML_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

6
src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
View File

@ -59,18 +59,18 @@ public:
virtual ~GalileoE1TcpConnectorTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Galileo_E1_TCP_CONNECTOR_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "Galileo_E1_TCP_CONNECTOR_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

6
src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
View File

@ -59,18 +59,18 @@ public:
virtual ~GalileoE5aDllPllTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "Galileo_E5a_DLL_PLL_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "Galileo_E5a_DLL_PLL_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

8
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
View File

@ -8,7 +8,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -59,18 +59,18 @@ public:
virtual ~GpsL1CaDllPllCAidTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

8
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h
View File

@ -9,7 +9,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -57,18 +57,18 @@ public:
virtual ~GpsL1CaDllPllCAidTrackingFpga();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking_Fpga"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking_Fpga";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

8
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
View File

@ -8,7 +8,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -58,18 +58,18 @@ public:
virtual ~GpsL1CaDllPllTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L1_CA_DLL_PLL_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L1_CA_DLL_PLL_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

9
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
View File

@ -7,7 +7,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -57,17 +57,18 @@ public:
virtual ~GpsL1CaDllPllTrackingGPU();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L1_CA_DLL_PLL_Tracking_GPU"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L1_CA_DLL_PLL_Tracking_GPU";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

11
src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
View File

@ -8,7 +8,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -52,7 +52,6 @@ class GpsL1CaTcpConnectorTracking : public TrackingInterface
{
public:
GpsL1CaTcpConnectorTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
@ -60,18 +59,18 @@ public:
virtual ~GpsL1CaTcpConnectorTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L1_CA_TCP_CONNECTOR_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L1_CA_TCP_CONNECTOR_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}
@ -81,7 +80,6 @@ public:
gr::basic_block_sptr get_left_block() override;
gr::basic_block_sptr get_right_block() override;
/*!
* \brief Set tracking channel unique ID
*/
@ -93,7 +91,6 @@ public:
*/
void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;
void start_tracking() override;
private:

8
src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
View File

@ -8,7 +8,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* 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
* Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@ -58,18 +58,18 @@ public:
virtual ~GpsL2MDllPllTracking();
std::string role() override
inline std::string role() override
{
return role_;
}
//! Returns "GPS_L2_M_DLL_PLL_Tracking"
std::string implementation() override
inline std::string implementation() override
{
return "GPS_L2_M_DLL_PLL_Tracking";
}
size_t item_size() override
inline size_t item_size() override
{
return item_size_;
}

2
src/core/system_parameters/galileo_ephemeris.h
View File

@ -116,7 +116,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

2
src/core/system_parameters/gps_cnav_ephemeris.h
View File

@ -130,7 +130,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

2
src/core/system_parameters/gps_cnav_iono.h
View File

@ -63,7 +63,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version) const
{
using boost::serialization::make_nvp;
if(version){};

2
src/core/system_parameters/gps_cnav_utc_model.h
View File

@ -71,7 +71,7 @@ public:
/*
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

3
src/core/system_parameters/gps_ephemeris.h
View File

@ -132,7 +132,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};
@ -199,7 +199,6 @@ public:
*/
double sv_clock_relativistic_term(double transmitTime);
/*!
* Default constructor
*/

2
src/core/system_parameters/gps_iono.h
View File

@ -63,7 +63,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

2
src/core/system_parameters/gps_ref_location.h
View File

@ -57,7 +57,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the Ref location on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

2
src/core/system_parameters/gps_ref_time.h
View File

@ -58,7 +58,7 @@ public:
/*!
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ref time data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

2
src/core/system_parameters/gps_utc_model.h
View File

@ -64,7 +64,7 @@ public:
/*
* \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
*/
void serialize(Archive& archive, const unsigned int version)
inline void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
if(version){};

40
src/core/system_parameters/rtcm.h
View File

@ -368,7 +368,7 @@ private:
return data_;
}
std::size_t length() const
inline std::size_t length() const
{
return header_length + body_length_;
}
@ -395,7 +395,7 @@ private:
body_length_ = max_body_length;
}
bool decode_header()
inline bool decode_header()
{
char header[header_length + 1] = "";
std::strncat(header, data_, header_length);
@ -420,7 +420,7 @@ private:
return true;
}
void encode_header()
inline void encode_header()
{
char header[header_length + 1] = "";
std::sprintf(header, "GS%4d", static_cast<int>(body_length_));
@ -444,19 +444,19 @@ private:
class Rtcm_Listener_Room
{
public:
void join(std::shared_ptr<Rtcm_Listener> participant)
inline void join(std::shared_ptr<Rtcm_Listener> participant)
{
participants_.insert(participant);
for (auto msg: recent_msgs_)
participant->deliver(msg);
}
void leave(std::shared_ptr<Rtcm_Listener> participant)
inline void leave(std::shared_ptr<Rtcm_Listener> participant)
{
participants_.erase(participant);
}
void deliver(const Rtcm_Message & msg)
inline void deliver(const Rtcm_Message & msg)
{
recent_msgs_.push_back(msg);
while (recent_msgs_.size() > max_recent_msgs)
@ -480,13 +480,13 @@ private:
public:
Rtcm_Session(boost::asio::ip::tcp::socket socket, Rtcm_Listener_Room & room) : socket_(std::move(socket)), room_(room) { }
void start()
inline void start()
{
room_.join(shared_from_this());
do_read_message_header();
}
void deliver(const Rtcm_Message & msg)
inline void deliver(const Rtcm_Message & msg)
{
bool write_in_progress = !write_msgs_.empty();
write_msgs_.push_back(msg);
@ -497,7 +497,7 @@ private:
}
private:
void do_read_message_header()
inline void do_read_message_header()
{
auto self(shared_from_this());
boost::asio::async_read(socket_,
@ -532,7 +532,7 @@ private:
});
}
void do_read_message_body()
inline void do_read_message_body()
{
auto self(shared_from_this());
boost::asio::async_read(socket_,
@ -555,7 +555,7 @@ private:
});
}
void do_write()
inline void do_write()
{
auto self(shared_from_this());
boost::asio::async_write(socket_,
@ -597,12 +597,12 @@ private:
do_connect(endpoint_iterator);
}
void close()
inline void close()
{
io_service_.post([this]() { socket_.close(); });
}
void write(const Rtcm_Message & msg)
inline void write(const Rtcm_Message & msg)
{
io_service_.post(
[this, msg]()
@ -617,7 +617,7 @@ private:
}
private:
void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
inline void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
{
boost::asio::async_connect(socket_, endpoint_iterator,
[this](boost::system::error_code ec, boost::asio::ip::tcp::resolver::iterator)
@ -633,7 +633,7 @@ private:
});
}
void do_read_message()
inline void do_read_message()
{
boost::asio::async_read(socket_,
boost::asio::buffer(read_msg_.data(), 1029),
@ -651,9 +651,8 @@ private:
});
}
void do_write()
inline void do_write()
{
boost::asio::async_write(socket_,
boost::asio::buffer(write_msgs_.front().data(), write_msgs_.front().length()),
[this](boost::system::error_code ec, std::size_t /*length*/)
@ -692,7 +691,7 @@ private:
c = std::make_shared<Tcp_Internal_Client>(io_service, queue_endpoint_iterator);
}
void do_read_queue()
inline void do_read_queue()
{
for(;;)
{
@ -726,14 +725,14 @@ private:
do_accept();
}
void close_server()
inline void close_server()
{
socket_.close();
acceptor_.close();
}
private:
void do_accept()
inline void do_accept()
{
acceptor_.async_accept(socket_, [this](boost::system::error_code ec)
{
@ -766,7 +765,6 @@ private:
bool first_client = true;
};
boost::asio::io_service io_service;
std::shared_ptr< concurrent_queue<std::string> > rtcm_message_queue;
std::thread t;