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

code cleaning

Browse Source
This commit is contained in:
Carles Fernandez 2016-05-04 19:15:18 +02:00
parent 586edddbcf
commit 0ea36db356
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,8 @@ void ControlThread::assist_GNSS()
if (SUPL_read_gps_assistance_xml == true)
{
// read assistance from file
if (read_assistance_from_XML()) {
if (read_assistance_from_XML())
{
std::cout << "GPS assistance data loaded from local XML file." << std::endl;
}
}
@ -301,7 +302,7 @@ void ControlThread::assist_GNSS()
// Request ephemeris from SUPL server
int error;
supl_client_ephemeris_.request = 1;
std::cout << "SUPL: Try to read GPS ephemeris from SUPL server.." << std::endl;
std::cout << "SUPL: Try to read GPS ephemeris from SUPL server..." << std::endl;
error = supl_client_ephemeris_.get_assistance(supl_mcc, supl_mns, supl_lac, supl_ci);
if (error == 0)
{
@ -332,7 +333,7 @@ void ControlThread::assist_GNSS()
std::cout << "Trying to read ephemeris from XML file" << std::endl;
if (read_assistance_from_XML() == false)
{
std::cout << "ERROR: Could not read Ephemeris file: Disabling SUPL assistance.." << std::endl;
std::cout << "ERROR: Could not read Ephemeris file: Disabling SUPL assistance." << std::endl;
}
}
@ -368,12 +369,12 @@ void ControlThread::assist_GNSS()
{
std::cout << "ERROR: SUPL client for Almanac returned " << error << std::endl;
std::cout << "Please check internet connection and SUPL server configuration" << error << std::endl;
std::cout << "Disabling SUPL assistance.." << std::endl;
std::cout << "Disabling SUPL assistance." << std::endl;
}
// Request acquisition assistance
supl_client_acquisition_.request = 2;
std::cout << "SUPL: Try read Acquisition assistance from SUPL server.." << std::endl;
std::cout << "SUPL: Try read Acquisition assistance from SUPL server..." << std::endl;
error = supl_client_acquisition_.get_assistance(supl_mcc, supl_mns, supl_lac, supl_ci);
if (error == 0)
{
@ -407,6 +408,8 @@ void ControlThread::assist_GNSS()
}
}
}
void ControlThread::init()
{
// Instantiates a control queue, a GNSS flowgraph, and a control message factory
@ -416,7 +419,6 @@ void ControlThread::init()
stop_ = false;
processed_control_messages_ = 0;
applied_actions_ = 0;
}
@ -494,7 +496,6 @@ void ControlThread::gps_acq_assist_data_collector()
{
std::cout << "Acquisition assistance record updated" << std::endl;
global_gps_acq_assist_map.write(gps_acq.i_satellite_PRN, gps_acq);
}
else
{