From d83083a6555d6396dd33fd1d88c62b9f63e544e0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 30 Jul 2019 20:03:02 +0200 Subject: [PATCH 1/2] Fix exception catch --- src/utils/front-end-cal/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index eae79f406..51eace09d 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -619,7 +619,7 @@ int main(int argc, char** argv) { 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; } From cdfe4c43d93f78420f926eebaf64dec716eb7d21 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 31 Jul 2019 10:21:32 +0200 Subject: [PATCH 2/2] Revert "Remove unused public member" This reverts commit 1f476957e38375fe2cb421a62481d7315966d9ad. --- src/algorithms/PVT/libs/rtklib_solver.cc | 1 + src/algorithms/PVT/libs/rtklib_solver.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index f546ce63e..45de55b96 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -94,6 +94,7 @@ Rtklib_Solver::Rtklib_Solver(int nchannels, std::string dump_filename, bool flag d_dump_filename = std::move(dump_filename); d_flag_dump_enabled = flag_dump_to_file; d_flag_dump_mat_enabled = flag_dump_to_mat; + count_valid_position = 0; this->set_averaging_flag(false); rtk_ = rtk; diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h index a393c1f63..1fa4ba8dd 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.h +++ b/src/algorithms/PVT/libs/rtklib_solver.h @@ -126,6 +126,8 @@ public: Beidou_Dnav_Iono beidou_dnav_iono; std::map beidou_dnav_almanac_map; + int count_valid_position; + private: rtk_t rtk_{}; std::string d_dump_filename;