From f9679aca7cd31aab2d8f0f84c352ac54ebfbabd7 Mon Sep 17 00:00:00 2001 From: Tim Everett <tim.everett3@gmail.com> Date: Fri, 20 Sep 2019 17:38:44 -0600 Subject: [PATCH] - Improve count of number of sats used in previous ambiguity resolution attempt. - Remove C++ style comment to avoid linux build error --- src/rtcm3e.c | 2 +- src/rtkpos.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rtcm3e.c b/src/rtcm3e.c index f4e7dc6..1298a86 100644 --- a/src/rtcm3e.c +++ b/src/rtcm3e.c @@ -102,7 +102,7 @@ static int fcn_glo(int sat, rtcm_t *rtcm, int obs_index) } else { /* if freq slot not available from nav data check MSM obs data */ fcn=(int)rtcm->obs.data[obs_index].freq; - if (fcn>13) fcn=-1; // set invalid result flag */ + if (fcn>13) fcn=-1; /* set invalid result flag */ } return fcn; } diff --git a/src/rtkpos.c b/src/rtkpos.c index 86a0070..f32793f 100644 --- a/src/rtkpos.c +++ b/src/rtkpos.c @@ -1798,8 +1798,9 @@ static int manage_amb_LAMBDA(rtk_t *rtk, double *bias, double *xa, const int *sa /* find and count sats used last time for AR */ for (f=0;f<nf;f++) for (i=0;i<ns;i++) - if (rtk->ssat[sat[i]-1].vsat[f]&&rtk->ssat[sat[i]-1].lock[f]>0) + if (rtk->ssat[sat[i]-1].vsat[f] && rtk->ssat[sat[i]-1].lock[f]>=0 && rtk->ssat[sat[i]-1].azel[1]>=rtk->opt.elmin) { arsats[ar++]=i; + } /* if no fix on previous sample and enough sats, exclude next sat in list */ trace(3,"num sats used last AR: %d\n",ar); -- GitLab