From 580014b8989ef0937bfdd2994b75a67b630b3912 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Fri, 4 Sep 2020 13:13:20 +0200
Subject: [PATCH] commented printf
---
src/ephemeris.c | 20 +++++++++++---------
src/rcv/ublox.c | 8 ++++----
src/sbas.c | 34 ++++++++++++++++++----------------
3 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/ephemeris.c b/src/ephemeris.c
index 6a25ae9..7a6605f 100644
--- a/src/ephemeris.c
+++ b/src/ephemeris.c
@@ -414,7 +414,7 @@ static eph_t *seleph(gtime_t time, int sat, int iode, const nav_t *nav)
tmin=tmax+1.0;
//DEBUG
- if (iode != -1)
+ /*if (iode != -1)
{
printf("- available iodes: ");
for (i=0;i<nav->n;i++)
@@ -564,8 +564,9 @@ static int satpos_sbas(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
int i;
trace(4,"satpos_sbas: time=%s sat=%3d\n",time_str(time,3),sat);
- if (satsys(sat,NULL)!=SYS_GAL && satsys(sat,NULL)!=SYS_SBS)
- printf("satpos_sbas: sat=%3d ",sat);
+ //DEBUG
+ /*if (satsys(sat,NULL)!=SYS_GAL && satsys(sat,NULL)!=SYS_SBS)
+ printf("satpos_sbas: sat=%3d ",sat);//*/
/* search sbas satellite correciton */
for (i=0;i<nav->sbssat.nsat;i++) {
@@ -574,8 +575,9 @@ static int satpos_sbas(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
}
if (i>=nav->sbssat.nsat || sbs->lcorr.iode < 0) {
trace(2,"no sbas correction for orbit: %s sat=%3d\n",time_str(time,0),sat);
- if (satsys(sat,NULL)!=SYS_GAL && satsys(sat,NULL)!=SYS_SBS)
- printf("no sbas correction (i>=nav->sbssat.nsat || sbs->lcorr.iode < 0)\n");
+ //DEBUG
+ /*if (satsys(sat,NULL)!=SYS_GAL && satsys(sat,NULL)!=SYS_SBS)
+ printf("no sbas correction (i>=nav->sbssat.nsat || sbs->lcorr.iode < 0)\n");//*/
if (ephpos(time,teph,sat,nav,-1,rs,dts,var,svh))
*svh=-2;// JV: error code for detecting available ephemeris without sbas correction
else
@@ -586,18 +588,18 @@ static int satpos_sbas(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
return 0;
}
/* satellite postion and clock by broadcast ephemeris */
- printf("lcorr.iode=%3d ",sbs->lcorr.iode);
+ //printf("lcorr.iode=%3d ",sbs->lcorr.iode);
if (!ephpos(time,teph,sat,nav,sbs->lcorr.iode,rs,dts,var,svh)){
- printf("not found\n");
+ //printf("not found\n");
return 0;
}
/* sbas satellite correction (long term and fast) */
if (sbssatcorr(time,sat,nav,rs,dts,var)){
- printf("OK!\n");
+ //printf("OK!\n");
return 1;
}
- printf("no sbas correction (!sbssatcorr())\n");
+ //printf("no sbas correction (!sbssatcorr())\n");
*svh=-1;
return 0;
}
diff --git a/src/rcv/ublox.c b/src/rcv/ublox.c
index 3f4e5ba..1e07b25 100644
--- a/src/rcv/ublox.c
+++ b/src/rcv/ublox.c
@@ -400,7 +400,7 @@ static int decode_rxmrawx(raw_t *raw)
prstd=1<<(prstd>=5?prstd-5:0); /* prstd=2^(x-5) */
tstat=U1(p+30); /* trkStat */
if (!(tstat&1)){
- printf("tstat&1 invalid psedorange setting P=0.0\n");
+ //printf("tstat&1 invalid psedorange setting P=0.0\n");
P=0.0;
}
if (!(tstat&2)||L==-0.5||cpstd>cpstd_valid){
@@ -523,7 +523,7 @@ static int decode_ephem(int sat, raw_t *raw)
eph.sat=sat;
raw->nav.eph[sat-1]=eph;
raw->ephsat=sat;
- printf("\tdecode_ephem sat %3d eph.iode = %d\n", sat, eph.iode);
+ //printf("\tdecode_ephem sat %3d eph.iode = %d\n", sat, eph.iode);
return 2;
}
/* decode almanac and ion/utc ------------------------------------------------*/
@@ -1022,7 +1022,7 @@ static int decode_enav(raw_t *raw, int sat, int off)
eph.sat=sat;
raw->nav.eph[sat-1]=eph;
raw->ephsat=sat;
- printf("\tdecode_enav sat %3d eph.iode = %d\n", sat, eph.iode);
+ //printf("\tdecode_enav sat %3d eph.iode = %d\n", sat, eph.iode);
return 2;
}
/* decode beidou navigation data ---------------------------------------------*/
@@ -1136,7 +1136,7 @@ static int decode_gnav(raw_t *raw, int sat, int off, int frq)
}
raw->nav.geph[prn-1]=geph;
raw->ephsat=sat;
- printf("\tdecode_gnav geph.iode = %d\n", geph.iode);
+ //printf("\tdecode_gnav geph.iode = %d\n", geph.iode);
return 2;
}
/* decode sbas navigation data -----------------------------------------------*/
diff --git a/src/sbas.c b/src/sbas.c
index fbc7cc4..b36c8c2 100644
--- a/src/sbas.c
+++ b/src/sbas.c
@@ -187,7 +187,7 @@ static int decode_sbstype1(const sbsmsg_t *msg, sbssat_t *sbssat)
{
// store old
old_sat[i] = sbssat->sat[i];
- printf("old_sat[%d].sat = %d\n", i, old_sat[i].sat);
+ //printf("old_sat[%d].sat = %d\n", i, old_sat[i].sat);
// remove current
sbssat->sat[i] = sbssat_zero;
// initialize new
@@ -208,12 +208,12 @@ static int decode_sbstype1(const sbsmsg_t *msg, sbssat_t *sbssat)
new_sat[new_n++].sat=sat;
//sbssat->sat[n++].sat=sat;
//printf(" sat: %d\n",sat);
- printf("new_sat[%d].sat = %d\n", new_n-1, new_sat[new_n-1].sat);
+ //printf("new_sat[%d].sat = %d\n", new_n-1, new_sat[new_n-1].sat);
}
}
// DEBUG
- if (sbssat->iodp==getbitu(msg->msg,224,2))
+ /*if (sbssat->iodp==getbitu(msg->msg,224,2))
{
if (new_n != old_n)
printf("!!!!!!!!!!!!!!!!!!!!\n!!!!!!!!!!!!!!!!!!!!\n!!!!!!!!!!!!!!!!!!!!\nnew_n != old_n!");
@@ -224,6 +224,8 @@ static int decode_sbstype1(const sbsmsg_t *msg, sbssat_t *sbssat)
}
if (sbssat->iodp!=getbitu(msg->msg,224,2))
printf(">>>>>>>>>>>>>>>>>>>>>>>\n>>>>>>>>>>>>>>>>>>>>>>>\n>>>>>>>>>>>>>>>>>>>>>>>\nIODP CHANGED\n>>>>>>>>>>>>>>>>>>>>>>>\n>>>>>>>>>>>>>>>>>>>>>>>\n>>>>>>>>>>>>>>>>>>>>>>>\n");
+ //*/
+
// merge new and old data
//if (new_n != old_n || sbssat->iodp!=getbitu(msg->msg,224,2))
//{
@@ -264,7 +266,7 @@ static int decode_sbstype1(const sbsmsg_t *msg, sbssat_t *sbssat)
i_old++;
}
}
- printf("sat[%d].sat = %d\n", n-1, sbssat->sat[n-1].sat);
+ //printf("sat[%d].sat = %d\n", n-1, sbssat->sat[n-1].sat);
}
//}
sbssat->iodp=getbitu(msg->msg,224,2);
@@ -284,7 +286,7 @@ static int decode_sbstype2(const sbsmsg_t *msg, sbssat_t *sbssat)
trace(4,"decode_sbstype2:\n");
if (sbssat->iodp!=(int)getbitu(msg->msg,16,2)){
- printf("decode_sbstype24 wrong iodp %3d (current %3d)\n", (int)getbitu(msg->msg,16,2), sbssat->iodp);
+ //printf("decode_sbstype24 wrong iodp %3d (current %3d)\n", (int)getbitu(msg->msg,16,2), sbssat->iodp);
return 0;
}
@@ -342,7 +344,7 @@ static int decode_sbstype7(const sbsmsg_t *msg, sbssat_t *sbssat)
trace(4,"decode_sbstype7\n");
if (sbssat->iodp!=(int)getbitu(msg->msg,18,2)){
- printf("decode_sbstype24 wrong iodp %3d (current %3d)\n", (int)getbitu(msg->msg,18,2), sbssat->iodp);
+ //printf("decode_sbstype24 wrong iodp %3d (current %3d)\n", (int)getbitu(msg->msg,18,2), sbssat->iodp);
return 0;
}
sbssat->tlat=getbitu(msg->msg,14,4);
@@ -434,7 +436,7 @@ static int decode_longcorr0(const sbsmsg_t *msg, int p, sbssat_t *sbssat)
if (n==0||n>MAXSAT) return 0;
sbssat->sat[n-1].lcorr.iode=getbitu(msg->msg,p+6,8);
- printf(" decode_longcorr0: sat=%d n=%d iode=%d\n",sbssat->sat[n-1].sat,n,sbssat->sat[n-1].lcorr.iode);
+ //printf(" decode_longcorr0: sat=%d n=%d iode=%d\n",sbssat->sat[n-1].sat,n,sbssat->sat[n-1].lcorr.iode);
for (i=0;i<3;i++) {
sbssat->sat[n-1].lcorr.dpos[i]=getbits(msg->msg,p+14+9*i,9)*0.125;
@@ -457,7 +459,7 @@ static int decode_longcorr1(const sbsmsg_t *msg, int p, sbssat_t *sbssat)
if (n==0||n>MAXSAT) return 0;
sbssat->sat[n-1].lcorr.iode=getbitu(msg->msg,p+6,8);
- printf(" decode_longcorr1: sat=%d n=%d iode=%d\n",sbssat->sat[n-1].sat,n,sbssat->sat[n-1].lcorr.iode);
+ //printf(" decode_longcorr1: sat=%d n=%d iode=%d\n",sbssat->sat[n-1].sat,n,sbssat->sat[n-1].lcorr.iode);
for (i=0;i<3;i++) {
sbssat->sat[n-1].lcorr.dpos[i]=getbits(msg->msg,p+14+i*11,11)*0.125;
@@ -497,7 +499,7 @@ static int decode_sbstype24(const sbsmsg_t *msg, sbssat_t *sbssat)
trace(4,"decode_sbstype24:\n");
if (sbssat->iodp!=(int)getbitu(msg->msg,110,2)){
- printf("decode_sbstype24 wrong iodp %3d (current %3d)\n", (int)getbitu(msg->msg,110,2), sbssat->iodp);
+ //printf("decode_sbstype24 wrong iodp %3d (current %3d)\n", (int)getbitu(msg->msg,110,2), sbssat->iodp);
return 0; /* check IODP */
}
@@ -567,8 +569,8 @@ extern int sbsupdatecorr(const sbsmsg_t *msg, nav_t *nav)
if (msg->week==0) return -1;
- printf("============== sbsupdatecorr: PROCESSING PRN %3d type=%d...\n",msg->prn, type);
- print_sbassat(&nav->sbssat);
+ //printf("============== sbsupdatecorr: PROCESSING PRN %3d type=%d...\n",msg->prn, type);
+ //print_sbassat(&nav->sbssat);
switch (type) {
case 0: stat=decode_sbstype2 (msg,&nav->sbssat); break;
@@ -588,8 +590,8 @@ extern int sbsupdatecorr(const sbsmsg_t *msg, nav_t *nav)
/*default: trace(2,"unsupported sbas message: type=%d\n",type); break;*/
}
- printf("============== sbsupdatecorr: type=%d PROCESSED result = %d!\n",type, stat?type:-1);
- print_sbassat(&nav->sbssat);
+ //printf("============== sbsupdatecorr: type=%d PROCESSED result = %d!\n",type, stat?type:-1);
+ //print_sbassat(&nav->sbssat);
return stat?type:-1;
}
/* read sbas log file --------------------------------------------------------*/
@@ -932,7 +934,7 @@ static int sbslongcorr(gtime_t time, int sat, const sbssat_t *sbssat,
if (fabs(t)>MAXSBSAGEL) {
trace(2,"sbas long-term correction expired: %s sat=%2d t=%5.0f\n",
time_str(time,0),sat,t);
- printf("sbas long-term corr expired");
+ //printf("sbas long-term corr expired");
return 0;
}
for (i=0;i<3;i++) drs[i]=p->lcorr.dpos[i]+p->lcorr.dvel[i]*t;
@@ -947,7 +949,7 @@ static int sbslongcorr(gtime_t time, int sat, const sbssat_t *sbssat,
if (satsys(sat,NULL)==SYS_SBS) return 1;
trace(2,"no sbas long-term correction: %s sat=%2d\n",time_str(time,0),sat);
- printf("no sbas long-term corr");
+ //printf("no sbas long-term corr");
return 0;
}
/* fast correction -----------------------------------------------------------*/
@@ -979,7 +981,7 @@ static int sbsfastcorr(gtime_t time, int sat, const sbssat_t *sbssat,
return 1;
}
trace(2,"no sbas fast correction: %s sat=%2d\n",time_str(time,0),sat);
- printf("no sbas fast corr");
+ //printf("no sbas fast corr");
return 0;
}
/* sbas satellite ephemeris and clock correction -------------------------------
--
GitLab