Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into fix-nmea

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -48,6 +48,12 @@ namespace bc = boost::integer;
 
 using google::LogMessage;
 
+
+void RtklibPvt::clear_ephemeris()
+{
+    pvt_->clear_ephemeris();
+}
+
 RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     std::string role,
     unsigned int in_streams,
@@ -515,6 +521,22 @@ RtklibPvt::~RtklibPvt()
     rtkfree(&rtk);
 }
 
+std::map<int, Gps_Ephemeris> RtklibPvt::get_gps_ephemeris()
+{
+    return pvt_->get_gps_ephemeris_map();
+}
+std::map<int, Galileo_Ephemeris> RtklibPvt::get_galileo_ephemeris()
+{
+    return pvt_->get_galileo_ephemeris_map();
+}
+std::map<int, Gps_Almanac> RtklibPvt::get_gps_almanac()
+{
+    return pvt_->get_gps_almanac_map();
+}
+std::map<int, Galileo_Almanac> RtklibPvt::get_galileo_almanac()
+{
+    return pvt_->get_galileo_almanac_map();
+}
 
 void RtklibPvt::connect(gr::top_block_sptr top_block)
 {

src/algorithms/PVT/adapters/rtklib_pvt.h

@@ -63,6 +63,13 @@ public:
         return "RTKLIB_PVT";
     }
 
+    void clear_ephemeris();
+    std::map<int, Gps_Ephemeris> get_gps_ephemeris();
+    std::map<int, Galileo_Ephemeris> get_galileo_ephemeris();
+    std::map<int, Gps_Almanac> get_gps_almanac();
+    std::map<int, Galileo_Almanac> get_galileo_almanac();
+
+
     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;

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc

@@ -234,11 +234,32 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
 }
 
 
-std::map<int, Gps_Ephemeris> rtklib_pvt_cc::get_GPS_L1_ephemeris_map()
+std::map<int, Gps_Ephemeris> rtklib_pvt_cc::get_gps_ephemeris_map()
 {
     return d_ls_pvt->gps_ephemeris_map;
 }
 
+std::map<int, Gps_Almanac> rtklib_pvt_cc::get_gps_almanac_map()
+{
+    return d_ls_pvt->gps_almanac_map;
+}
+
+std::map<int, Galileo_Ephemeris> rtklib_pvt_cc::get_galileo_ephemeris_map()
+{
+    return d_ls_pvt->galileo_ephemeris_map;
+}
+std::map<int, Galileo_Almanac> rtklib_pvt_cc::get_galileo_almanac_map()
+{
+    return d_ls_pvt->galileo_almanac_map;
+}
+
+void rtklib_pvt_cc::clear_ephemeris()
+{
+    d_ls_pvt->gps_ephemeris_map.clear();
+    d_ls_pvt->gps_almanac_map.clear();
+    d_ls_pvt->galileo_ephemeris_map.clear();
+    d_ls_pvt->galileo_almanac_map.clear();
+}
 
 rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
     const Pvt_Conf& conf_,

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h

@@ -31,7 +31,7 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_CC_H
 #define GNSS_SDR_RTKLIB_PVT_CC_H
 
-
+#include "gps_ephemeris.h"
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "gpx_printer.h"
@@ -142,11 +142,22 @@ public:
         rtk_t& rtk);
 
     /*!
-     * \brief Get latest set of GPS L1 ephemeris from PVT block
+     * \brief Get latest set of ephemeris from PVT block
      *
-     * It is used to save the assistance data at the receiver shutdown
      */
-    std::map<int, Gps_Ephemeris> get_GPS_L1_ephemeris_map();
+    std::map<int, Gps_Ephemeris> get_gps_ephemeris_map();
+
+    std::map<int, Gps_Almanac> get_gps_almanac_map();
+
+    std::map<int, Galileo_Ephemeris> get_galileo_ephemeris_map();
+
+    std::map<int, Galileo_Almanac> get_galileo_almanac_map();
+
+    /*!
+     * \brief Clear all ephemeris information and the almanacs for GPS and Galileo
+     *
+     */
+    void clear_ephemeris();
 
     ~rtklib_pvt_cc();  //!< Default destructor