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

keep old computePos API with prcopt_t

parent c9c15060
No related branches found
No related tags found
2 merge requests!20new tag,!19new tag
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
namespace GnssUtils namespace GnssUtils
{ {
ComputePosOutput computePos(const Observations& _observations, const Navigation& _navigation, const Options& _prcopt); ComputePosOutput computePos(const Observations& _observations, const Navigation& _navigation, const Options& _opt);
ComputePosOutput computePos(const Observations& _observations, const Navigation& _navigation, const prcopt_t& _prcopt);
// ComputePosOutput computePosOwn(const Observations & _observations, // ComputePosOutput computePosOwn(const Observations & _observations,
// Navigation & _navigation, // Navigation & _navigation,
......
...@@ -15,12 +15,19 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, ...@@ -15,12 +15,19 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations,
const GnssUtils::Navigation& _navigation, const GnssUtils::Navigation& _navigation,
const Options& _opt) const Options& _opt)
{ {
// Define error msg
char msg[128] = "";
// Convert options to rtklib // Convert options to rtklib
prcopt_t prcopt = _opt.getPrcopt(); prcopt_t prcopt = _opt.getPrcopt();
return computePos(_observations, _navigation, prcopt);
}
ComputePosOutput computePos(const GnssUtils::Observations& _observations,
const GnssUtils::Navigation& _navigation,
const prcopt_t& _prcopt)
{
// Define error msg
char msg[128] = "";
// output data // output data
GnssUtils::ComputePosOutput output; GnssUtils::ComputePosOutput output;
sol_t sol; sol_t sol;
...@@ -32,7 +39,7 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, ...@@ -32,7 +39,7 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations,
output.pos_stat = pntpos(_observations.data(), output.pos_stat = pntpos(_observations.data(),
_observations.size(), _observations.size(),
&(_navigation.getNavigation()), &(_navigation.getNavigation()),
&prcopt, &_prcopt,
&sol, &sol,
sat_elevations.data(), sat_elevations.data(),
sats_status, sats_status,
......
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