diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h index 1301070d7..c047954e2 100644 --- a/src/algorithms/libs/rtklib/rtklib.h +++ b/src/algorithms/libs/rtklib/rtklib.h @@ -1027,13 +1027,14 @@ typedef struct } solopt_t; -typedef struct { - double rs[6]; /* satellite position|velocity (ecef) (m|m/s) */ - double dts[2]; /* satellite clock bias/drift (s|s/s) */ - double prange; /* pseudorange (m) */ - double dtrp; /* tropospheric delay (m) */ - double dion; /* ionospheric delay (m) */ - double dcb; /* code bias delay (m) */ +typedef struct +{ + double rs[6]; /* satellite position|velocity (ecef) (m|m/s) */ + double dts[2]; /* satellite clock bias/drift (s|s/s) */ + double prange; /* pseudorange (m) */ + double dtrp; /* tropospheric delay (m) */ + double dion; /* ionospheric delay (m) */ + double dcb; /* code bias delay (m) */ } sat_obs_t; diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc index 260c9873c..f127b3df1 100644 --- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc @@ -409,7 +409,7 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs, const double *dts, const double *vare, const int *svh, const nav_t *nav, const double *x, const prcopt_t *opt, double *v, double *H, double *var, double *azel, int *vsat, - double *resp, int *ns, double *pr, double *dion, + double *resp, int *ns, double *pr, double *dion, double *dtrp, double *dcb) { double r; @@ -699,7 +699,7 @@ arma::vec rough_bancroft(const arma::mat &B_pass) int estpos(const obsd_t *obs, int n, const double *rs, const double *dts, const double *vare, const int *svh, const nav_t *nav, const prcopt_t *opt, sol_t *sol, double *azel, int *vsat, - double *resp, char *msg, double *prange, double *dion, double *dtrp, + double *resp, char *msg, double *prange, double *dion, double *dtrp, double *dcb) { double x[NX] = {0}; @@ -840,8 +840,8 @@ int estpos(const obsd_t *obs, int n, const double *rs, const double *dts, int raim_fde(const obsd_t *obs, int n, const double *rs, const double *dts, const double *vare, const int *svh, const nav_t *nav, const prcopt_t *opt, sol_t *sol, - double *azel, int *vsat, double *resp, char *msg, - double *prange, double *dion, double *dtrp, + double *azel, int *vsat, double *resp, char *msg, + double *prange, double *dion, double *dtrp, double *dcb) { obsd_t *obs_e; @@ -1179,8 +1179,8 @@ int pntpos(const obsd_t *obs, int n, const nav_t *nav, /* raim fde */ if (!stat && n >= 6 && opt->posopt[4]) { - stat = raim_fde(obs, n, rs, dts, var, svh.data(), nav, &opt_, sol, azel_, vsat.data(), resp, msg, - prange, dion, dtrp, dcb); + stat = raim_fde(obs, n, rs, dts, var, svh.data(), nav, &opt_, sol, azel_, vsat.data(), resp, msg, + prange, dion, dtrp, dcb); } /* estimate receiver velocity with doppler */ if (stat) diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.h b/src/algorithms/libs/rtklib/rtklib_pntpos.h index e92005ea5..4b667a99f 100644 --- a/src/algorithms/libs/rtklib/rtklib_pntpos.h +++ b/src/algorithms/libs/rtklib/rtklib_pntpos.h @@ -93,7 +93,7 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs, const double *dts, const double *vare, const int *svh, const nav_t *nav, const double *x, const prcopt_t *opt, double *v, double *H, double *var, double *azel, int *vsat, - double *resp, int *ns, double *pr, double *dion, + double *resp, int *ns, double *pr, double *dion, double *dtrp, double *dcb); /* validate solution ---------------------------------------------------------*/ @@ -105,15 +105,15 @@ int valsol(const double *azel, const int *vsat, int n, int estpos(const obsd_t *obs, int n, const double *rs, const double *dts, const double *vare, const int *svh, const nav_t *nav, const prcopt_t *opt, sol_t *sol, double *azel, int *vsat, - double *resp, char *msg, double *prange,double *dion, double *dtrp, + double *resp, char *msg, double *prange, double *dion, double *dtrp, double *dcb); /* raim fde (failure detection and exclution) -------------------------------*/ int raim_fde(const obsd_t *obs, int n, const double *rs, const double *dts, const double *vare, const int *svh, const nav_t *nav, const prcopt_t *opt, sol_t *sol, - double *azel, int *vsat, double *resp, char *msg, - double *prange, double *dion, double *dtrp, + double *azel, int *vsat, double *resp, char *msg, + double *prange, double *dion, double *dtrp, double *dcb); /* doppler residuals ---------------------------------------------------------*/