mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-20 00:34:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2018-05-27 23:01:33 +02:00
commit 3cfc292428
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/utils/front-end-cal/main.cc
View File

@ -146,8 +146,6 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i
FrontEndCal_msg_rx::~FrontEndCal_msg_rx() {} FrontEndCal_msg_rx::~FrontEndCal_msg_rx() {}
// ###########################################################
void wait_message() void wait_message()
{ {
while (!stop) while (!stop)
@ -234,8 +232,6 @@ bool front_end_capture(std::shared_ptr<ConfigurationInterface> configuration)
return false; return false;
} }
//delete conditioner;
//delete source;
return true; return true;
} }
@ -275,7 +271,6 @@ int main(int argc, char** argv)
if (FLAGS_log_dir.empty()) if (FLAGS_log_dir.empty())
{ {
std::cout << "Logging will be done at " std::cout << "Logging will be done at "
<< "/tmp" << "/tmp"
<< std::endl << std::endl
<< "Use front-end-cal --log_dir=/path/to/log to change that." << "Use front-end-cal --log_dir=/path/to/log to change that."
@ -296,18 +291,16 @@ int main(int argc, char** argv)
<< FLAGS_log_dir << std::endl; << FLAGS_log_dir << std::endl;
} }
// 0. Instantiate the FrontEnd Calibration class // 0. Instantiate the FrontEnd Calibration class
FrontEndCal front_end_cal; FrontEndCal front_end_cal;
// 1. Load configuration parameters from config file // 1. Load configuration parameters from config file
std::shared_ptr<ConfigurationInterface> configuration = std::make_shared<FileConfiguration>(FLAGS_config_file); std::shared_ptr<ConfigurationInterface> configuration = std::make_shared<FileConfiguration>(FLAGS_config_file);
front_end_cal.set_configuration(configuration); front_end_cal.set_configuration(configuration);
// 2. Get SUPL information from server: Ephemeris record, assistance info and TOW // 2. Get SUPL information from server: Ephemeris record, assistance info and TOW
try
{
if (front_end_cal.get_ephemeris() == true) if (front_end_cal.get_ephemeris() == true)
{ {
std::cout << "SUPL data received OK!" << std::endl; std::cout << "SUPL data received OK!" << std::endl;
@ -316,6 +309,11 @@ int main(int argc, char** argv)
{ {
std::cout << "Failure connecting to SUPL server" << std::endl; std::cout << "Failure connecting to SUPL server" << std::endl;
} }
}
catch (const boost::exception& e)
{
std::cout << "Failure connecting to SUPL server" << std::endl;
}
// 3. Capture some front-end samples to hard disk // 3. Capture some front-end samples to hard disk
try try
@ -378,11 +376,6 @@ int main(int argc, char** argv)
exit(0); exit(0);
} }
//gr_basic_block_sptr head = gr_make_head(sizeof(gr_complex), nsamples);
//gr_head_sptr head_sptr = boost::dynamic_pointer_cast<gr_head>(head);
//head_sptr->set_length(nsamples);
//head_sptr->reset();
try try
{ {
acquisition->connect(top_block); acquisition->connect(top_block);
@ -523,8 +516,8 @@ int main(int argc, char** argv)
std::cout << "Reference location (defined in config file):" << std::endl; std::cout << "Reference location (defined in config file):" << std::endl;
std::cout << "Latitude=" << lat_deg << " [<EFBFBD>]" << std::endl; std::cout << "Latitude=" << lat_deg << " [º]" << std::endl;
std::cout << "Longitude=" << lon_deg << " [<EFBFBD>]" << std::endl; std::cout << "Longitude=" << lon_deg << " [º]" << std::endl;
std::cout << "Altitude=" << altitude_m << " [m]" << std::endl; std::cout << "Altitude=" << altitude_m << " [m]" << std::endl;
if (doppler_measurements_map.size() == 0) if (doppler_measurements_map.size() == 0)