diff --git a/TC_NAV_Zjut_post/Src/real_time/rt_ins-gnss.c b/TC_NAV_Zjut_post/Src/real_time/rt_ins-gnss.c index b16665e..e929693 100644 --- a/TC_NAV_Zjut_post/Src/real_time/rt_ins-gnss.c +++ b/TC_NAV_Zjut_post/Src/real_time/rt_ins-gnss.c @@ -65,9 +65,10 @@ extern int xnIF(const insopt_t *insopt) { extern int xnX(const insopt_t *insopt) { switch (insopt->tc) { case INSTC_RTK: - return xnP(insopt)+ xnV(insopt)+ xnA(insopt)+ xnBa(insopt)+xnBg(insopt)+xnB(insopt); + return xnP(insopt)+ xnV(insopt)+ xnA(insopt)+ xnBa(insopt)+xnBg(insopt)+xnI(insopt)+ + xnT(insopt)+xnB(insopt); case INSTC_SINGLE: - xnP(insopt)+ xnV(insopt)+ xnA(insopt)+ xnBa(insopt)+xnBg(insopt)+xnRb(insopt)+xnRd(insopt); + return xnP(insopt)+ xnV(insopt)+ xnA(insopt)+ xnBa(insopt)+xnBg(insopt)+xnRb(insopt)+xnRd(insopt); } } /* get number of position */ @@ -90,6 +91,22 @@ extern int xnRd(const insopt_t *insopt){ return ((insopt)->gopt?((prcopt_t*)(insopt)->gopt)->mode==PMODE_INS_TGNSS &&(insopt)->tc<=INSTC_RTK?3:0:0); } +/* get number of iono,trop,phase bias and h/w bias states are non-close-loop + * correction states + * --------------------------------------------------------------------------*/ +extern int xnI(const insopt_t *insopt) +{ + return ((insopt)->gopt?((prcopt_t*)(insopt)->gopt)->ionoopt!=IONOOPT_EST?0:MAXSAT:0); +} +extern int xnT(const insopt_t *insopt) +{ + return ((insopt)->gopt?((prcopt_t*)(insopt)->gopt)->tropoptgopt)->tropoptopt.insopt.tc; + tc=rtk->opt.mode==PMODE_INS_TGNSS?1:0; /* temporal update of position/velocity/acceleration */ - if(tcnx,ns); - if(rtk->opt.insopt.tc){ - matcpy(rr,rtk->ins.x,1,3); + /* tc=0: common rtk mode + * tc=1: tightly coupled mode + * */ + tc=opt->mode==PMODE_INS_TGNSS?1:0; + + if(tc){ + ins_2_ant(&rtk->ins,rr); nx=rtk->ins.nx; } else{ @@ -1295,8 +1300,8 @@ static int ddres(rtk_t *rtk, const nav_t *nav, const obsd_t *obs, double dt, con if (!validobs(iu[j],ir[j],f,nf,y)) continue; if (H) { - Hi=H+nv*rtk->nx; - for (k=0;knx;k++) Hi[k]=0.0; + Hi=H+nv*nx; + for (k=0;kopt.insopt.tc){ + if(tc){ /* h(x)/x */ /* partial derivations by ins position */ jacob_dd_dp(&rtk->ins,&e[iu[i]*3],&e[iu[j]*3],dp); @@ -1318,13 +1323,14 @@ static int ddres(rtk_t *rtk, const nav_t *nav, const obsd_t *obs, double dt, con for (k=0;k<3;k++) { Hi[k]=-e[k+iu[i]*3]+e[k+iu[j]*3]; /* translation of innovation to position states */ } - } if (opt->ionoopt==IONOOPT_EST) { /* adjust double-differenced measurements by double-differenced ionospheric delay term */ + ii=tc?xiIo(&rtk->opt.insopt,sat[i]):II(sat[i],opt); + jj=tc?xiIo(&rtk->opt.insopt,sat[j]):II(sat[j],opt); didxi=(code?-1.0:1.0)*im[i]*SQR(FREQL1/freqi); didxj=(code?-1.0:1.0)*im[j]*SQR(FREQL1/freqj); - v[nv]-=didxi*x[II(sat[i],opt)]-didxj*x[II(sat[j],opt)]; + v[nv]-=didxi*x[ii]-didxj*x[jj]; if (H) { Hi[II(sat[i],opt)]= didxi; Hi[II(sat[j],opt)]=-didxj; @@ -1335,13 +1341,15 @@ static int ddres(rtk_t *rtk, const nav_t *nav, const obsd_t *obs, double dt, con v[nv]-=(tropu[i]-tropu[j])-(tropr[i]-tropr[j]); for (k=0;k<(opt->tropoptopt.insopt,0):IT(0,opt); + jj=tc?xiTr(&rtk->opt.insopt,1):IT(1,opt); + Hi[ii+k]= (dtdxu[k+i*3]-dtdxu[k+j*3]); + Hi[jj+k]=-(dtdxr[k+i*3]-dtdxr[k+j*3]); } } /* index of phase bias */ - ii=IB(sat[i],frq,opt); - jj=IB(sat[j],frq,opt); + ii=tc?xiBs(&rtk->opt.insopt,sat[i],frq):IB(sat[i],frq,opt); + jj=tc?xiBs(&rtk->opt.insopt,sat[j],frq):IB(sat[j],frq,opt); if (!code) { /* adjust phase residual by double-differenced phase-bias term, IB=look up index by sat&freq */ @@ -1391,10 +1399,13 @@ static int ddres(rtk_t *rtk, const nav_t *nav, const obsd_t *obs, double dt, con if (code) rtk->ssat[sat[j]-1].resp[frq]=v[nv]; /* pseudorange */ else rtk->ssat[sat[j]-1].resc[frq]=v[nv]; /* carrier phase */ + + double *P_; + P_=tc?rtk->ins.P:rtk->P; /* if residual too large, flag as outlier */ /* adjust threshold by error stdev ratio unless one of the phase biases was just initialized*/ - threshadj=code||(rtk->P[ii+rtk->nx*ii]==SQR(rtk->opt.std[0]))|| - (rtk->P[jj+rtk->nx*jj]==SQR(rtk->opt.std[0]))?opt->eratio[frq]:1; + threshadj=code||(P_[ii+nx*ii]==SQR(rtk->opt.std[0]))|| + (P_[jj+nx*jj]==SQR(rtk->opt.std[0]))?opt->eratio[frq]:1; if (opt->maxinno>0.0&&fabs(v[nv])>opt->maxinno*threshadj) { rtk->ssat[sat[j]-1].vsat[frq]=0; rtk->ssat[sat[j]-1].rejc[frq]++; @@ -1427,7 +1438,7 @@ static int ddres(rtk_t *rtk, const nav_t *nav, const obsd_t *obs, double dt, con icb=rtk->ssat[sat[i]-1].icbias[frq]*CLIGHT/freqi - rtk->ssat[sat[j]-1].icbias[frq]*CLIGHT/freqj; trace(3,"sat=%3d-%3d %s%d v=%13.3f R=%9.6f %9.6f icb=%9.3f lock=%5d x=%9.3f\n",sat[i], sat[j],code?"P":"L",frq+1,v[nv],Ri[nv],Rj[nv],icb, - rtk->ssat[sat[j]-1].lock[frq],rtk->x[IB(sat[j],frq,&rtk->opt)]); + rtk->ssat[sat[j]-1].lock[frq],tc?rtk->ins.x[xiBs(&rtk->opt.insopt,sat[j],frq)]:rtk->x[IB(sat[j],frq,&rtk->opt)]); vflg[nv++]=(sat[i]<<16)|(sat[j]<<8)|((code?1:0)<<4)|(frq); nb[b]++; @@ -1441,7 +1452,7 @@ static int ddres(rtk_t *rtk, const nav_t *nav, const obsd_t *obs, double dt, con vflg[nv++]=3<<4; nb[b++]++; } - if (H) {trace(5,"H=\n"); tracemat(5,H,rtk->nx,nv,7,4);} + if (H) {trace(5,"H=\n"); tracemat(5,H,nx,nv,7,4);} /* double-differenced measurement error covariance */ ddcov(nb,b,Ri,Rj,nv,R); @@ -1947,7 +1958,7 @@ static int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr, { prcopt_t *opt=&rtk->opt; gtime_t time=obs[0].time; - double *rs,*dts,*var,*y,*e,*azel,*freq,*v,*H,*R,*xp,*Pp,*xa,*bias,dt,*x; + double *rs,*dts,*var,*y,*e,*azel,*freq,*v,*H,*R,*xp,*Pp,*xa,*bias,dt,*x,*P,rr[3]={0}; int i,j,f,n=nu+nr,ns,ny,nv,sat[MAXSAT],iu[MAXSAT],ir[MAXSAT],niter; int info,vflg[MAXOBS*NFREQ*2+1],svh[MAXOBS*2]; int stat=rtk->opt.mode<=PMODE_DGPS?SOLQ_DGPS:SOLQ_FLOAT; @@ -1957,6 +1968,7 @@ static int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr, tc=opt->mode==PMODE_INS_TGNSS?1:0; nx=tc?rtk->ins.nx:rtk->nx; x=tc?rtk->ins.x:rtk->x; + P=tc?rtk->ins.P:rtk->P; /* time diff between base and rover observations */ dt=timediff(time,obs[nu].time); @@ -2027,15 +2039,23 @@ static int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr, xa=mat(nx,1); // matcpy(xp,rtk->x,nx,1); matcpy(xp,x,nx,1); - - + if (tc) { + for (i=0;iopt.insopt);i++) xp[i]=1E-10; + } ny=ns*nf*2+2; v=mat(ny,1); H=zeros(nx,ny); R=mat(ny,ny); bias=mat(nx,1); - + /* add 2 iterations for baseline-constraint moving-base (else default niter=1) */ niter=opt->niter+(opt->mode==PMODE_MOVEB&&opt->baseline[0]>0.0?2:0); - + /* tc 只进行一次迭代 */ for (i=0;iins,rr); + } + else{ + matcpy(rr,xp,1,3); + } /* calculate zero diff residuals [measured pseudorange - range] for rover (phase and code) output is in y[0:nu-1], only shared input with base is nav obs = sat observations @@ -2050,7 +2070,7 @@ static int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr, e = line of sight unit vectors to sats azel = [az, el] to sats */ trace(3,"rover:\n"); - if (!zdres(0,obs,nu,rs,dts,var,svh,nav,xp,opt,0,y,e,azel,freq)) { + if (!zdres(0,obs,nu,rs,dts,var,svh,nav,rr,opt,0,y,e,azel,freq)) { errmsg(rtk,"rover initial position error\n"); stat=SOLQ_NONE; break; @@ -2076,8 +2096,8 @@ static int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr, K=P*H*(H'*P*H+R)^-1 xp=x+K*v Pp=(I-K*H')*P */ - matcpy(Pp,rtk->P,rtk->nx,rtk->nx); - if ((info=filter(xp,Pp,H,v,R,rtk->nx,nv))) { + matcpy(Pp,P,nx,nx); + if ((info=filter(xp,Pp,H,v,R,nx,nv))) { errmsg(rtk,"filter error (info=%d)\n",info); stat=SOLQ_NONE; break; diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/binex.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/binex.c.o index ce81b5d..f18763c 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/binex.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/binex.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convgpx.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convgpx.c.o index afe4651..4dd61b4 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convgpx.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convgpx.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convkml.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convkml.c.o index 66f152a..4ef7b81 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convkml.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convkml.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convrnx.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convrnx.c.o index d9c9bf9..c93beaf 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convrnx.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/convrnx.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/crescent.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/crescent.c.o index e5b3b5b..890db0a 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/crescent.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/crescent.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/decode_IMU.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/decode_IMU.c.o index 8c5c419..892e0a3 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/decode_IMU.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/decode_IMU.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/download.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/download.c.o index 967b322..37d00a1 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/download.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/download.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ephemeris.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ephemeris.c.o index d2c97b5..b77f508 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ephemeris.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ephemeris.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/gis.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/gis.c.o index 7bff191..3457c2f 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/gis.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/gis.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ionex.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ionex.c.o index 046437e..ccf77b2 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ionex.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ionex.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/javad.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/javad.c.o index fa94b44..dc16a03 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/javad.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/javad.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/novatel.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/novatel.c.o index 3cf149d..19dce93 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/novatel.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/novatel.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/nvs.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/nvs.c.o index 1c45ae8..92186fc 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/nvs.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/nvs.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/options.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/options.c.o index d94d27f..4c02431 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/options.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/options.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/pntpos.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/pntpos.c.o index bc4bfcd..34c4727 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/pntpos.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/pntpos.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/post/ps_tcpos.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/post/ps_tcpos.c.o index b4b140d..f9e4d3e 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/post/ps_tcpos.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/post/ps_tcpos.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/postpos.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/postpos.c.o index 7912069..5c9c4fd 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/postpos.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/postpos.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp.c.o index c31bd89..4eaf2df 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp_ar.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp_ar.c.o index 5f1373c..296b314 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp_ar.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ppp_ar.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/preceph.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/preceph.c.o index 50d22b6..6c8d0c6 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/preceph.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/preceph.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rcvraw.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rcvraw.c.o index 631f589..161982c 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rcvraw.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rcvraw.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/nhc.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/nhc.c.o index 3bccd60..f98e914 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/nhc.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/nhc.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_doppler.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_doppler.c.o index adf5295..a0c3089 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_doppler.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_doppler.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_init.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_init.c.o index 9f1771d..9ddf35e 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_init.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_init.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_ins-gnss.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_ins-gnss.c.o index 3e63e7c..00f03b7 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_ins-gnss.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_ins-gnss.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zaru.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zaru.c.o index 9c5ea26..f4b9a6d 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zaru.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zaru.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zvu.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zvu.c.o index 66fc028..901ae1f 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zvu.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/real_time/rt_zvu.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rinex.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rinex.c.o index a659bb4..40ed227 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rinex.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rinex.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rt17.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rt17.c.o index 288babe..3d0c6f8 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rt17.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rt17.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm.c.o index 4328ad3..6699cb4 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm2.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm2.c.o index fe2a602..e500a45 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm2.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm2.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3.c.o index b09c2b3..4f457ab 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3e.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3e.c.o index d0bf854..b6206cb 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3e.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtcm3e.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkcmn.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkcmn.c.o index 98457b1..c68c470 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkcmn.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkcmn.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkpos.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkpos.c.o index c9d3c76..623e285 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkpos.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtkpos.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtksvr.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtksvr.c.o index 64fe657..3c6b65a 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtksvr.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/rtksvr.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/sbas.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/sbas.c.o index 207bc06..6582943 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/sbas.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/sbas.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/septentrio.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/septentrio.c.o index ee336d9..7f4e15e 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/septentrio.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/septentrio.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/skytraq.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/skytraq.c.o index 36d8f0b..48b836f 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/skytraq.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/skytraq.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/solution.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/solution.c.o index c2542de..d33dba9 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/solution.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/solution.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/stream.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/stream.c.o index 6b39dae..6ff42ca 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/stream.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/stream.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/streamsvr.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/streamsvr.c.o index 18db5b3..3fc4e67 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/streamsvr.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/streamsvr.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/swiftnav.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/swiftnav.c.o index 935dd89..24cbcec 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/swiftnav.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/swiftnav.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tides.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tides.c.o index 7fe616a..4d4abff 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tides.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tides.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tle.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tle.c.o index cc461e7..27441d8 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tle.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/tle.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ublox.c.o b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ublox.c.o index 8149b50..126e3ce 100644 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ublox.c.o and b/TC_NAV_Zjut_post/cmake-build-debug/CMakeFiles/TC_NAV_Zjut.dir/Src/ublox.c.o differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/TC_NAV_Zjut b/TC_NAV_Zjut_post/cmake-build-debug/TC_NAV_Zjut index 1bf33f5..252714c 100755 Binary files a/TC_NAV_Zjut_post/cmake-build-debug/TC_NAV_Zjut and b/TC_NAV_Zjut_post/cmake-build-debug/TC_NAV_Zjut differ diff --git a/TC_NAV_Zjut_post/cmake-build-debug/Testing/Temporary/LastTest.log b/TC_NAV_Zjut_post/cmake-build-debug/Testing/Temporary/LastTest.log index 6f4fb82..350cb99 100644 --- a/TC_NAV_Zjut_post/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/TC_NAV_Zjut_post/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Feb 02 14:21 CST +Start testing: Feb 19 15:05 CST ---------------------------------------------------------- -End testing: Feb 02 14:21 CST +End testing: Feb 19 15:05 CST diff --git a/TC_NAV_Zjut_post/include/rtklib.h b/TC_NAV_Zjut_post/include/rtklib.h index a44be62..b912b9b 100644 --- a/TC_NAV_Zjut_post/include/rtklib.h +++ b/TC_NAV_Zjut_post/include/rtklib.h @@ -1610,6 +1610,10 @@ EXPORT int xnBa(const insopt_t *insopt); EXPORT int xnBg(const insopt_t *insopt); EXPORT int xnRb(const insopt_t *insopt); EXPORT int xnRd(const insopt_t *insopt); +EXPORT int xnI(const insopt_t *insopt); +EXPORT int xnT(const insopt_t *insopt); +EXPORT int xnCl(const insopt_t *insopt); + EXPORT int xiP(const insopt_t *insopt); EXPORT int xnIF(const insopt_t *opt); EXPORT int xiV(const insopt_t *insopt); @@ -1617,6 +1621,9 @@ EXPORT int xiA(const insopt_t *insopt); EXPORT int xiBa(const insopt_t *insopt); EXPORT int xiBg(const insopt_t *insopt); EXPORT int xiBs(const insopt_t *insopt,int s,int f); +EXPORT int xiIo(const insopt_t *insopt,int s); +EXPORT int xiTr(const insopt_t *insopt,int r); + EXPORT void rt_insopt_init(insopt_t *insopt); EXPORT void initP(int is,int ni,int nx,double unc,double unc0,double *P0); EXPORT int ant2ins(gtime_t time, const double *rr, const double *vr,