Skip to content
Snippets Groups Projects
Commit 81a03599 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' of...

Merge branch 'devel' of ssh://gitlab.iri.upc.edu:2202/mobile_robotics/gauss_project/gnss_utils into devel
parents dd4d93a1 12eadc47
No related branches found
No related tags found
2 merge requests!20new tag,!19new tag
......@@ -54,7 +54,7 @@ struct ComputePosOutput
class Observations;
class Navigation;
class Snapshot;
class Satellite;
struct Satellite;
// Typedefs
typedef std::map<int,Satellite> Satellites;
......
......@@ -123,7 +123,7 @@ void Observations::removeObservationBySat(const int& _sat)
assert(sat_2_idx_.size() == obs_.size());
}
static void Observations::print(obsd_t& _obs)
void Observations::print(obsd_t& _obs)
{
std::string msg = "Observation of satellite #" + std::to_string(_obs.sat);
GnssUtils::print(msg);
......
......@@ -15,7 +15,7 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream)
for (auto data_byte = data_stream.begin(); data_byte != data_stream.end(); ++data_byte)
{
raw_data_type_ = input_oem4(&raw_data_, (unsigned char)*data_byte);
raw_data_type_ = static_cast<RawDataType> ( input_oem4(&raw_data_, (unsigned char)*data_byte) );
switch (raw_data_type_)
{
......@@ -64,4 +64,5 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream)
break;
}
}
}
\ No newline at end of file
return raw_data_type_;
}
......@@ -15,7 +15,7 @@ RawDataType UBloxRaw::addDataStream(const std::vector<uint8_t>& data_stream)
// Update type based on RTKLIB
for (auto data_byte = data_stream.begin(); data_byte != data_stream.end(); ++data_byte)
{
raw_data_type_ = input_ubx(&raw_data_, (unsigned char)*data_byte);
raw_data_type_ = static_cast<RawDataType> ( input_ubx(&raw_data_, (unsigned char)*data_byte) );
switch (raw_data_type_)
{
......
......@@ -26,7 +26,7 @@ loadObservationsFromRinex(const std::string& rnx_file, gtime_t t_start, gtime_t
{
std::cout << "Observation: couldn't load provided observation file, reason: " << (stat == 0 ? "no data" : "error")
<< stat << std::endl;
return;
return std::vector<Observations>();
}
std::vector<Observations> obs_vector;
......@@ -393,4 +393,4 @@ bool operator==(const nav_t& nav1, const nav_t& nav2)
bool operator!=(const nav_t& nav1, const nav_t& nav2)
{
return not(nav1 == nav2);
}
\ No newline at end of file
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment