Skip to content
Snippets Groups Projects
Commit adf86b04 authored by Pep Martí Saumell's avatar Pep Martí Saumell
Browse files

[format] code formatted

parent 500728e3
No related branches found
No related tags found
3 merge requests!20new tag,!19new tag,!11Resolve "Add Novatel raw data stream"
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
namespace GnssUtils namespace GnssUtils
{ {
enum RawDataType : int enum RawDataType : int
{ {
NO = 0, NO = 0,
...@@ -29,8 +28,11 @@ public: ...@@ -29,8 +28,11 @@ public:
virtual RawDataType addDataStream(const std::vector<uint8_t>& data_stream) = 0; virtual RawDataType addDataStream(const std::vector<uint8_t>& data_stream) = 0;
const Observations& getObservations(); const Observations& getObservations() const;
const Navigation& getNavigation(); const Navigation& getNavigation() const;
Observations getObservations();
Navigation getNavigation();
RawDataType getRawDataType() const; RawDataType getRawDataType() const;
...@@ -44,12 +46,22 @@ protected: ...@@ -44,12 +46,22 @@ protected:
Navigation nav_; Navigation nav_;
}; };
inline const Observations& ReceiverRawAbstract::getObservations() inline const Observations& ReceiverRawAbstract::getObservations() const
{
return obs_;
}
inline Observations ReceiverRawAbstract::getObservations()
{ {
return obs_; return obs_;
} }
inline const Navigation& ReceiverRawAbstract::getNavigation() inline const Navigation& ReceiverRawAbstract::getNavigation() const
{
return nav_;
}
inline Navigation ReceiverRawAbstract::getNavigation()
{ {
return nav_; return nav_;
} }
......
...@@ -12,7 +12,7 @@ using namespace GnssUtils; ...@@ -12,7 +12,7 @@ using namespace GnssUtils;
namespace GnssUtils namespace GnssUtils
{ {
ComputePosOutput computePos(const GnssUtils::Observations& _observations, ComputePosOutput computePos(const GnssUtils::Observations& _observations,
GnssUtils::Navigation& _navigation, const GnssUtils::Navigation& _navigation,
const prcopt_t& _prcopt) const prcopt_t& _prcopt)
{ {
// Define error msg // Define error msg
...@@ -22,10 +22,16 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, ...@@ -22,10 +22,16 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations,
sol_t sol; sol_t sol;
sol = { { 0 } }; sol = { { 0 } };
std::vector<double> sat_elevations(2*_observations.size()); std::vector<double> sat_elevations(2 * _observations.size());
output.pos_stat = pntpos( output.pos_stat = pntpos(_observations.data(),
_observations.data(), _observations.size(), &(_navigation.getNavigation()), &_prcopt, &sol, sat_elevations.data(), NULL, msg); _observations.size(),
&(_navigation.getNavigation()),
&_prcopt,
&sol,
sat_elevations.data(),
NULL,
msg);
if (output.pos_stat == 0) if (output.pos_stat == 0)
std::cout << "computePos: error in computing positioning, message: " << msg << "\n"; std::cout << "computePos: error in computing positioning, message: " << msg << "\n";
...@@ -39,7 +45,9 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, ...@@ -39,7 +45,9 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations,
// std::cout << "Covariance:\n" << output.pos_covar << "\n"; // std::cout << "Covariance:\n" << output.pos_covar << "\n";
if (sol.dtr != NULL) if (sol.dtr != NULL)
output.rcv_bias = (Eigen::Matrix<double,6,1>() << sol.dtr[0], sol.dtr[1], sol.dtr[2], sol.dtr[3], sol.dtr[4], sol.dtr[5]).finished(); output.rcv_bias =
(Eigen::Matrix<double, 6, 1>() << sol.dtr[0], sol.dtr[1], sol.dtr[2], sol.dtr[3], sol.dtr[4], sol.dtr[5])
.finished();
output.type = sol.type; output.type = sol.type;
output.stat = sol.stat; output.stat = sol.stat;
output.ns = sol.ns; output.ns = sol.ns;
...@@ -48,7 +56,8 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, ...@@ -48,7 +56,8 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations,
output.lat_lon = ecefToLatLonAlt(output.pos); output.lat_lon = ecefToLatLonAlt(output.pos);
for (auto i = 0; i < _observations.size(); i++) for (auto i = 0; i < _observations.size(); i++)
output.sat_azel.emplace(_observations.getObservationByIdx(i).sat,Eigen::Vector2d(sat_elevations.at(2*i),sat_elevations.at(2*i+1))); output.sat_azel.emplace(_observations.getObservationByIdx(i).sat,
Eigen::Vector2d(sat_elevations.at(2 * i), sat_elevations.at(2 * i + 1)));
return output; return output;
} }
......
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