mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-17 15:24:56 +00:00
Code Issues Releases Wiki Activity

Make header file more readable. Remove unused private method interpolate_data()

Browse Source
This commit is contained in:
Carles Fernandez 2019-07-04 00:00:29 +02:00
parent 4de86b1f8a
commit 9ba6f4d670
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
View File

@ -34,7 +34,7 @@
#ifndef GNSS_SDR_HYBRID_OBSERVABLES_GS_H #ifndef GNSS_SDR_HYBRID_OBSERVABLES_GS_H
#define GNSS_SDR_HYBRID_OBSERVABLES_GS_H #define GNSS_SDR_HYBRID_OBSERVABLES_GS_H
#include <boost/circular_buffer.hpp> // for boost::curcular_buffer #include <boost/circular_buffer.hpp> // for boost::circular_buffer
#include <boost/shared_ptr.hpp> // for boost::shared_ptr #include <boost/shared_ptr.hpp> // for boost::shared_ptr
#include <gnuradio/block.h> // for block #include <gnuradio/block.h> // for block
#include <gnuradio/types.h> // for gr_vector_int #include <gnuradio/types.h> // for gr_vector_int
@ -50,8 +50,12 @@ class Gnss_circular_deque;
using hybrid_observables_gs_sptr = boost::shared_ptr<hybrid_observables_gs>; using hybrid_observables_gs_sptr = boost::shared_ptr<hybrid_observables_gs>;
hybrid_observables_gs_sptr hybrid_observables_gs_sptr hybrid_observables_gs_make(
hybrid_observables_gs_make(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename); unsigned int nchannels_in,
unsigned int nchannels_out,
bool dump,
bool dump_mat,
std::string dump_filename);
/*! /*!
* \brief This class implements a block that computes observables * \brief This class implements a block that computes observables
@ -60,38 +64,44 @@ class hybrid_observables_gs : public gr::block
{ {
public: public:
~hybrid_observables_gs(); ~hybrid_observables_gs();
void forecast(int noutput_items, gr_vector_int& ninput_items_required);
int general_work(int noutput_items, gr_vector_int& ninput_items, int general_work(int noutput_items, gr_vector_int& ninput_items,
gr_vector_const_void_star& input_items, gr_vector_void_star& output_items); gr_vector_const_void_star& input_items, gr_vector_void_star& output_items);
void forecast(int noutput_items, gr_vector_int& ninput_items_required);
private: private:
friend hybrid_observables_gs_sptr friend hybrid_observables_gs_sptr hybrid_observables_gs_make(
hybrid_observables_gs_make(uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, std::string dump_filename); uint32_t nchannels_in,
hybrid_observables_gs(uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, std::string dump_filename); uint32_t nchannels_out,
void msg_handler_pvt_to_observables(const pmt::pmt_t& msg); bool dump,
bool interpolate_data(Gnss_Synchro& out, const uint32_t& ch, const double& ti); bool dump_mat,
bool interp_trk_obs(Gnss_Synchro& interpolated_obs, const uint32_t& ch, const uint64_t& rx_clock); std::string dump_filename);
double compute_T_rx_s(const Gnss_Synchro& a);
void compute_pranges(std::vector<Gnss_Synchro>& data);
void update_TOW(const std::vector<Gnss_Synchro>& data);
int32_t save_matfile();
//time history hybrid_observables_gs(
boost::circular_buffer<uint64_t> d_Rx_clock_buffer; uint32_t nchannels_in,
//Tracking observable history uint32_t nchannels_out,
Gnss_circular_deque<Gnss_Synchro>* d_gnss_synchro_history; bool dump,
//rx time follow GPST bool dump_mat,
bool T_rx_TOW_set; std::string dump_filename);
bool T_rx_TOW_set; // rx time follow GPST
bool d_dump;
bool d_dump_mat;
uint32_t T_rx_TOW_ms; uint32_t T_rx_TOW_ms;
uint32_t T_rx_remnant_to_20ms; uint32_t T_rx_remnant_to_20ms;
uint32_t T_rx_step_ms; uint32_t T_rx_step_ms;
double T_rx_offset_ms;
bool d_dump;
bool d_dump_mat;
uint32_t d_nchannels_in; uint32_t d_nchannels_in;
uint32_t d_nchannels_out; uint32_t d_nchannels_out;
double T_rx_offset_ms;
std::string d_dump_filename; std::string d_dump_filename;
std::ofstream d_dump_file; std::ofstream d_dump_file;
boost::circular_buffer<uint64_t> d_Rx_clock_buffer; // time history
Gnss_circular_deque<Gnss_Synchro>* d_gnss_synchro_history; // Tracking observable history
void msg_handler_pvt_to_observables(const pmt::pmt_t& msg);
double compute_T_rx_s(const Gnss_Synchro& a);
bool interp_trk_obs(Gnss_Synchro& interpolated_obs, const uint32_t& ch, const uint64_t& rx_clock);
void update_TOW(const std::vector<Gnss_Synchro>& data);
void compute_pranges(std::vector<Gnss_Synchro>& data);
int32_t save_matfile();
}; };
#endif #endif