mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-08-06 22:04:07 +00:00
Code Issues Releases Wiki Activity

Removed some debug messages from release compilation to debug compilation (Using DLOG() instead of LOG_AT_LEVEL() ) to speed up a bit the release execution.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@194 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Javier Arribas 2012-04-11 18:44:56 +00:00
parent 9d34147e0f
commit 1c0fed749d
5 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc
View File

@ -259,7 +259,7 @@ bool gps_l1_ca_ls_pvt::get_PVT(std::map<int,Gnss_Synchro> gnss_pseudoranges_map,
satpos(0,i) = d_ephemeris[i].d_satpos_X; satpos(0,i) = d_ephemeris[i].d_satpos_X;
satpos(1,i) = d_ephemeris[i].d_satpos_Y; satpos(1,i) = d_ephemeris[i].d_satpos_Y;
satpos(2,i) = d_ephemeris[i].d_satpos_Z; satpos(2,i) = d_ephemeris[i].d_satpos_Z;
LOG_AT_LEVEL(INFO) << "ECEF satellite SV ID=" << d_ephemeris[i].i_satellite_PRN <<" X=" << d_ephemeris[i].d_satpos_X DLOG(INFO) << "ECEF satellite SV ID=" << d_ephemeris[i].i_satellite_PRN <<" X=" << d_ephemeris[i].d_satpos_X
<< " [m] Y=" << d_ephemeris[i].d_satpos_Y << " [m] Z=" << d_ephemeris[i].d_satpos_Z << " [m]" << std::endl; << " [m] Y=" << d_ephemeris[i].d_satpos_Y << " [m] Z=" << d_ephemeris[i].d_satpos_Z << " [m]" << std::endl;
obs(i) = gnss_pseudoranges_iter->second.Pseudorange_m + d_ephemeris[i].d_satClkCorr*GPS_C_m_s; obs(i) = gnss_pseudoranges_iter->second.Pseudorange_m + d_ephemeris[i].d_satClkCorr*GPS_C_m_s;
valid_obs++; valid_obs++;
@ -278,12 +278,12 @@ bool gps_l1_ca_ls_pvt::get_PVT(std::map<int,Gnss_Synchro> gnss_pseudoranges_map,
obs(i) = 1; // to avoid algorithm problems (divide by zero) obs(i) = 1; // to avoid algorithm problems (divide by zero)
} }
} }
LOG_AT_LEVEL(INFO) <<"PVT: valid observations="<<valid_obs<<std::endl; DLOG(INFO) <<"PVT: valid observations="<<valid_obs<<std::endl;
if (valid_obs>=4) if (valid_obs>=4)
{ {
arma::vec mypos; arma::vec mypos;
mypos=leastSquarePos(satpos,obs,W); mypos=leastSquarePos(satpos,obs,W);
LOG_AT_LEVEL(INFO) << "Position at TOW="<< GPS_current_time << " in ECEF (X,Y,Z) = " << mypos << std::endl; DLOG(INFO) << "Position at TOW="<< GPS_current_time << " in ECEF (X,Y,Z) = " << mypos << std::endl;
cart2geo(mypos(0), mypos(1), mypos(2), 4); cart2geo(mypos(0), mypos(1), mypos(2), 4);
// Compute UTC time and print PVT solution // Compute UTC time and print PVT solution
@ -292,7 +292,7 @@ bool gps_l1_ca_ls_pvt::get_PVT(std::map<int,Gnss_Synchro> gnss_pseudoranges_map,
d_position_UTC_time = p_time; d_position_UTC_time = p_time;
GPS_current_time=GPS_corrected_time; GPS_current_time=GPS_corrected_time;
LOG_AT_LEVEL(INFO) << "Position at " << boost::posix_time::to_simple_string(p_time) DLOG(INFO)<< "Position at " << boost::posix_time::to_simple_string(p_time)
<< " is Lat = " << d_latitude_d << " [deg], Long = " << d_longitude_d << " is Lat = " << d_latitude_d << " [deg], Long = " << d_longitude_d
<< " [deg], Height= " << d_height_m << " [m]" << std::endl; << " [deg], Height= " << d_height_m << " [m]" << std::endl;

6
src/algorithms/channel/adapters/channel.cc
View File

@ -240,19 +240,19 @@ void Channel::process_channel_messages()
{ {
case 0: case 0:
LOG_AT_LEVEL(INFO) << "Stop channel " << channel_; DLOG(INFO) << "Stop channel " << channel_;
break; break;
case 1: case 1:
LOG_AT_LEVEL(INFO) << "Channel " << channel_ DLOG(INFO) << "Channel " << channel_
<< " ACQ SUCCESS satellite " << gnss_synchro_.System << " " << gnss_synchro_.PRN; << " ACQ SUCCESS satellite " << gnss_synchro_.System << " " << gnss_synchro_.PRN;
channel_fsm_.Event_gps_valid_acquisition(); channel_fsm_.Event_gps_valid_acquisition();
break; break;
case 2: case 2:
LOG_AT_LEVEL(INFO) << "Channel " << channel_ DLOG(INFO) << "Channel " << channel_
<< " ACQ FAILED satellite " << gnss_synchro_.System << " "<< gnss_synchro_.PRN; << " ACQ FAILED satellite " << gnss_synchro_.System << " "<< gnss_synchro_.PRN;
if (repeat_ == true) if (repeat_ == true)
{ {

24
src/algorithms/signal_source/adapters/uhd_signal_source.cc
View File

@ -109,6 +109,10 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
std::cout << boost::format("Actual RX Freq: %f [Hz]...") % (uhd_source_->get_center_freq()) << std::endl << std::endl; std::cout << boost::format("Actual RX Freq: %f [Hz]...") % (uhd_source_->get_center_freq()) << std::endl << std::endl;
DLOG(INFO) << boost::format("Actual RX Freq: %f [Hz]...") % (uhd_source_->get_center_freq()) << std::endl << std::endl; DLOG(INFO) << boost::format("Actual RX Freq: %f [Hz]...") % (uhd_source_->get_center_freq()) << std::endl << std::endl;
// TODO: Asign the remanent IF from the PLL tune error
std::cout << boost::format("PLL Frequency tune error %f [Hz]...") % (uhd_source_->get_center_freq()-freq_) << std::endl;
DLOG(INFO) << boost::format("PLL Frequency tune error %f [Hz]...") % (uhd_source_->get_center_freq()-freq_) << std::endl;
// 4. set rx gain // 4. set rx gain
uhd_source_->set_gain(gain_); uhd_source_->set_gain(gain_);
std::cout << boost::format("Actual RX Gain: %f dB...") % uhd_source_->get_gain() << std::endl << std::endl; std::cout << boost::format("Actual RX Gain: %f dB...") % uhd_source_->get_gain() << std::endl << std::endl;
@ -126,15 +130,21 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
//LO lock status //LO lock status
//Check Ref and LO Lock detect //Check Ref and LO Lock detect
//std::vector<std::string> sensor_names; std::vector<std::string> sensor_names;
//sensor_names = uhd_source_->get_rx_sensor_names(0); sensor_names = uhd_source_->get_sensor_names(0);
//if (std::find(sensor_names.begin(), sensor_names.end(), "lo_locked") != sensor_names.end()) { if (std::find(sensor_names.begin(), sensor_names.end(), "lo_locked") != sensor_names.end()) {
// uhd::sensor_value_t lo_locked = uhd_source_->get_rx_sensor("lo_locked",0); uhd::sensor_value_t lo_locked = uhd_source_->get_sensor("lo_locked",0);
// std::cout << boost::format("Checking RX: %s ...") % lo_locked.to_pp_string() << std::endl; std::cout << boost::format("Check for front-end %s ...") % lo_locked.to_pp_string() << " is ";
if (lo_locked.to_bool()==true)
{
std::cout<<"Locked"<<std::endl;
}else{
std::cout<<"UNLOCKED!!!!"<<std::endl;
}
//UHD_ASSERT_THROW(lo_locked.to_bool()); //UHD_ASSERT_THROW(lo_locked.to_bool());
//} }
uhd_source_->set_subdev_spec(subdevice_); uhd_source_->set_subdev_spec(subdevice_,0);
} }
else else
{ {

6
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
View File

@ -345,16 +345,16 @@ int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_i
void gps_l1_ca_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite) void gps_l1_ca_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite)
{ {
d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
LOG_AT_LEVEL(INFO) << "Setting decoder Finite State Machine to satellite " << d_satellite; DLOG(INFO) << "Setting decoder Finite State Machine to satellite " << d_satellite;
d_GPS_FSM.i_satellite_PRN = d_satellite.get_PRN(); d_GPS_FSM.i_satellite_PRN = d_satellite.get_PRN();
LOG_AT_LEVEL(INFO) << "Navigation Satellite set to " << d_satellite; DLOG(INFO) << "Navigation Satellite set to " << d_satellite;
} }
void gps_l1_ca_telemetry_decoder_cc::set_channel(int channel) void gps_l1_ca_telemetry_decoder_cc::set_channel(int channel)
{ {
d_channel = channel; d_channel = channel;
d_GPS_FSM.i_channel_ID = channel; d_GPS_FSM.i_channel_ID = channel;
LOG_AT_LEVEL(INFO) << "Navigation channel set to " << channel; DLOG(INFO) << "Navigation channel set to " << channel;
// ############# ENABLE DATA FILE LOG ################# // ############# ENABLE DATA FILE LOG #################
if (d_dump == true) if (d_dump == true)
{ {

6
src/core/receiver/gnss_flowgraph.cc
View File

@ -288,7 +288,7 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what) {
switch (what) { switch (what) {
case 0: case 0:
LOG_AT_LEVEL(INFO) << "Channel " << who << " ACQ FAILED satellite " DLOG(INFO) << "Channel " << who << " ACQ FAILED satellite "
<< channel(who)->get_signal().get_satellite(); << channel(who)->get_signal().get_satellite();
available_GNSS_signals_.push_back(channel(who)->get_signal()); available_GNSS_signals_.push_back(channel(who)->get_signal());
channel(who)->set_signal(available_GNSS_signals_.front()); channel(who)->set_signal(available_GNSS_signals_.front());
@ -299,7 +299,7 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what) {
case 1: case 1:
LOG_AT_LEVEL(INFO) << "Channel " << who << " ACQ SUCCESS satellite " DLOG(INFO) << "Channel " << who << " ACQ SUCCESS satellite "
<< channel(who)->get_signal().get_satellite(); << channel(who)->get_signal().get_satellite();
channels_state_[who] = 2; channels_state_[who] = 2;
@ -323,7 +323,7 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what) {
case 2: case 2:
LOG_AT_LEVEL(INFO) << "Channel " << who << " TRK FAILED satellite " DLOG(INFO) << "Channel " << who << " TRK FAILED satellite "
<< channel(who)->get_signal().get_satellite(); << channel(who)->get_signal().get_satellite();
if (acq_channels_count_ < max_acq_channels_) { if (acq_channels_count_ < max_acq_channels_) {