mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-04 01:03:04 +00:00
Code Issues Releases Wiki Activity

Cleaning the terminal output and dumping information to the log file.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@489 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez
2014-03-16 23:25:52 +00:00
parent 25ed311f22
commit 43e94fe681
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
View File

@@ -74,11 +74,11 @@ galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, boo
{ {
d_dump_file.exceptions (std::ifstream::failbit | std::ifstream::badbit ); d_dump_file.exceptions (std::ifstream::failbit | std::ifstream::badbit );
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
std::cout << "Observables dump enabled Log file: " << d_dump_filename.c_str() << std::endl; LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str();
} }
catch (std::ifstream::failure e) catch (std::ifstream::failure e)
{ {
std::cout << "Exception opening observables dump file " << e.what() << std::endl; LOG(WARNING) << "Exception opening observables dump file " << e.what();
} }
} }
} }
@@ -192,7 +192,7 @@ int galileo_e1_observables_cc::general_work (int noutput_items, gr_vector_int &n
} }
catch (const std::ifstream::failure& e) catch (const std::ifstream::failure& e)
{ {
std::cout << "Exception writing observables dump file " << e.what() << std::endl; LOG(WARNING) << "Exception writing observables dump file " << e.what();
} }
} }

6
src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
View File

@@ -72,11 +72,11 @@ gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, boost
{ {
d_dump_file.exceptions (std::ifstream::failbit | std::ifstream::badbit ); d_dump_file.exceptions (std::ifstream::failbit | std::ifstream::badbit );
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
std::cout << "Observables dump enabled Log file: " << d_dump_filename.c_str() << std::endl; LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str() << std::endl;
} }
catch (std::ifstream::failure e) catch (std::ifstream::failure e)
{ {
std::cout << "Exception opening observables dump file " << e.what() << std::endl; LOG(WARNING) << "Exception opening observables dump file " << e.what() << std::endl;
} }
} }
} }
@@ -188,7 +188,7 @@ int gps_l1_ca_observables_cc::general_work (int noutput_items, gr_vector_int &ni
} }
catch (const std::ifstream::failure& e) catch (const std::ifstream::failure& e)
{ {
std::cout << "Exception writing observables dump file " << e.what() << std::endl; LOG(WARNING) << "Exception writing observables dump file " << e.what() << std::endl;
} }
} }

5
src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
View File

@@ -249,9 +249,10 @@ void GpsL1CaSubframeFsm::gps_subframe_to_nav_msg()
int subframe_ID; int subframe_ID;
// NEW GPS SUBFRAME HAS ARRIVED! // NEW GPS SUBFRAME HAS ARRIVED!
subframe_ID = d_nav.subframe_decoder(this->d_subframe); //decode the subframe subframe_ID = d_nav.subframe_decoder(this->d_subframe); //decode the subframe
std::cout << "NAVIGATION FSM: received subframe " std::cout << "NAV Message: received subframe "
<< subframe_ID << " for satellite " << subframe_ID << " from satellite "
<< Gnss_Satellite(std::string("GPS"), i_satellite_PRN) << std::endl; << Gnss_Satellite(std::string("GPS"), i_satellite_PRN) << std::endl;
d_nav.i_satellite_PRN = i_satellite_PRN; d_nav.i_satellite_PRN = i_satellite_PRN;
d_nav.i_channel_ID = i_channel_ID; d_nav.i_channel_ID = i_channel_ID;
d_nav.d_subframe_timestamp_ms = this->d_preamble_time_ms; d_nav.d_subframe_timestamp_ms = this->d_preamble_time_ms;

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

@@ -461,7 +461,7 @@ void ControlThread::gps_acq_assist_data_collector()
else else
{ {
// insert new acq record // insert new acq record
std::cout << "New acq assist record inserted" << std::endl; LOG(INFO) << "New acq assist record inserted";
global_gps_acq_assist_map.write(gps_acq.i_satellite_PRN, gps_acq); global_gps_acq_assist_map.write(gps_acq.i_satellite_PRN, gps_acq);
} }
} }
@@ -495,21 +495,21 @@ void ControlThread::gps_ephemeris_data_collector()
{ {
if (gps_eph.d_Toe > gps_eph_old.d_Toe) if (gps_eph.d_Toe > gps_eph_old.d_Toe)
{ {
std::cout << "Ephemeris record updated (Toe=" << gps_eph.d_Toe << std::endl; LOG(INFO) << "Ephemeris record updated (Toe=" << gps_eph.d_Toe;
global_gps_ephemeris_map.write(gps_eph.i_satellite_PRN, gps_eph); global_gps_ephemeris_map.write(gps_eph.i_satellite_PRN, gps_eph);
} }
else else
{ {
std::cout << "Not updating the existing ephemeris" << std::endl; LOG(INFO) << "Not updating the existing ephemeris";
} }
} }
} }
else else
{ {
// insert new ephemeris record // insert new ephemeris record
std::cout << "New Ephemeris record inserted with Toe=" LOG(INFO) << "New Ephemeris record inserted with Toe="
<< gps_eph.d_Toe<<" and GPS Week=" << gps_eph.d_Toe<<" and GPS Week="
<< gps_eph.i_GPS_week << std::endl; << gps_eph.i_GPS_week;
global_gps_ephemeris_map.write(gps_eph.i_satellite_PRN, gps_eph); global_gps_ephemeris_map.write(gps_eph.i_satellite_PRN, gps_eph);
} }
} }
@@ -535,32 +535,32 @@ void ControlThread::galileo_ephemeris_data_collector()
// Check the EPHEMERIS timestamp. If it is newer, then update the ephemeris // Check the EPHEMERIS timestamp. If it is newer, then update the ephemeris
if (galileo_eph.WN_5 > galileo_eph_old.WN_5) //further check because it is not clear when IOD is reset if (galileo_eph.WN_5 > galileo_eph_old.WN_5) //further check because it is not clear when IOD is reset
{ {
std::cout << "Galileo Ephemeris record in global map updated -- GALILEO Week Number =" LOG(INFO) << "Galileo Ephemeris record in global map updated -- GALILEO Week Number ="
<< galileo_eph.WN_5 << std::endl; << galileo_eph.WN_5;
global_galileo_ephemeris_map.write(galileo_eph.SV_ID_PRN_4,galileo_eph); global_galileo_ephemeris_map.write(galileo_eph.SV_ID_PRN_4,galileo_eph);
} }
else else
{ {
if (galileo_eph.IOD_ephemeris > galileo_eph_old.IOD_ephemeris) if (galileo_eph.IOD_ephemeris > galileo_eph_old.IOD_ephemeris)
{ {
std::cout << "Galileo Ephemeris record updated in global map-- IOD_ephemeris =" LOG(INFO) << "Galileo Ephemeris record updated in global map-- IOD_ephemeris ="
<< galileo_eph.IOD_ephemeris << std::endl; << galileo_eph.IOD_ephemeris << std::endl;
global_galileo_ephemeris_map.write(galileo_eph.SV_ID_PRN_4, galileo_eph); global_galileo_ephemeris_map.write(galileo_eph.SV_ID_PRN_4, galileo_eph);
std::cout << "IOD_ephemeris OLD: " << galileo_eph_old.IOD_ephemeris << std::endl; LOG(INFO) << "IOD_ephemeris OLD: " << galileo_eph_old.IOD_ephemeris;
std::cout << "satellite: " << galileo_eph.SV_ID_PRN_4 << std::endl; LOG(INFO) << "satellite: " << galileo_eph.SV_ID_PRN_4;
} }
else else
{ {
std::cout << "Not updating the existing Galileo ephemeris, IOD is not changing" << std::endl; LOG(INFO) << "Not updating the existing Galileo ephemeris, IOD is not changing";
} }
} }
} }
else else
{ {
// insert new ephemeris record // insert new ephemeris record
std::cout << "Galileo New Ephemeris record inserted in global map with TOW =" << galileo_eph.TOW_5 LOG(INFO) << "Galileo New Ephemeris record inserted in global map with TOW =" << galileo_eph.TOW_5
<< ", GALILEO Week Number =" << galileo_eph.WN_5 << ", GALILEO Week Number =" << galileo_eph.WN_5
<< " and Ephemeris IOD = " << galileo_eph.IOD_ephemeris << std::endl; << " and Ephemeris IOD = " << galileo_eph.IOD_ephemeris;
global_galileo_ephemeris_map.write(galileo_eph.SV_ID_PRN_4, galileo_eph); global_galileo_ephemeris_map.write(galileo_eph.SV_ID_PRN_4, galileo_eph);
} }
} }
@@ -577,7 +577,7 @@ void ControlThread::gps_iono_data_collector()
{ {
global_gps_iono_queue.wait_and_pop(gps_iono); global_gps_iono_queue.wait_and_pop(gps_iono);
std::cout << "New IONO record has arrived " << std::endl; LOG(INFO) << "New IONO record has arrived ";
// insert new ephemeris record to the global ephemeris map // insert new ephemeris record to the global ephemeris map
if (global_gps_iono_map.read(0, gps_iono_old)) if (global_gps_iono_map.read(0, gps_iono_old))
{ {
@@ -603,7 +603,7 @@ void ControlThread::galileo_iono_data_collector()
global_galileo_iono_queue.wait_and_pop(galileo_iono); global_galileo_iono_queue.wait_and_pop(galileo_iono);
// DEBUG MESSAGE // DEBUG MESSAGE
std::cout << "Iono record has arrived" << std::endl; LOG(INFO) << "Iono record has arrived";
// insert new Iono record to the global Iono map // insert new Iono record to the global Iono map
if (global_galileo_iono_map.read(0, galileo_iono_old)) if (global_galileo_iono_map.read(0, galileo_iono_old))
@@ -611,27 +611,27 @@ void ControlThread::galileo_iono_data_collector()
// Check the Iono timestamp from UTC page (page 6). If it is newer, then update the Iono parameters // Check the Iono timestamp from UTC page (page 6). If it is newer, then update the Iono parameters
if (galileo_iono.WN_5 > galileo_iono_old.WN_5) if (galileo_iono.WN_5 > galileo_iono_old.WN_5)
{ {
std::cout << "IONO record updated in global map--new GALILEO UTC-IONO Week Number" << std::endl; LOG(INFO) << "IONO record updated in global map--new GALILEO UTC-IONO Week Number";
global_galileo_iono_map.write(0, galileo_iono); global_galileo_iono_map.write(0, galileo_iono);
} }
else else
{ {
if (galileo_iono.TOW_5 > galileo_iono_old.TOW_5) if (galileo_iono.TOW_5 > galileo_iono_old.TOW_5)
{ {
std::cout << "IONO record updated in global map--new GALILEO UTC-IONO time of Week" << std::endl; LOG(INFO) << "IONO record updated in global map--new GALILEO UTC-IONO time of Week";
global_galileo_iono_map.write(0, galileo_iono); global_galileo_iono_map.write(0, galileo_iono);
//std::cout << "GALILEO IONO time of Week old: " << galileo_iono_old.t0t_6<<std::endl; //std::cout << "GALILEO IONO time of Week old: " << galileo_iono_old.t0t_6<<std::endl;
} }
else else
{ {
std::cout << "Not updating the existing Iono parameters in global map, Iono timestamp is not changing" << std::endl; LOG(INFO) << "Not updating the existing Iono parameters in global map, Iono timestamp is not changing";
} }
} }
} }
else else
{ {
// insert new ephemeris record // insert new ephemeris record
std::cout << "New IONO record inserted in global map" << std::endl; LOG(INFO) << "New IONO record inserted in global map";
global_galileo_iono_map.write(0, galileo_iono); global_galileo_iono_map.write(0, galileo_iono);
} }
} }
@@ -646,7 +646,7 @@ void ControlThread::gps_utc_model_data_collector()
while(stop_ == false) while(stop_ == false)
{ {
global_gps_utc_model_queue.wait_and_pop(gps_utc); global_gps_utc_model_queue.wait_and_pop(gps_utc);
std::cout << "New UTC MODEL record has arrived with A0=" << gps_utc.d_A0 << std::endl; LOG(INFO) << "New UTC MODEL record has arrived with A0=" << gps_utc.d_A0;
// insert new ephemeris record to the global ephemeris map // insert new ephemeris record to the global ephemeris map
if (global_gps_utc_model_map.read(0, gps_utc_old)) if (global_gps_utc_model_map.read(0, gps_utc_old))
{ {
@@ -672,7 +672,7 @@ void ControlThread::galileo_utc_model_data_collector()
global_galileo_utc_model_queue.wait_and_pop(galileo_utc); global_galileo_utc_model_queue.wait_and_pop(galileo_utc);
// DEBUG MESSAGE // DEBUG MESSAGE
std::cout << "UTC record has arrived" << std::endl; LOG(INFO) << "UTC record has arrived" << std::endl;
// insert new UTC record to the global UTC map // insert new UTC record to the global UTC map
if (global_galileo_utc_model_map.read(0, galileo_utc_old)) if (global_galileo_utc_model_map.read(0, galileo_utc_old))
@@ -693,14 +693,14 @@ void ControlThread::galileo_utc_model_data_collector()
} }
else else
{ {
std::cout << "Not updating the existing UTC in global map, timestamp is not changing" << std::endl; LOG(INFO) << "Not updating the existing UTC in global map, timestamp is not changing" << std::endl;
} }
} }
} }
else else
{ {
// insert new ephemeris record // insert new ephemeris record
std::cout << "New UTC record inserted in global map" << std::endl; LOG(INFO) << "New UTC record inserted in global map" << std::endl;
global_galileo_utc_model_map.write(0, galileo_utc); global_galileo_utc_model_map.write(0, galileo_utc);
} }
} }
@@ -723,7 +723,7 @@ void ControlThread::gps_ephemeris_data_write_to_XML()
boost::archive::xml_oarchive xml(ofs); boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", eph_copy); xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", eph_copy);
ofs.close(); ofs.close();
std::cout << "Saved Ephemeris data" << std::endl; LOG(INFO) << "Saved Ephemeris data";
} }
catch (std::exception& e) catch (std::exception& e)
{ {
@@ -749,7 +749,7 @@ void ControlThread::gps_utc_model_data_write_to_XML()
boost::archive::xml_oarchive xml(ofs); boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_utc_map", map_copy); xml << boost::serialization::make_nvp("GNSS-SDR_utc_map", map_copy);
ofs.close(); ofs.close();
std::cout << "Saved UTC Model data" << std::endl; LOG(INFO) << "Saved UTC Model data";
} }
catch (std::exception& e) catch (std::exception& e)
{ {
@@ -777,7 +777,7 @@ void ControlThread::gps_iono_data_write_to_XML()
boost::archive::xml_oarchive xml(ofs); boost::archive::xml_oarchive xml(ofs);
xml << boost::serialization::make_nvp("GNSS-SDR_iono_map", map_copy); xml << boost::serialization::make_nvp("GNSS-SDR_iono_map", map_copy);
ofs.close(); ofs.close();
std::cout << "Saved IONO Model data" << std::endl; LOG(INFO) << "Saved IONO Model data";
} }
catch (std::exception& e) catch (std::exception& e)
{ {