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

Handle the situation when UTC info is not available

Browse Source
This commit is contained in:
Carles Fernandez 2019-03-16 12:47:36 +01:00
parent b6141fb3b2
commit 7c78db4550
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
View File

@ -364,21 +364,42 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels,
throw std::exception(); throw std::exception();
} }
d_pvt_solver = std::make_shared<Rtklib_Solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
d_pvt_solver->set_averaging_depth(1);
start = std::chrono::system_clock::now();
// Display time in local time zone // Display time in local time zone
d_show_local_time_zone = conf_.show_local_time_zone;
time_t when = std::time(nullptr); time_t when = std::time(nullptr);
auto const tm = *std::localtime(&when); auto const tm = *std::localtime(&when);
std::ostringstream os; std::ostringstream os;
os << std::put_time(&tm, "%z"); os << std::put_time(&tm, "%z");
d_utc_diff = os.str(); std::string utc_diff_str = os.str(); // in ISO 8601 format: "+HHMM" or "-HHMM"
// d_utc_diff is in ISO 8601 format: "+HHMM" or "-HHMM" if (utc_diff_str.empty())
int h = std::stoi(d_utc_diff.substr(0, 3), nullptr, 10); {
int m = std::stoi(d_utc_diff[0] + d_utc_diff.substr(3), nullptr, 10); utc_diff_str = "+0000";
}
int h = std::stoi(utc_diff_str.substr(0, 3), nullptr, 10);
int m = std::stoi(utc_diff_str[0] + utc_diff_str.substr(3), nullptr, 10);
d_utc_diff_time = boost::posix_time::hours(h) + boost::posix_time::minutes(m); d_utc_diff_time = boost::posix_time::hours(h) + boost::posix_time::minutes(m);
d_show_local_time_zone = conf_.show_local_time_zone; std::ostringstream os2;
os2 << std::put_time(&tm, "%Z");
std::string time_zone_abrv = os2.str();
if (time_zone_abrv.empty())
{
if (utc_diff_str == "+0000")
{
d_local_time_str = " UTC";
}
else
{
d_local_time_str = " (UTC " + utc_diff_str.substr(0, 3) + ":" + utc_diff_str.substr(3, 2) + ")";
}
}
else
{
d_local_time_str = std::string(" ") + time_zone_abrv + " (UTC " + utc_diff_str.substr(0, 3) + ":" + utc_diff_str.substr(3, 2) + ")";
}
d_pvt_solver = std::make_shared<Rtklib_Solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
d_pvt_solver->set_averaging_depth(1);
start = std::chrono::system_clock::now();
} }
@ -1482,7 +1503,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
if (d_show_local_time_zone) if (d_show_local_time_zone)
{ {
boost::posix_time::ptime time_first_solution = d_pvt_solver->get_position_UTC_time() + d_utc_diff_time; boost::posix_time::ptime time_first_solution = d_pvt_solver->get_position_UTC_time() + d_utc_diff_time;
std::cout << "First position fix at " << time_first_solution << " (UTC " + d_utc_diff.substr(0, 3) + ":" + d_utc_diff.substr(3, 2) + ")"; std::cout << "First position fix at " << time_first_solution << d_local_time_str;
} }
else else
{ {
@ -3315,7 +3336,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
if (d_show_local_time_zone) if (d_show_local_time_zone)
{ {
time_solution = d_pvt_solver->get_position_UTC_time() + d_utc_diff_time; time_solution = d_pvt_solver->get_position_UTC_time() + d_utc_diff_time;
UTC_solution_str = " (UTC " + d_utc_diff.substr(0, 3) + ":" + d_utc_diff.substr(3, 2) + ")"; UTC_solution_str = d_local_time_str;
} }
else else
{ {

2
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h
View File

@ -163,7 +163,7 @@ private:
std::vector<std::string> split_string(const std::string& s, char delim) const; std::vector<std::string> split_string(const std::string& s, char delim) const;
bool d_show_local_time_zone; bool d_show_local_time_zone;
std::string d_utc_diff; std::string d_local_time_str;
boost::posix_time::time_duration d_utc_diff_time; boost::posix_time::time_duration d_utc_diff_time;
public: public: