mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-04-24 07:41:25 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Javier Arribas
2023-01-13 12:34:44 +01:00
parent b8decef94d d5c5187c68
commit 09cc53f36e
38 changed files with 349 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1147,7 +1147,7 @@ rtklib_pvt_gs::~rtklib_pvt_gs()
}
}
}
catch (std::length_error& e)
catch (const std::exception& e)
{
LOG(WARNING) << e.what();
}

30
src/algorithms/PVT/libs/nmea_printer.cc
View File

@@ -55,7 +55,7 @@ Nmea_Printer::Nmea_Printer(const std::string& filename,
{
if (!fs::create_directory(new_folder, ec))
{
std::cout << "Could not create the " << new_folder << " folder.\n";
std::cout << "Could not create the " << new_folder << " folder." << std::endl;
nmea_base_path = full_path.string();
}
}
@@ -69,7 +69,7 @@ Nmea_Printer::Nmea_Printer(const std::string& filename,
if ((nmea_base_path != ".") and (d_flag_nmea_output_file == true))
{
std::cout << "NMEA files will be stored at " << nmea_base_path << '\n';
std::cout << "NMEA files will be stored at " << nmea_base_path << std::endl;
}
nmea_base_path = nmea_base_path + fs::path::preferred_separator;
@@ -83,7 +83,7 @@ Nmea_Printer::Nmea_Printer(const std::string& filename,
}
else
{
std::cout << "File " << nmea_filename << " cannot be saved. Wrong permissions?\n";
std::cout << "File " << nmea_filename << " cannot be saved. Wrong permissions?" << std::endl;
}
}
@@ -118,18 +118,18 @@ Nmea_Printer::~Nmea_Printer()
}
catch (const std::ofstream::failure& e)
{
std::cerr << "Problem closing NMEA dump file: " << nmea_filename << '\n';
std::cerr << "Problem closing NMEA dump file: " << nmea_filename << std::endl;
}
catch (const std::exception& e)
{
std::cerr << e.what() << '\n';
std::cerr << e.what() << std::endl;
}
if (pos == 0)
{
errorlib::error_code ec;
if (!fs::remove(fs::path(nmea_filename), ec))
{
std::cerr << "Problem removing NMEA temporary file: " << nmea_filename << '\n';
std::cerr << "Problem removing NMEA temporary file: " << nmea_filename << std::endl;
}
}
try
@@ -138,7 +138,7 @@ Nmea_Printer::~Nmea_Printer()
}
catch (const std::exception& e)
{
std::cerr << e.what() << '\n';
std::cerr << e.what() << std::endl;
}
}
@@ -212,14 +212,12 @@ bool Nmea_Printer::Print_Nmea_Line(const Rtklib_Solver* const pvt_data, bool pri
{
try
{
// GPRMC
nmea_file_descriptor << GPRMC;
// GPGGA (Global Positioning System Fixed Data)
nmea_file_descriptor << GPGGA;
// GPGSA
nmea_file_descriptor << GPGSA;
// GPGSV
nmea_file_descriptor << GPGSV;
nmea_file_descriptor
<< GPRMC
<< GPGGA // GPGGA (Global Positioning System Fixed Data)
<< GPGSA
<< GPGSV
<< std::flush;
}
catch (const std::exception& ex)
{
@@ -417,7 +415,7 @@ std::string Nmea_Printer::get_GPGSA() const
std::string Nmea_Printer::get_GPGSV() const
{
// GSV-GNSS Satellites in View
// $GPGSV,2,1,07,07,79,048,42,02,51,062,43,26,36,256,42,27,27,138,42*71
// $GPGSV,2,1,07,07,79,048,42,02,51,062,43,26,36,256,42,27,27,138,42,1*71
// Notice that NMEA 2.1 only supports 12 channels
std::stringstream sentence_str;
std::array<unsigned char, 1024> buff{};

20
src/algorithms/PVT/libs/rinex_printer.cc
View File

@@ -5602,29 +5602,9 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gal
E5B_HS = "11";
}
if (E1B_HS == "11")
{
LOG(WARNING) << "Signal Component currently in Test";
}
if (E1B_HS == "10")
{
LOG(WARNING) << "Signal will be out of service";
}
if (E1B_HS == "01")
{
LOG(WARNING) << "Signal out of service";
}
E1B_HS = "00"; // *************** CHANGE THIS WHEN GALILEO SIGNAL IS VALID
std::string E1B_DVS = std::to_string(galileo_ephemeris_iter->second.E1B_DVS);
if (E1B_DVS == "1")
{
LOG(WARNING) << "Navigation data without guarantee";
}
E1B_DVS = "0"; // *************** CHANGE THIS WHEN GALILEO SIGNAL IS VALID
std::string SVhealth_str = E5B_HS + std::to_string(galileo_ephemeris_iter->second.E5b_DVS) + "11" + "1" + std::string(E1B_DVS) + std::string(E1B_HS) + std::to_string(galileo_ephemeris_iter->second.E1B_DVS);
SVhealth_str = "000000000"; // *************** CHANGE THIS WHEN GALILEO SIGNAL IS VALID
int32_t SVhealth = Rinex_Printer::toInt(SVhealth_str, 9);
line += Rinex_Printer::doub2for(static_cast<double>(SVhealth), 18, 2);
line += std::string(1, ' ');