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: bug in mat vtl and pvt files

Browse Source
This commit is contained in:
M.A.Gomez 2023-03-11 18:56:08 +00:00
parent 0dab031127
commit fd69416f4e
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,6 +251,9 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels,
std::cerr << "GNSS-SDR cannot create dump file for the PVT block. Wrong permissions?\n"; std::cerr << "GNSS-SDR cannot create dump file for the PVT block. Wrong permissions?\n";
d_dump = false; d_dump = false;
} }
// TODO: if(vtl_enable) then
// uint end_filename = d_dump_filename.length()-4;
// d_vtl_dump_filename = d_dump_filename.insert(end_filename, "_vtl");
} }
// initialize kml_printer // initialize kml_printer

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

@ -162,14 +162,17 @@ Rtklib_Solver::Rtklib_Solver(const rtk_t &rtk,
LOG(WARNING) << "Exception opening RTKLIB dump file " << e.what(); LOG(WARNING) << "Exception opening RTKLIB dump file " << e.what();
} }
} }
// TODO: if(vtl_enable) then
if (d_vtl_dump_file.is_open() == false) if (d_vtl_dump_file.is_open() == false)
{ {
try try
{ {
d_vtl_dump_file.exceptions(std::ofstream::failbit | std::ofstream::badbit); d_vtl_dump_file.exceptions(std::ofstream::failbit | std::ofstream::badbit);
int end_filename = d_dump_filename.length()-4; uint end_filename = d_dump_filename.length()-4;
d_vtl_dump_file.open(d_dump_filename.insert(end_filename, "_vtl"), std::ios::out | std::ios::binary); d_vtl_dump_filename = d_dump_filename;
LOG(INFO) << "PVT VTL dump enabled Log file: " << d_dump_filename + "_vtl"; d_vtl_dump_filename = d_vtl_dump_filename.insert(end_filename, "_vtl");
d_vtl_dump_file.open(d_vtl_dump_filename, std::ios::out | std::ios::binary);
LOG(INFO) << "PVT VTL dump enabled Log file: " << d_vtl_dump_filename;
} }
catch (const std::ofstream::failure &e) catch (const std::ofstream::failure &e)
{ {
@ -209,20 +212,30 @@ Rtklib_Solver::~Rtklib_Solver()
try try
{ {
save_matfile(); save_matfile();
save_vtl_matfile();
} }
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
LOG(WARNING) << "Exception in destructor saving the PVT .mat dump file " << ex.what(); LOG(WARNING) << "Exception in destructor saving the PVT .mat dump file " << ex.what();
} }
} }
if (d_flag_dump_mat_enabled)
{
try
{
save_vtl_matfile();
}
catch (const std::exception &ex)
{
LOG(WARNING) << "Exception in destructor saving the PVT VTL .mat dump file " << ex.what();
}
}
} }
bool Rtklib_Solver::save_vtl_matfile() const bool Rtklib_Solver::save_vtl_matfile() const
{ {
// READ DUMP FILE // READ DUMP FILE
const std::string dump_filename = d_dump_filename+ "_vtl"; const std::string dump_filename = d_vtl_dump_filename;
const int32_t number_of_double_vars = 27; const int32_t number_of_double_vars = 27;
const int32_t number_of_uint32_vars = 2; const int32_t number_of_uint32_vars = 2;
const int32_t number_of_uint8_vars = 1; const int32_t number_of_uint8_vars = 1;
@ -233,7 +246,7 @@ bool Rtklib_Solver::save_vtl_matfile() const
dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
try try
{ {
dump_file.open(dump_filename.c_str(), std::ios::binary | std::ios::ate); dump_file.open(dump_filename, std::ios::binary | std::ios::ate);
} }
catch (const std::ifstream::failure &e) catch (const std::ifstream::failure &e)
{ {
@ -254,7 +267,6 @@ bool Rtklib_Solver::save_vtl_matfile() const
return false; return false;
} }
//todo: cambiarlo
auto TOW_at_current_symbol_ms = std::vector<uint32_t>(num_epoch); auto TOW_at_current_symbol_ms = std::vector<uint32_t>(num_epoch);
auto week = std::vector<uint32_t>(num_epoch); auto week = std::vector<uint32_t>(num_epoch);
auto RX_time = std::vector<double>(num_epoch); auto RX_time = std::vector<double>(num_epoch);
@ -328,7 +340,7 @@ bool Rtklib_Solver::save_vtl_matfile() const
} }
catch (const std::ifstream::failure &e) catch (const std::ifstream::failure &e)
{ {
std::cerr << "Problem reading dump file:" << e.what() << '\n'; std::cerr << "Problem reading VTL dump file:" << e.what() << '\n';
return false; return false;
} }

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

@ -152,6 +152,7 @@ private:
std::map<std::string, std::map<int, HAS_obs_corrections>> d_has_obs_corr_map; // first key is signal, second key is PRN std::map<std::string, std::map<int, HAS_obs_corrections>> d_has_obs_corr_map; // first key is signal, second key is PRN
std::string d_dump_filename; std::string d_dump_filename;
std::string d_vtl_dump_filename;
std::ofstream d_dump_file; std::ofstream d_dump_file;
std::ofstream d_vtl_dump_file; std::ofstream d_vtl_dump_file;
rtk_t d_rtk{}; rtk_t d_rtk{};