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

Fix indentation

Browse Source
This commit is contained in:
Carles Fernandez 2017-05-14 19:59:55 +02:00
parent 5aec42ddef
commit f3a41d4569
1 changed files with 897 additions and 897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
View File

@ -100,7 +100,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
// update/insert new ephemeris record to the global ephemeris map // update/insert new ephemeris record to the global ephemeris map
d_ls_pvt->gps_ephemeris_map[gps_eph->i_satellite_PRN] = *gps_eph; d_ls_pvt->gps_ephemeris_map[gps_eph->i_satellite_PRN] = *gps_eph;
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Iono>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Iono>) )
{ {
// ### GPS IONO ### // ### GPS IONO ###
std::shared_ptr<Gps_Iono> gps_iono; std::shared_ptr<Gps_Iono> gps_iono;
@ -108,7 +108,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
d_ls_pvt->gps_iono = *gps_iono; d_ls_pvt->gps_iono = *gps_iono;
DLOG(INFO) << "New IONO record has arrived "; DLOG(INFO) << "New IONO record has arrived ";
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Utc_Model>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Utc_Model>) )
{ {
// ### GPS UTC MODEL ### // ### GPS UTC MODEL ###
std::shared_ptr<Gps_Utc_Model> gps_utc_model; std::shared_ptr<Gps_Utc_Model> gps_utc_model;
@ -116,7 +116,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
d_ls_pvt->gps_utc_model = *gps_utc_model; d_ls_pvt->gps_utc_model = *gps_utc_model;
DLOG(INFO) << "New UTC record has arrived "; DLOG(INFO) << "New UTC record has arrived ";
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Ephemeris>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Ephemeris>) )
{ {
// ### GPS CNAV message ### // ### GPS CNAV message ###
std::shared_ptr<Gps_CNAV_Ephemeris> gps_cnav_ephemeris; std::shared_ptr<Gps_CNAV_Ephemeris> gps_cnav_ephemeris;
@ -125,7 +125,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
d_ls_pvt->gps_cnav_ephemeris_map[gps_cnav_ephemeris->i_satellite_PRN] = *gps_cnav_ephemeris; d_ls_pvt->gps_cnav_ephemeris_map[gps_cnav_ephemeris->i_satellite_PRN] = *gps_cnav_ephemeris;
LOG(INFO) << "New GPS CNAV ephemeris record has arrived "; LOG(INFO) << "New GPS CNAV ephemeris record has arrived ";
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Iono>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Iono>) )
{ {
// ### GPS CNAV IONO ### // ### GPS CNAV IONO ###
std::shared_ptr<Gps_CNAV_Iono> gps_cnav_iono; std::shared_ptr<Gps_CNAV_Iono> gps_cnav_iono;
@ -133,7 +133,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
d_ls_pvt->gps_cnav_iono = *gps_cnav_iono; d_ls_pvt->gps_cnav_iono = *gps_cnav_iono;
DLOG(INFO) << "New CNAV IONO record has arrived "; DLOG(INFO) << "New CNAV IONO record has arrived ";
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Utc_Model>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Utc_Model>) )
{ {
// ### GPS CNAV UTC MODEL ### // ### GPS CNAV UTC MODEL ###
std::shared_ptr<Gps_CNAV_Utc_Model> gps_cnav_utc_model; std::shared_ptr<Gps_CNAV_Utc_Model> gps_cnav_utc_model;
@ -143,7 +143,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
} }
//**************** Galileo telemetry ******************** //**************** Galileo telemetry ********************
else if ( pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Ephemeris>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Ephemeris>) )
{ {
// ### Galileo EPHEMERIS ### // ### Galileo EPHEMERIS ###
std::shared_ptr<Galileo_Ephemeris> galileo_eph; std::shared_ptr<Galileo_Ephemeris> galileo_eph;
@ -155,7 +155,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
// update/insert new ephemeris record to the global ephemeris map // update/insert new ephemeris record to the global ephemeris map
d_ls_pvt->galileo_ephemeris_map[galileo_eph->i_satellite_PRN] = *galileo_eph; d_ls_pvt->galileo_ephemeris_map[galileo_eph->i_satellite_PRN] = *galileo_eph;
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Iono>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Iono>) )
{ {
// ### Galileo IONO ### // ### Galileo IONO ###
std::shared_ptr<Galileo_Iono> galileo_iono; std::shared_ptr<Galileo_Iono> galileo_iono;
@ -163,7 +163,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
d_ls_pvt->galileo_iono = *galileo_iono; d_ls_pvt->galileo_iono = *galileo_iono;
DLOG(INFO) << "New IONO record has arrived "; DLOG(INFO) << "New IONO record has arrived ";
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Utc_Model>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Utc_Model>) )
{ {
// ### Galileo UTC MODEL ### // ### Galileo UTC MODEL ###
std::shared_ptr<Galileo_Utc_Model> galileo_utc_model; std::shared_ptr<Galileo_Utc_Model> galileo_utc_model;
@ -171,7 +171,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
d_ls_pvt->galileo_utc_model = *galileo_utc_model; d_ls_pvt->galileo_utc_model = *galileo_utc_model;
DLOG(INFO) << "New UTC record has arrived "; DLOG(INFO) << "New UTC record has arrived ";
} }
else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac>) ) else if(pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac>) )
{ {
// ### Galileo Almanac ### // ### Galileo Almanac ###
std::shared_ptr<Galileo_Almanac> galileo_almanac; std::shared_ptr<Galileo_Almanac> galileo_almanac;
@ -181,7 +181,6 @@ void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
DLOG(INFO) << "New Galileo Almanac has arrived "; DLOG(INFO) << "New Galileo Almanac has arrived ";
} }
else else
{ {
LOG(WARNING) << "msg_handler_telemetry unknown object type!"; LOG(WARNING) << "msg_handler_telemetry unknown object type!";
@ -205,8 +204,10 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, bool dump, std::string dump
int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port,
std::string nmea_dump_filename, std::string nmea_dump_devname, int rinex_version, std::string nmea_dump_filename, std::string nmea_dump_devname, int rinex_version,
bool flag_rtcm_server, bool flag_rtcm_tty_port, unsigned short rtcm_tcp_port, bool flag_rtcm_server, bool flag_rtcm_tty_port, unsigned short rtcm_tcp_port,
unsigned short rtcm_station_id, std::map<int,int> rtcm_msg_rate_ms, std::string rtcm_dump_devname, const unsigned int type_of_receiver, rtk_t & rtk) : unsigned short rtcm_station_id, std::map<int,int> rtcm_msg_rate_ms, std::string
gr::sync_block("rtklib_pvt_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), rtcm_dump_devname, const unsigned int type_of_receiver, rtk_t & rtk) :
gr::sync_block("rtklib_pvt_cc",
gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
gr::io_signature::make(0, 0, 0)) gr::io_signature::make(0, 0, 0))
{ {
d_output_rate_ms = output_rate_ms; d_output_rate_ms = output_rate_ms;
@ -489,7 +490,6 @@ int rtklib_pvt_cc::work (int noutput_items, gr_vector_const_void_star &input_ite
} }
} }
// ############ 2 COMPUTE THE PVT ################################ // ############ 2 COMPUTE THE PVT ################################
if (gnss_observables_map.size() > 0) if (gnss_observables_map.size() > 0)
{ {
@ -1129,11 +1129,11 @@ int rtklib_pvt_cc::work (int noutput_items, gr_vector_const_void_star &input_ite
if( (d_ls_pvt->b_valid_position == true) && (flag_display_pvt == true) ) if( (d_ls_pvt->b_valid_position == true) && (flag_display_pvt == true) )
{ {
std::cout << "Position at " << boost::posix_time::to_simple_string(d_ls_pvt->d_position_UTC_time) std::cout << "Position at " << boost::posix_time::to_simple_string(d_ls_pvt->d_position_UTC_time)
<< " UTC using "<< d_ls_pvt->d_valid_observations<<" observations is Lat = " << d_ls_pvt->d_latitude_d << " [deg], Long = " << d_ls_pvt->d_longitude_d << " UTC using " << d_ls_pvt->d_valid_observations << " observations is Lat = " << d_ls_pvt->d_latitude_d << " [deg], Long = " << d_ls_pvt->d_longitude_d
<< " [deg], Height= " << d_ls_pvt->d_height_m << " [m]" << std::endl; << " [deg], Height= " << d_ls_pvt->d_height_m << " [m]" << std::endl;
LOG(INFO) << "Position at " << boost::posix_time::to_simple_string(d_ls_pvt->d_position_UTC_time) LOG(INFO) << "Position at " << boost::posix_time::to_simple_string(d_ls_pvt->d_position_UTC_time)
<< " UTC using "<< d_ls_pvt->d_valid_observations<<" observations is Lat = " << d_ls_pvt->d_latitude_d << " [deg], Long = " << d_ls_pvt->d_longitude_d << " UTC using "<< d_ls_pvt->d_valid_observations << " observations is Lat = " << d_ls_pvt->d_latitude_d << " [deg], Long = " << d_ls_pvt->d_longitude_d
<< " [deg], Height= " << d_ls_pvt->d_height_m << " [m]"; << " [deg], Height= " << d_ls_pvt->d_height_m << " [m]";
/* std::cout << "Dilution of Precision at " << boost::posix_time::to_simple_string(d_ls_pvt->d_position_UTC_time) /* std::cout << "Dilution of Precision at " << boost::posix_time::to_simple_string(d_ls_pvt->d_position_UTC_time)