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

Improve const correctess, change name of variable to a more meaningful name

Browse Source
This commit is contained in:
Carles Fernandez 2018-11-08 14:25:38 +01:00
parent b8a412895a
commit 98726ef036
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
5 changed files with 492 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/algorithms/PVT/adapters/rtklib_pvt.cc
View File

@ -536,23 +536,31 @@ RtklibPvt::~RtklibPvt()
rtkfree(&rtk); rtkfree(&rtk);
} }
std::map<int, Gps_Ephemeris> RtklibPvt::get_gps_ephemeris()
std::map<int, Gps_Ephemeris> RtklibPvt::get_gps_ephemeris() const
{ {
return pvt_->get_gps_ephemeris_map(); return pvt_->get_gps_ephemeris_map();
} }
std::map<int, Galileo_Ephemeris> RtklibPvt::get_galileo_ephemeris()
std::map<int, Galileo_Ephemeris> RtklibPvt::get_galileo_ephemeris() const
{ {
return pvt_->get_galileo_ephemeris_map(); return pvt_->get_galileo_ephemeris_map();
} }
std::map<int, Gps_Almanac> RtklibPvt::get_gps_almanac()
std::map<int, Gps_Almanac> RtklibPvt::get_gps_almanac() const
{ {
return pvt_->get_gps_almanac_map(); return pvt_->get_gps_almanac_map();
} }
std::map<int, Galileo_Almanac> RtklibPvt::get_galileo_almanac()
std::map<int, Galileo_Almanac> RtklibPvt::get_galileo_almanac() const
{ {
return pvt_->get_galileo_almanac_map(); return pvt_->get_galileo_almanac_map();
} }
void RtklibPvt::connect(gr::top_block_sptr top_block) void RtklibPvt::connect(gr::top_block_sptr top_block)
{ {
if (top_block) if (top_block)

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

@ -64,10 +64,10 @@ public:
} }
void clear_ephemeris() override; void clear_ephemeris() override;
std::map<int, Gps_Ephemeris> get_gps_ephemeris() override; std::map<int, Gps_Ephemeris> get_gps_ephemeris() const override;
std::map<int, Galileo_Ephemeris> get_galileo_ephemeris() override; std::map<int, Galileo_Ephemeris> get_galileo_ephemeris() const override;
std::map<int, Gps_Almanac> get_gps_almanac() override; std::map<int, Gps_Almanac> get_gps_almanac() const override;
std::map<int, Galileo_Almanac> get_galileo_almanac() override; std::map<int, Galileo_Almanac> get_galileo_almanac() const override;
void connect(gr::top_block_sptr top_block) override; void connect(gr::top_block_sptr top_block) override;
void disconnect(gr::top_block_sptr top_block) override; void disconnect(gr::top_block_sptr top_block) override;

928
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
View File

File diff suppressed because it is too large Load Diff

11
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
View File

@ -113,7 +113,7 @@ private:
bool d_kml_output_enabled; bool d_kml_output_enabled;
bool d_nmea_output_file_enabled; bool d_nmea_output_file_enabled;
std::shared_ptr<rtklib_solver> d_ls_pvt; std::shared_ptr<rtklib_solver> d_pvt_solver;
std::map<int, Gnss_Synchro> gnss_observables_map; std::map<int, Gnss_Synchro> gnss_observables_map;
bool observables_pairCompare_min(const std::pair<int, Gnss_Synchro>& a, const std::pair<int, Gnss_Synchro>& b); bool observables_pairCompare_min(const std::pair<int, Gnss_Synchro>& a, const std::pair<int, Gnss_Synchro>& b);
@ -153,13 +153,13 @@ public:
* \brief Get latest set of ephemeris from PVT block * \brief Get latest set of ephemeris from PVT block
* *
*/ */
std::map<int, Gps_Ephemeris> get_gps_ephemeris_map(); std::map<int, Gps_Ephemeris> get_gps_ephemeris_map() const;
std::map<int, Gps_Almanac> get_gps_almanac_map(); std::map<int, Gps_Almanac> get_gps_almanac_map() const;
std::map<int, Galileo_Ephemeris> get_galileo_ephemeris_map(); std::map<int, Galileo_Ephemeris> get_galileo_ephemeris_map() const;
std::map<int, Galileo_Almanac> get_galileo_almanac_map(); std::map<int, Galileo_Almanac> get_galileo_almanac_map() const;
/*! /*!
* \brief Clear all ephemeris information and the almanacs for GPS and Galileo * \brief Clear all ephemeris information and the almanacs for GPS and Galileo
@ -167,7 +167,6 @@ public:
*/ */
void clear_ephemeris(); void clear_ephemeris();
/*! /*!
* \brief Get the latest Position WGS84 [deg], Ground Velocity, Course over Ground, and UTC Time, if available * \brief Get the latest Position WGS84 [deg], Ground Velocity, Course over Ground, and UTC Time, if available
*/ */

8
src/core/interfaces/pvt_interface.h
View File

@ -57,10 +57,10 @@ class PvtInterface : public GNSSBlockInterface
public: public:
virtual void reset() = 0; virtual void reset() = 0;
virtual void clear_ephemeris() = 0; virtual void clear_ephemeris() = 0;
virtual std::map<int, Gps_Ephemeris> get_gps_ephemeris() = 0; virtual std::map<int, Gps_Ephemeris> get_gps_ephemeris() const = 0;
virtual std::map<int, Galileo_Ephemeris> get_galileo_ephemeris() = 0; virtual std::map<int, Galileo_Ephemeris> get_galileo_ephemeris() const = 0;
virtual std::map<int, Gps_Almanac> get_gps_almanac() = 0; virtual std::map<int, Gps_Almanac> get_gps_almanac() const = 0;
virtual std::map<int, Galileo_Almanac> get_galileo_almanac() = 0; virtual std::map<int, Galileo_Almanac> get_galileo_almanac() const = 0;
virtual bool get_latest_PVT(double* longitude_deg, virtual bool get_latest_PVT(double* longitude_deg,
double* latitude_deg, double* latitude_deg,