From 7ce740d3501b86f7174fc7bd21e24635a22c36d8 Mon Sep 17 00:00:00 2001
From: Tim Everett <tim.everett3@gmail.com>
Date: Mon, 6 Jan 2020 14:11:42 -0700
Subject: [PATCH] - Set u-blox default max valid cpstd back to 5, further
testing showed new value too high for M8T - Change default rinex version for
convbin from 2.11 to 3.03 - Change config defaults to more typical use case
values
---
app/convbin/convbin.c | 2 +-
src/rcv/ublox.c | 4 ++--
src/rtkcmn.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/convbin/convbin.c b/app/convbin/convbin.c
index 3ae7410..5036376 100644
--- a/app/convbin/convbin.c
+++ b/app/convbin/convbin.c
@@ -340,7 +340,7 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile,
int i,j,k,sat,nf=3,nc=2,format=-1;
char *p,*sys,*fmt="",*paths[1],path[1024],buff[256];
- opt->rnxver=2.11;
+ opt->rnxver=3.03;
opt->obstype=OBSTYPE_PR|OBSTYPE_CP;
opt->navsys=SYS_GPS|SYS_GLO|SYS_GAL|SYS_QZS|SYS_SBS|SYS_CMP;
opt->scanobs=1;
diff --git a/src/rcv/ublox.c b/src/rcv/ublox.c
index 9b758f9..345c66c 100644
--- a/src/rcv/ublox.c
+++ b/src/rcv/ublox.c
@@ -100,7 +100,7 @@ typedef enum { false, true } bool;
#define P2_10 0.0009765625 /* 2^-10 */
-#define MAX_CPSTD_VALID 7 /* max std-dev for valid carrier-phase */
+#define MAX_CPSTD_VALID 5 /* max std-dev for valid carrier-phase */
#define CPSTD_SLIP 15 /* std-dev threshold for slip */
#define ROUND(x) (int)floor((x)+0.5)
@@ -455,7 +455,7 @@ static int decode_rxmrawx(raw_t *raw)
raw->obs.data[n].rcv=0;
for (k=0;k<NFREQ+NEXOBS;k++) {
raw->obs.data[n].L[k]=raw->obs.data[n].P[k]=0.0;
- raw->obs.data[n].qualL[k]=raw->obs.data[n].qualP[k]=0.0;
+ raw->obs.data[n].qualL[k]=raw->obs.data[n].qualP[k]=0;
raw->obs.data[n].D[k]=0.0;
raw->obs.data[n].SNR[k]=raw->obs.data[n].LLI[k]=0;
raw->obs.data[n].code[k]=CODE_NONE;
diff --git a/src/rtkcmn.c b/src/rtkcmn.c
index da621ba..0eae4ac 100644
--- a/src/rtkcmn.c
+++ b/src/rtkcmn.c
@@ -188,11 +188,11 @@ const double lam_carr[MAXFREQ]={ /* carrier wave length (m) */
CLIGHT/FREQE5ab,CLIGHT/FREQs
};
const prcopt_t prcopt_default={ /* defaults processing options */
- PMODE_SINGLE,0,2,SYS_GPS, /* mode,soltype,nf,navsys */
+ PMODE_KINEMA,0,2,SYS_GPS|SYS_GLO|SYS_GAL, /* mode,soltype,nf,navsys */
15.0*D2R,{{0,0}}, /* elmin,snrmask */
0,3,3,1,0,1, /* sateph,modear,glomodear,gpsmodear,bdsmodear,arfilter */
- 20,5,4,5,10,20, /* maxout,minlock,minfixsats,minholdsats,mindropsats,minfix */
- 0,1,0,0,1,0, /* rcvstds,armaxiter,estion,esttrop,dynamics,tidecorr */
+ 20,0,4,5,10,20, /* maxout,minlock,minfixsats,minholdsats,mindropsats,minfix */
+ 0,1,1,1,1,0, /* rcvstds,armaxiter,estion,esttrop,dynamics,tidecorr */
1,0,0,0,0, /* niter,codesmooth,intpref,sbascorr,sbassatsel */
0,0, /* rovpos,refpos */
WEIGHTOPT_ELEVATION, /* weightmode */
@@ -203,11 +203,11 @@ const prcopt_t prcopt_default={ /* defaults processing options */
5E-12, /* sclkstab */
{3.0,0.25,0.0,1E-9,1E-5,0.0,0.0,0.0}, /* thresar */
0.0,0.0,0.05,0.1,0.01, /* elmaskar,elmaskhold,thresslip,varholdamb,gainholdamb */
- 30.0,1000.0,30.0, /* maxtdif,maxinno,maxgdop */
+ 30.0,5.0,30.0, /* maxtdif,maxinno,maxgdop */
{0},{0},{0}, /* baseline,ru,rb */
{"",""}, /* anttype */
{{0}},{{0}},{0}, /* antdel,pcv,exsats */
- 1,1 /* maxaveep,initrst */
+ 1,1 /* maxaveep,initrst */
};
const solopt_t solopt_default={ /* defaults solution output options */
SOLF_LLH,TIMES_GPST,1,3, /* posf,times,timef,timeu */
@@ -2294,7 +2294,7 @@ extern pcv_t *searchpcv(int sat, const char *type, gtime_t time,
char buff[MAXANT],*types[2],*p;
int i,j,n=0;
- trace(3,"searchpcv: sat=%2d type=%s\n",sat,type);
+ trace(4,"searchpcv: sat=%2d type=%s\n",sat,type);
if (sat) { /* search satellite antenna */
for (i=0;i<pcvs->n;i++) {
--
GitLab