mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-19 00:04:58 +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 2019-07-31 10:22:27 +02:00
commit b5aa59561b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/algorithms/PVT/libs/rtklib_solver.cc
View File

@ -94,6 +94,7 @@ Rtklib_Solver::Rtklib_Solver(int nchannels, std::string dump_filename, bool flag
d_dump_filename = std::move(dump_filename); d_dump_filename = std::move(dump_filename);
d_flag_dump_enabled = flag_dump_to_file; d_flag_dump_enabled = flag_dump_to_file;
d_flag_dump_mat_enabled = flag_dump_to_mat; d_flag_dump_mat_enabled = flag_dump_to_mat;
count_valid_position = 0;
this->set_averaging_flag(false); this->set_averaging_flag(false);
rtk_ = rtk; rtk_ = rtk;

2
src/algorithms/PVT/libs/rtklib_solver.h
View File

@ -126,6 +126,8 @@ public:
Beidou_Dnav_Iono beidou_dnav_iono; Beidou_Dnav_Iono beidou_dnav_iono;
std::map<int, Beidou_Dnav_Almanac> beidou_dnav_almanac_map; std::map<int, Beidou_Dnav_Almanac> beidou_dnav_almanac_map;
int count_valid_position;
private: private:
rtk_t rtk_{}; rtk_t rtk_{};
std::string d_dump_filename; std::string d_dump_filename;

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

@ -619,7 +619,7 @@ int main(int argc, char** argv)
{ {
std::cout << "Exception caught while reading ephemeris" << std::endl; std::cout << "Exception caught while reading ephemeris" << std::endl;
} }
catch (int ex) catch (const std::exception& ex)
{ {
std::cout << " " << it.first << " " << it.second - mean_f_if_Hz << " (Eph not found)" << std::endl; std::cout << " " << it.first << " " << it.second - mean_f_if_Hz << " (Eph not found)" << std::endl;
} }