mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Re-organizing assistance data input and output 

Now we are reading the assistance data from xml files if the correct
configuration option is set; defined the name for the xml files as
const inside control_thread.h; and finally moved the manipulation
of these files to the gnss_sdr_supl_client class, not anymore inside
the control_thread.

Signed-off-by: Javier Arribas <jarribas@cttc.es>
This commit is contained in:
Leonardo Tonetto 2014-04-28 16:27:47 +02:00 committed by Javier Arribas
parent eac73b5baa
commit 20121dcc73
6 changed files with 416 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
src/core/libs/gnss_sdr_supl_client.cc
View File

@ -180,7 +180,7 @@ void gnss_sdr_supl_client::read_supl_data()
// READ REFERENCE TIME
if (assist.set & SUPL_RRLP_ASSIST_REFTIME)
{
/* TS 44.031: GPSTOW, range 0-604799.92, resolution 0.08 sec, 23-bit presentation */
/* TS 44.031: GPSTOW, range 0-604799.92, resolution 0.08 sec, 23-bit presentation */
gps_time.d_TOW = ((double)assist.time.gps_tow)*0.08;
gps_time.d_Week = (double)assist.time.gps_week;
gps_time.d_tv_sec = (double)assist.time.stamp.tv_sec;
@ -350,8 +350,9 @@ bool gnss_sdr_supl_client::load_ephemeris_xml(const std::string file_name)
std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
boost::archive::xml_iarchive xml(ifs);
gps_ephemeris_map.clear();
xml >> boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", gps_ephemeris_map);
xml >> boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", this->gps_ephemeris_map);
ifs.close();
LOG(INFO) << "Loaded Ephemeris map data";
}
catch (std::exception& e)
{
@ -361,20 +362,204 @@ bool gnss_sdr_supl_client::load_ephemeris_xml(const std::string file_name)
return true;
}
bool gnss_sdr_supl_client::save_ephemeris_map_xml(const std::string file_name, std::map<int, Gps_Ephemeris> eph_map)
{
if (eph_map.size() > 0)
{
try
{
std::ofstream ofs(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", eph_map);
ofs.close();
LOG(INFO) << "Saved Ephemeris map data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
return false;
}
return true;
}
else
{
LOG(ERROR) << "Failed to save Ephemeris, map is empty";
return false;
}
}
bool gnss_sdr_supl_client::save_ephemeris_xml(const std::string file_name)
bool gnss_sdr_supl_client::load_utc_xml(const std::string file_name)
{
try
{
std::ofstream ofs(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", gps_ephemeris_map);
ofs.close();
std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
boost::archive::xml_iarchive xml(ifs);
xml >> boost::serialization::make_nvp("GNSS-SDR_utc_map", this->gps_utc);
ifs.close();
LOG(INFO) << "Loaded UTC model data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
return false;
LOG(ERROR) << e.what() << "File: " << file_name;
return false;
}
return true;
}
bool gnss_sdr_supl_client::save_utc_map_xml(const std::string file_name, std::map<int, Gps_Utc_Model> utc_map)
{
if (utc_map.size() > 0)
{
try
{
std::ofstream ofs(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_utc_map", utc_map);
ofs.close();
LOG(INFO) << "Saved UTC Model data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
return false;
}
return true;
}
else
{
LOG(ERROR) << "Failed to save UTC model, map is empty";
return false;
}
}
bool gnss_sdr_supl_client::load_iono_xml(const std::string file_name)
{
try
{
std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
boost::archive::xml_iarchive xml(ifs);
xml >> boost::serialization::make_nvp("GNSS-SDR_iono_map", this->gps_iono);
ifs.close();
LOG(INFO) << "Loaded IONO model data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what() << "File: " << file_name;
return false;
}
return true;
}
bool gnss_sdr_supl_client::save_iono_map_xml(const std::string file_name, std::map<int, Gps_Iono> iono_map)
{
if (iono_map.size() > 0)
{
try
{
std::ofstream ofs(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_iono_map", iono_map);
ofs.close();
LOG(INFO) << "Saved IONO Model data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
return false;
}
return true;
}
else
{
LOG(ERROR) << "Failed to save IONO model, map is empty";
return false;
}
}
bool gnss_sdr_supl_client::load_ref_time_xml(const std::string file_name)
{
try
{
std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
boost::archive::xml_iarchive xml(ifs);
xml >> boost::serialization::make_nvp("GNSS-SDR_ref_time_map", this->gps_time);
ifs.close();
LOG(INFO) << "Loaded Ref Time data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what() << "File: " << file_name;
return false;
}
return true;
}
bool gnss_sdr_supl_client::save_ref_time_map_xml(const std::string file_name, std::map<int, Gps_Ref_Time> ref_time_map)
{
if (ref_time_map.size() > 0)
{
try
{
std::ofstream ofs(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ref_time_map", ref_time_map);
ofs.close();
LOG(INFO) << "Saved Ref Time data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
return false;
}
return true;
}
else
{
LOG(ERROR) << "Failed to save Ref Time, map is empty";
return false;
}
}
bool gnss_sdr_supl_client::load_ref_location_xml(const std::string file_name)
{
try
{
std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
boost::archive::xml_iarchive xml(ifs);
xml >> boost::serialization::make_nvp("GNSS-SDR_ref_location_map", this->gps_ref_loc);
ifs.close();
LOG(INFO) << "Loaded Ref Location data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what() << "File: " << file_name;
return false;
}
return true;
}
bool gnss_sdr_supl_client::save_ref_location_map_xml(const std::string file_name, std::map<int, Gps_Ref_Location> ref_location_map)
{
if (ref_location_map.size() > 0)
{
try
{
std::ofstream ofs(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ref_location_map", ref_location_map);
ofs.close();
LOG(INFO) << "Saved Ref Location data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
return false;
}
return true;
}
else
{
LOG(ERROR) << "Failed to save Ref Location, map is empty";
return false;
}
}

48
src/core/libs/gnss_sdr_supl_client.h
View File

@ -113,7 +113,53 @@ public:
/*!
* \brief Save ephemeris map to XML file.
*/
bool save_ephemeris_xml(const std::string file_name);
bool save_ephemeris_map_xml(const std::string file_name,
std::map<int,Gps_Ephemeris> eph_map);
/*!
* \brief Read utc model from XML file
*/
bool load_utc_xml(const std::string file_name);
/*!
* \brief Save utc model map to XML file
* To be called by ControlThread::gps_utc_model_data_write_to_XML()
*/
bool save_utc_map_xml(const std::string file_name,
std::map<int, Gps_Utc_Model> utc_map);
/*!
* \brief Read iono from XML file
*/
bool load_iono_xml(const std::string file_name);
/*!
* \brief Save iono map to XML file
*/
bool save_iono_map_xml(const std::string file_name,
std::map<int, Gps_Iono> iono_map);
/*!
* \brief Read ref time from XML file
*/
bool load_ref_time_xml(const std::string file_name);
/*!
* \brief Save ref time map to XML file
*/
bool save_ref_time_map_xml(const std::string file_name,
std::map<int, Gps_Ref_Time> ref_time_map);
/*!
* \brief Read ref location from XML file
*/
bool load_ref_location_xml(const std::string file_name);
/*!
* \brief Save ref location map to XML file
*/
bool save_ref_location_map_xml(std::string file_name,
std::map<int, Gps_Ref_Location> ref_location_map);
/*
* Prints SUPL data to std::cout. Use it for debug purposes only.

307
src/core/receiver/control_thread.cc
View File

@ -111,11 +111,7 @@ ControlThread::ControlThread(std::shared_ptr<ConfigurationInterface> configurati
ControlThread::~ControlThread()
{
// save navigation data to files
gps_ephemeris_data_write_to_XML();
gps_iono_data_write_to_XML();
gps_utc_model_data_write_to_XML();
gps_ref_location_data_write_to_XML();
gps_ref_time_data_write_to_XML();
if (save_assistance_to_XML() == true) {}
}
@ -197,7 +193,6 @@ void ControlThread::run()
}
void ControlThread::set_control_queue(boost::shared_ptr<gr::msg_queue> control_queue)
{
if (flowgraph_->running())
@ -209,10 +204,20 @@ void ControlThread::set_control_queue(boost::shared_ptr<gr::msg_queue> control_q
}
/*
* Returns true if reading was successful
*/
bool ControlThread::read_assistance_from_XML()
{
std::string eph_xml_filename = "gps_ephemeris.xml";
// return variable (true == succeeded)
bool ret = false;
// getting names from the config file, if available
std::string eph_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename);
std::string utc_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_utc_model.xml", utc_default_xml_filename);
std::string iono_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_iono_xml", iono_default_xml_filename);
std::string ref_time_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_time_xml", ref_time_default_xml_filename);
std::string ref_location_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_location_xml", ref_location_default_xml_filename);
std::cout << "SUPL: Try read GPS ephemeris from XML file " << eph_xml_filename << std::endl;
if (supl_client_ephemeris_.load_ephemeris_xml(eph_xml_filename) == true)
{
@ -224,17 +229,152 @@ bool ControlThread::read_assistance_from_XML()
std::cout << "SUPL: Read XML Ephemeris for GPS SV " << gps_eph_iter->first << std::endl;
global_gps_ephemeris_queue.push(gps_eph_iter->second);
}
return false;
ret = true;
}
else
{
std::cout << "ERROR: SUPL client error reading XML" << std::endl;
std::cout << "Disabling SUPL assistance.." << std::endl;
return false;
ret = false;
}
// Only look for {utc, iono, ref time, ref location} if SUPL is enabled
bool enable_gps_supl_assistance = configuration_->property("GNSS-SDR.SUPL_gps_enabled", false);
if (enable_gps_supl_assistance == true)
{
// Try to read UTC model from XML
if (supl_client_acquisition_.load_utc_xml(utc_xml_filename) == true)
{
LOG(INFO) << "SUPL: Read XML UTC model";
global_gps_utc_model_queue.push(supl_client_acquisition_.gps_utc);
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: couldn't read UTC model XML";
//ret = false;
}
// Try to read Iono model from XML
if (supl_client_acquisition_.load_iono_xml(iono_xml_filename) == true)
{
LOG(INFO) << "SUPL: Read XML IONO model";
global_gps_iono_queue.push(supl_client_acquisition_.gps_iono);
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: couldn't read IONO model XML";
//ret = false;
}
// Try to read Ref Time from XML
if (supl_client_acquisition_.load_ref_time_xml(ref_time_xml_filename) == true)
{
LOG(INFO) << "SUPL: Read XML Ref Time";
global_gps_ref_time_queue.push(supl_client_acquisition_.gps_time);
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: couldn't read Ref Time XML";
//ret = false;
}
// Try to read Ref Location from XML
if (supl_client_acquisition_.load_ref_location_xml(ref_location_xml_filename) == true)
{
LOG(INFO) << "SUPL: Read XML Ref Location";
global_gps_ref_location_queue.push(supl_client_acquisition_.gps_ref_loc);
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: couldn't read Ref Location XML";
//ret = false;
}
}
return ret;
}
// Returns true if reading was successful
bool ControlThread::save_assistance_to_XML()
{
// return variable (true == succeeded)
bool ret = false;
// getting names from the config file, if available
std::string eph_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename);
std::string utc_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_utc_model.xml", utc_default_xml_filename);
std::string iono_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_iono_xml", iono_default_xml_filename);
std::string ref_time_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_time_xml", ref_time_default_xml_filename);
std::string ref_location_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_location_xml", ref_location_default_xml_filename);
std::cout << "SUPL: Try to save GPS ephemeris to XML file " << eph_xml_filename << std::endl;
std::map<int, Gps_Ephemeris> eph_copy = global_gps_ephemeris_map.get_map_copy();
if (supl_client_ephemeris_.save_ephemeris_map_xml(eph_xml_filename, eph_copy) == true)
{
std::cout << "SUPL: Successfully saved ephemeris XML file" << std::endl;
ret = true;
}
else
{
std::cout << "SUPL: Error while trying to save ephemeris XML file" << std::endl;
ret = false;
}
// Only try to save {utc, iono, ref time, ref location} if SUPL is enabled
bool enable_gps_supl_assistance = configuration_->property("GNSS-SDR.SUPL_gps_enabled", false);
if (enable_gps_supl_assistance == true)
{
// try to save utc model xml file
std::map<int, Gps_Utc_Model> utc_copy = global_gps_utc_model_map.get_map_copy();
if (supl_client_acquisition_.save_utc_map_xml(utc_xml_filename, utc_copy) == true)
{
LOG(INFO) << "SUPL: Successfully saved UTC Model XML file";
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: Error while trying to save utc XML file";
//ret = false;
}
// try to save iono model xml file
std::map<int, Gps_Iono> iono_copy = global_gps_iono_map.get_map_copy();
if (supl_client_acquisition_.save_iono_map_xml(iono_xml_filename, iono_copy) == true)
{
LOG(INFO) << "SUPL: Successfully saved IONO Model XML file";
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: Error while trying to save iono XML file";
//ret = false;
}
// try to save ref time xml file
std::map<int, Gps_Ref_Time> ref_time_copy = global_gps_ref_time_map.get_map_copy();
if (supl_client_acquisition_.save_ref_time_map_xml(ref_time_xml_filename, ref_time_copy) == true)
{
LOG(INFO) << "SUPL: Successfully saved Ref Time XML file";
//ret = true;
}
else
{
LOG(ERROR) << "SUPL: Error while trying to save ref time XML file";
//ref = false;
}
// try to save ref location xml file
std::map<int, Gps_Ref_Location> ref_location_copy = global_gps_ref_location_map.get_map_copy();
if (supl_client_acquisition_.save_ref_location_map_xml(ref_location_xml_filename, ref_location_copy) == true)
{
LOG(INFO) << "SUPL: Successfully saved Ref Location XML file";
//ref = true;
}
else
{
LOG(ERROR) << "SUPL: Error while trying to save ref location XML file";
//ret = false;
}
}
return ret;
}
void ControlThread::init()
{
@ -286,7 +426,7 @@ void ControlThread::init()
if (SUPL_read_gps_assistance_xml == true)
{
// read assistance from file
read_assistance_from_XML();
if (read_assistance_from_XML()) {}
}
else
{
@ -306,11 +446,15 @@ void ControlThread::init()
global_gps_ephemeris_queue.push(gps_eph_iter->second);
}
//Save ephemeris to XML file
std::string eph_xml_filename = "gps_ephemeris.xml";
if (supl_client_ephemeris_.save_ephemeris_xml(eph_xml_filename) == true)
std::string eph_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename);
if (supl_client_ephemeris_.save_ephemeris_map_xml(eph_xml_filename, supl_client_ephemeris_.gps_ephemeris_map) == true)
{
std::cout << "SUPL: XML Ephemeris file created" << std::endl;
}
else
{
std::cout << "SUPL: Failed to create XML Ephemeris file" << std::endl;
}
}
else
{
@ -391,8 +535,6 @@ void ControlThread::init()
}
void ControlThread::read_control_messages()
{
DLOG(INFO) << "Reading control messages from queue";
@ -430,7 +572,6 @@ void ControlThread::process_control_messages()
}
void ControlThread::apply_action(unsigned int what)
{
switch (what)
@ -447,9 +588,6 @@ void ControlThread::apply_action(unsigned int what)
}
void ControlThread::gps_acq_assist_data_collector()
{
// ############ 1.bis READ EPHEMERIS/UTC_MODE/IONO QUEUE ####################
@ -597,7 +735,6 @@ void ControlThread::gps_iono_data_collector()
}
void ControlThread::galileo_iono_data_collector()
{
Galileo_Iono galileo_iono;
@ -675,6 +812,7 @@ void ControlThread::gps_utc_model_data_collector()
}
}
void ControlThread::gps_ref_location_data_collector()
{
// ############ READ REF LOCATION ####################
@ -688,6 +826,7 @@ void ControlThread::gps_ref_location_data_collector()
}
}
void ControlThread::gps_ref_time_data_collector()
{
// ############ READ REF TIME ####################
@ -721,6 +860,7 @@ void ControlThread::gps_ref_time_data_collector()
}
}
void ControlThread::galileo_utc_model_data_collector()
{
Galileo_Utc_Model galileo_utc;
@ -765,132 +905,6 @@ void ControlThread::galileo_utc_model_data_collector()
}
void ControlThread::gps_ephemeris_data_write_to_XML()
{
//Save ephemeris to XML file
std::string eph_xml_filename = "gps_ephemeris_rx.xml";
std::map<int,Gps_Ephemeris> eph_copy;
eph_copy = global_gps_ephemeris_map.get_map_copy();
if (eph_copy.size() > 0)
{
try
{
std::ofstream ofs(eph_xml_filename.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", eph_copy);
ofs.close();
LOG(INFO) << "Saved Ephemeris data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
}
}
}
void ControlThread::gps_utc_model_data_write_to_XML()
{
//Save ephemeris to XML file
std::string xml_filename = "gps_utc_model_rx.xml";
std::map<int,Gps_Utc_Model> map_copy;
map_copy = global_gps_utc_model_map.get_map_copy();
if (map_copy.size() > 0)
{
try
{
std::ofstream ofs(xml_filename.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_utc_map", map_copy);
ofs.close();
LOG(INFO) << "Saved UTC Model data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
}
}
}
void ControlThread::gps_iono_data_write_to_XML()
{
//Save ephemeris to XML file
std::string xml_filename = "gps_iono_rx.xml";
std::map<int,Gps_Iono> map_copy;
map_copy = global_gps_iono_map.get_map_copy();
if (map_copy.size() > 0)
{
try
{
std::ofstream ofs(xml_filename.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_iono_map", map_copy);
ofs.close();
LOG(INFO) << "Saved IONO Model data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
}
}
}
void ControlThread::gps_ref_location_data_write_to_XML()
{
//Save reference location to XML file
std::string xml_filename = "gps_ref_location_rx.xml";
std::map<int,Gps_Ref_Location> map_copy;
map_copy = global_gps_ref_location_map.get_map_copy();
if (map_copy.size() > 0)
{
try
{
std::ofstream ofs(xml_filename.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ref_location_map", map_copy);
ofs.close();
LOG(INFO) << "Saved Ref Location data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
}
}
}
void ControlThread::gps_ref_time_data_write_to_XML()
{
//Save reference time to XML file
std::string xml_filename = "gps_ref_time_rx.xml";
std::map<int,Gps_Ref_Time> map_copy;
map_copy = global_gps_ref_time_map.get_map_copy();
if (map_copy.size() > 0)
{
try
{
std::ofstream ofs(xml_filename.c_str(), std::ofstream::trunc | std::ofstream::out);
boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ref_time_map", map_copy);
ofs.close();
LOG(INFO) << "Saved Ref Time data";
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
}
}
}
void ControlThread::keyboard_listener()
{
bool read_keys = true;
@ -910,4 +924,3 @@ void ControlThread::keyboard_listener()
}
}
}

37
src/core/receiver/control_thread.h
View File

@ -123,9 +123,12 @@ private:
void init();
// Read ephemeris assistance from a local XML file previously recorded
// Read {ephemeris, iono, utc, ref loc, ref time} assistance from a local XML file previously recorded
bool read_assistance_from_XML();
// Save {ephemeris, iono, utc, ref loc, ref time} assistance to a local XML file
bool save_assistance_to_XML();
void read_control_messages();
void process_control_messages();
@ -135,11 +138,6 @@ private:
*/
void gps_ephemeris_data_collector();
/*
* Writes the ephemeris map to a local XML file
*/
void gps_ephemeris_data_write_to_XML();
/*
* Blocking function that reads the UTC model queue and updates the shared map, accessible from the PVT block
*/
@ -155,31 +153,11 @@ private:
*/
void gps_ref_time_data_collector();
/*
* Write the latest GPS UTC model to XML file
*/
void gps_utc_model_data_write_to_XML();
/*
* \brief Write the latest ref location to XML file (AGPS)
*/
void gps_ref_location_data_write_to_XML();
/*
* \brief Write the latest ref time to XML file (AGPS)
*/
void gps_ref_time_data_write_to_XML();
/*
* Blocking function that reads the iono model queue and updates the shared map, accessible from the PVT block
*/
void gps_iono_data_collector();
/*
* Write the latest GPS IONO model to XML file
*/
void gps_iono_data_write_to_XML();
/*
* Blocking function that reads the GPS assistance queue
*/
@ -223,6 +201,13 @@ private:
boost::thread galileo_utc_model_data_collector_thread_;
boost::thread galileo_iono_data_collector_thread_;
void keyboard_listener();
// default filename for assistance data
const std::string eph_default_xml_filename = "./gps_ephemeris.xml";
const std::string utc_default_xml_filename = "./gps_utc_model.xml";
const std::string iono_default_xml_filename = "./gps_iono.xml";
const std::string ref_time_default_xml_filename = "./gps_ref_time.xml";
const std::string ref_location_default_xml_filename = "./gps_ref_location.xml";
};
#endif /*GNSS_SDR_CONTROL_THREAD_H_*/

4
src/utils/front-end-cal/front_end_cal.cc
View File

@ -158,8 +158,8 @@ int FrontEndCal::Get_SUPL_Assist()
global_gps_ephemeris_map.write(gps_eph_iter->second.i_satellite_PRN, gps_eph_iter->second);
}
//Save ephemeris to XML file
std::string eph_xml_filename = "gps_ephemeris.xml";
if (supl_client_ephemeris_.save_ephemeris_xml(eph_xml_filename) == true)
std::string eph_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename);
if (supl_client_ephemeris_.save_ephemeris_map_xml(eph_xml_filename, supl_client_ephemeris_.gps_ephemeris_map) == true)
{
LOG(INFO) << "SUPL: XML Ephemeris file created.";
}

2
src/utils/front-end-cal/front_end_cal.h
View File

@ -93,6 +93,8 @@ private:
*/
int Get_SUPL_Assist();
const std::string eph_default_xml_filename = "./gps_ephemeris.xml";
public:
/*!
* \brief Sets the configuration data required by get_ephemeris function