From bd889335091de27f58ef2413cc78322b4e650c72 Mon Sep 17 00:00:00 2001 From: joanvallve <jvallve@iri.upc.edu> Date: Fri, 22 May 2020 14:41:30 +0200 Subject: [PATCH] keep old computePos API with prcopt_t --- include/gnss_utils/utils/rcv_position.h | 3 ++- src/utils/rcv_position.cpp | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/gnss_utils/utils/rcv_position.h b/include/gnss_utils/utils/rcv_position.h index 962d0ba..c726766 100644 --- a/include/gnss_utils/utils/rcv_position.h +++ b/include/gnss_utils/utils/rcv_position.h @@ -20,7 +20,8 @@ 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, // Navigation & _navigation, diff --git a/src/utils/rcv_position.cpp b/src/utils/rcv_position.cpp index 4e3501e..73c42e7 100644 --- a/src/utils/rcv_position.cpp +++ b/src/utils/rcv_position.cpp @@ -15,12 +15,19 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, const GnssUtils::Navigation& _navigation, const Options& _opt) { - // Define error msg - char msg[128] = ""; - // Convert options to rtklib 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 GnssUtils::ComputePosOutput output; sol_t sol; @@ -32,7 +39,7 @@ ComputePosOutput computePos(const GnssUtils::Observations& _observations, output.pos_stat = pntpos(_observations.data(), _observations.size(), &(_navigation.getNavigation()), - &prcopt, + &_prcopt, &sol, sat_elevations.data(), sats_status, -- GitLab