Skip to content
Snippets Groups Projects
Commit 04702d5a authored by Pep Martí Saumell's avatar Pep Martí Saumell
Browse files

Added git ignore 

Added default values into allocateEphemeris functions
parent 3a959a6a
No related branches found
No related tags found
1 merge request!2Resolve "Enable Standard Point Positioning (SPP) computation"
This commit is part of merge request !2. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
.gitignore 0 → 100644
+ 4
− 0
View file @ 04702d5a
#Ignore build, bin and lib folders
bin/
build/
lib/
include/navigation.h
+ 4
− 4
View file @ 04702d5a
...@@ -35,19 +35,19 @@ namespace GNSSUtils ...@@ -35,19 +35,19 @@ namespace GNSSUtils
// Ephemeris // Ephemeris
void allocateEphemeris(); void allocateEphemeris(int n_sat = MAXSAT);
void deleteEphemeris(); void deleteEphemeris();
void allocateGLONASSEphemeris(); void allocateGLONASSEphemeris(int n_sat = NSATGLO);
void deleteGLONASSEphemeris(); void deleteGLONASSEphemeris();
void allocateSBASEphemeris(); //SBAS void allocateSBASEphemeris(int n_sat = NSATSBS*2); //SBAS
void deleteSBASEphemeris(); void deleteSBASEphemeris();
void allocateAlmanac(); void allocateAlmanac(int n_sat = MAXSAT);
void deleteAlmanac(); void deleteAlmanac();
......
src/navigation.cpp
+ 45
− 45
View file @ 04702d5a
...@@ -47,7 +47,7 @@ void Navigation::clearNavigation() ...@@ -47,7 +47,7 @@ void Navigation::clearNavigation()
this->deletewlbias(); this->deletewlbias();
this->deleteglocpbias(); this->deleteglocpbias();
this->deleteglofcn(); this->deleteglofcn();
this->deletepcv(); this->deletepcv();
this->deletesbsion(); this->deletesbsion();
*/ */
...@@ -56,13 +56,13 @@ void Navigation::clearNavigation() ...@@ -56,13 +56,13 @@ void Navigation::clearNavigation()
void Navigation::setNavigation(nav_t nav) void Navigation::setNavigation(nav_t nav)
{ {
/* /*
allocateEphemeris(); allocateEphemeris();
allocateGLONASSEphemeris(); allocateGLONASSEphemeris();
allocateSBASEphemeris(); allocateSBASEphemeris();
allocateAlmanac(); allocateAlmanac();
this->allocateUTCGPS(4); this->allocateUTCGPS(4);
this->allocateUTCGlo(4); this->allocateUTCGlo(4);
this->allocateUTCGal(4); this->allocateUTCGal(4);
...@@ -81,11 +81,11 @@ void Navigation::setNavigation(nav_t nav) ...@@ -81,11 +81,11 @@ void Navigation::setNavigation(nav_t nav)
this->allocatewlbias(MAXSAT); this->allocatewlbias(MAXSAT);
this->allocateglocpbias(4); this->allocateglocpbias(4);
this->allocateglofcn(MAXPRNGLO+1); this->allocateglofcn(MAXPRNGLO+1);
this->allocatepcv(MAXSAT); this->allocatepcv(MAXSAT);
this->allocatesbsion(MAXBAND+1); this->allocatesbsion(MAXBAND+1);
*/ */
_nav = nav; _nav = nav;
} }
...@@ -99,19 +99,19 @@ nav_t Navigation::getNavigation() ...@@ -99,19 +99,19 @@ nav_t Navigation::getNavigation()
/****************** Array memory management ******************/ /****************** Array memory management ******************/
void Navigation::allocateEphemeris() void Navigation::allocateEphemeris(int n_sat)
{ {
eph_t eph0 ={0,-1,-1}; eph_t eph0 ={0,-1,-1};
int i; int i;
_nav.eph = (eph_t *) malloc(sizeof(eph_t)*MAXSAT); _nav.eph = (eph_t *) malloc(sizeof(eph_t)*n_sat);
for (i=0;i<MAXSAT;i++) _nav.eph[i] = eph0; for (i=0;i<n_sat;i++) _nav.eph[i] = eph0;
/* /*
if (this->_nav->eph) if (this->_nav->eph)
{ {
//_nav->eph = (eph_t *)realloc(_nav->eph, 2 * MAXSAT * sizeof(eph_t)); //_nav->eph = (eph_t *)realloc(_nav->eph, 2 * MAXSAT * sizeof(eph_t));
} }
else else
{ {
this->_nav->eph = (eph_t *) malloc(2 * MAXSAT * sizeof(eph_t)); this->_nav->eph = (eph_t *) malloc(2 * MAXSAT * sizeof(eph_t));
...@@ -136,32 +136,32 @@ void Navigation::deleteEphemeris() ...@@ -136,32 +136,32 @@ void Navigation::deleteEphemeris()
} }
void Navigation::allocateGLONASSEphemeris() void Navigation::allocateGLONASSEphemeris(int n_sat)
{ {
geph_t geph0={0,-1}; geph_t geph0={0,-1};
int i; int i;
_nav.geph = (geph_t *)malloc(sizeof(geph_t)*NSATGLO); _nav.geph = (geph_t *)malloc(sizeof(geph_t)*n_sat);
/* /*
for (i=0;i<NSATGLO ;i++) _nav.geph[i] = geph0; for (i=0;i<NSATGLO ;i++) _nav.geph[i] = geph0;
if (this->_nav->geph) if (this->_nav->geph)
{ {
//_nav->geph = (geph_t *)realloc(_nav->geph, NSATGLO * sizeof(geph_t)); //_nav->geph = (geph_t *)realloc(_nav->geph, NSATGLO * sizeof(geph_t));
} }
else else
{ {
this->_nav->geph = (geph_t *) malloc(2 * NSATGLO * sizeof(geph_t)); this->_nav->geph = (geph_t *) malloc(2 * NSATGLO * sizeof(geph_t));
} }
*/ */
} }
void Navigation::deleteGLONASSEphemeris() void Navigation::deleteGLONASSEphemeris()
{ {
/* /*
free(_nav->geph); free(_nav->geph);
if (_nav->geph) if (_nav->geph)
{ {
free(_nav->geph); free(_nav->geph);
...@@ -174,18 +174,19 @@ void Navigation::deleteGLONASSEphemeris() ...@@ -174,18 +174,19 @@ void Navigation::deleteGLONASSEphemeris()
*/ */
} }
void Navigation::allocateSBASEphemeris() void Navigation::allocateSBASEphemeris(int n_sat)
{ {
seph_t seph0={0}; seph_t seph0={0};
int i; int i;
_nav.seph = (seph_t *)malloc(sizeof(seph_t)*NSATSBS*2);
for (i=0;i<NSATSBS ;i++) _nav.seph[i] = seph0; _nav.seph = (seph_t *)malloc(sizeof(seph_t)*n_sat);
for (i=0; i<n_sat; i++) _nav.seph[i] = seph0;
/* /*
if (this->_nav->seph) if (this->_nav->seph)
{ {
//_nav->seph = (seph_t *)realloc(_nav->seph, NSATSBS * sizeof(seph_t)); //_nav->seph = (seph_t *)realloc(_nav->seph, NSATSBS * sizeof(seph_t));
} }
else else
{ {
this->_nav->seph = (seph_t *) malloc(2 * NSATSBS * sizeof(seph_t)); this->_nav->seph = (seph_t *) malloc(2 * NSATSBS * sizeof(seph_t));
...@@ -197,7 +198,7 @@ void Navigation::deleteSBASEphemeris() ...@@ -197,7 +198,7 @@ void Navigation::deleteSBASEphemeris()
{ {
/* /*
free(_nav->seph); free(_nav->seph);
if (_nav->seph) if (_nav->seph)
{ {
free(_nav->seph); free(_nav->seph);
...@@ -210,18 +211,19 @@ void Navigation::deleteSBASEphemeris() ...@@ -210,18 +211,19 @@ void Navigation::deleteSBASEphemeris()
*/ */
} }
void Navigation::allocateAlmanac() void Navigation::allocateAlmanac(int n_sat)
{ {
alm_t alm0 ={0,-1}; alm_t alm0 ={0,-1};
int i; int i;
_nav.alm = (alm_t *)malloc(sizeof(alm_t)*MAXSAT);
for (i=0;i<MAXSAT ;i++) _nav.alm[i] = alm0; _nav.alm = (alm_t *)malloc(sizeof(alm_t)*n_sat);
for (i=0; i<n_sat; i++) _nav.alm[i] = alm0;
/* /*
if (this->_nav->alm) if (this->_nav->alm)
{ {
//_nav->alm = (alm_t *)realloc(_nav->alm, MAXSAT * sizeof(alm_t)); //_nav->alm = (alm_t *)realloc(_nav->alm, MAXSAT * sizeof(alm_t));
} }
else else
{ {
this->_nav->alm = (alm_t *) malloc(2 * MAXSAT * sizeof(alm_t)); this->_nav->alm = (alm_t *) malloc(2 * MAXSAT * sizeof(alm_t));
...@@ -233,7 +235,7 @@ void Navigation::deleteAlmanac() ...@@ -233,7 +235,7 @@ void Navigation::deleteAlmanac()
{ {
/* /*
free(_nav->alm); free(_nav->alm);
if (_nav->alm) if (_nav->alm)
{ {
free(_nav->alm); free(_nav->alm);
...@@ -255,7 +257,7 @@ void Navigation::allocateUTCGPS(int n) //GPS ...@@ -255,7 +257,7 @@ void Navigation::allocateUTCGPS(int n) //GPS
{ {
_nav->utc_gps = (double *)realloc(_nav->utc_gps, n * sizeof(double)); _nav->utc_gps = (double *)realloc(_nav->utc_gps, n * sizeof(double));
} }
else else
{ {
_nav->utc_gps = (double *) malloc(n * sizeof(double)); _nav->utc_gps = (double *) malloc(n * sizeof(double));
...@@ -284,7 +286,7 @@ void Navigation::allocateUTCGlo(int n) //GLONASS ...@@ -284,7 +286,7 @@ void Navigation::allocateUTCGlo(int n) //GLONASS
{ {
_nav->utc_glo = (double *)realloc(_nav->utc_glo, n * sizeof(double)); _nav->utc_glo = (double *)realloc(_nav->utc_glo, n * sizeof(double));
} }
else else
{ {
_nav->utc_glo = (double *) malloc(n * sizeof(double)); _nav->utc_glo = (double *) malloc(n * sizeof(double));
...@@ -312,7 +314,7 @@ void Navigation::allocateUTCGal(int n) //Galileo ...@@ -312,7 +314,7 @@ void Navigation::allocateUTCGal(int n) //Galileo
{ {
_nav->utc_gal = (double *)realloc(_nav->utc_gal, n * sizeof(double)); _nav->utc_gal = (double *)realloc(_nav->utc_gal, n * sizeof(double));
} }
else else
{ {
_nav->utc_gal = (double *) malloc(n * sizeof(double)); _nav->utc_gal = (double *) malloc(n * sizeof(double));
...@@ -340,7 +342,7 @@ void Navigation::allocateUTCQZS(int n) //QZS ...@@ -340,7 +342,7 @@ void Navigation::allocateUTCQZS(int n) //QZS
{ {
_nav->utc_qzs = (double *)realloc(_nav->utc_qzs, n * sizeof(double)); _nav->utc_qzs = (double *)realloc(_nav->utc_qzs, n * sizeof(double));
} }
else else
{ {
_nav->utc_qzs = (double *) malloc(n * sizeof(double)); _nav->utc_qzs = (double *) malloc(n * sizeof(double));
...@@ -368,7 +370,7 @@ void Navigation::allocateUTCCMP(int n) //BeiDou ...@@ -368,7 +370,7 @@ void Navigation::allocateUTCCMP(int n) //BeiDou
{ {
_nav->utc_cmp = (double *)realloc(_nav->utc_cmp, n * sizeof(double)); _nav->utc_cmp = (double *)realloc(_nav->utc_cmp, n * sizeof(double));
} }
else else
{ {
_nav->utc_cmp = (double *) malloc(n * sizeof(double)); _nav->utc_cmp = (double *) malloc(n * sizeof(double));
...@@ -396,7 +398,7 @@ void Navigation::allocateUTCSBAS(int n) //SBAS ...@@ -396,7 +398,7 @@ void Navigation::allocateUTCSBAS(int n) //SBAS
{ {
_nav->utc_sbs = (double *)realloc(_nav->utc_sbs, n * sizeof(double)); _nav->utc_sbs = (double *)realloc(_nav->utc_sbs, n * sizeof(double));
} }
else else
{ {
_nav->utc_sbs = (double *) malloc(n * sizeof(double)); _nav->utc_sbs = (double *) malloc(n * sizeof(double));
...@@ -425,7 +427,7 @@ void Navigation::allocateIonGPS(int n) //GPS ...@@ -425,7 +427,7 @@ void Navigation::allocateIonGPS(int n) //GPS
{ {
_nav->ion_gps = (double *)realloc(_nav->ion_gps, n * sizeof(double)); _nav->ion_gps = (double *)realloc(_nav->ion_gps, n * sizeof(double));
} }
else else
{ {
_nav->ion_gps = (double *) malloc(n * sizeof(double)); _nav->ion_gps = (double *) malloc(n * sizeof(double));
...@@ -453,7 +455,7 @@ void Navigation::allocateIonGal(int n) //Galileo ...@@ -453,7 +455,7 @@ void Navigation::allocateIonGal(int n) //Galileo
{ {
_nav->utc_gal = (double *)realloc(_nav->utc_gal, n * sizeof(double)); _nav->utc_gal = (double *)realloc(_nav->utc_gal, n * sizeof(double));
} }
else else
{ {
_nav->utc_gal = (double *) malloc(n * sizeof(double)); _nav->utc_gal = (double *) malloc(n * sizeof(double));
...@@ -481,7 +483,7 @@ void Navigation::allocateIonQZS(int n) //QZS ...@@ -481,7 +483,7 @@ void Navigation::allocateIonQZS(int n) //QZS
{ {
_nav->utc_qzs = (double *)realloc(_nav->utc_qzs, n * sizeof(double)); _nav->utc_qzs = (double *)realloc(_nav->utc_qzs, n * sizeof(double));
} }
else else
{ {
_nav->utc_qzs = (double *) malloc(n * sizeof(double)); _nav->utc_qzs = (double *) malloc(n * sizeof(double));
...@@ -509,7 +511,7 @@ void Navigation::allocateIonCMP(int n) //BeiDou ...@@ -509,7 +511,7 @@ void Navigation::allocateIonCMP(int n) //BeiDou
{ {
_nav->utc_cmp = (double *)realloc(_nav->utc_cmp, n * sizeof(double)); _nav->utc_cmp = (double *)realloc(_nav->utc_cmp, n * sizeof(double));
} }
else else
{ {
_nav->utc_cmp = (double *) malloc(n * sizeof(double)); _nav->utc_cmp = (double *) malloc(n * sizeof(double));
...@@ -538,7 +540,7 @@ void Navigation::allocatelam(int n) ...@@ -538,7 +540,7 @@ void Navigation::allocatelam(int n)
{ {
_nav->lam = (double *)realloc(_nav->lam, n * sizeof(double)); _nav->lam = (double *)realloc(_nav->lam, n * sizeof(double));
} }
else else
{ {
_nav->lam = (double *) malloc(n * sizeof(double)); _nav->lam = (double *) malloc(n * sizeof(double));
...@@ -566,7 +568,7 @@ void Navigation::allocatecbias(int n) ...@@ -566,7 +568,7 @@ void Navigation::allocatecbias(int n)
{ {
_nav->cbias = (double *)realloc(_nav->cbias, n * sizeof(double)); _nav->cbias = (double *)realloc(_nav->cbias, n * sizeof(double));
} }
else else
{ {
_nav->cbias = (double *) malloc(n * sizeof(double)); _nav->cbias = (double *) malloc(n * sizeof(double));
...@@ -594,7 +596,7 @@ void Navigation::allocatewlbias(int n) ...@@ -594,7 +596,7 @@ void Navigation::allocatewlbias(int n)
{ {
_nav->wlbias = (double *)realloc(_nav->wlbias, n * sizeof(double)); _nav->wlbias = (double *)realloc(_nav->wlbias, n * sizeof(double));
} }
else else
{ {
_nav->wlbias = (double *) malloc(n * sizeof(double)); _nav->wlbias = (double *) malloc(n * sizeof(double));
...@@ -622,7 +624,7 @@ void Navigation::allocateglocpbias(int n) ...@@ -622,7 +624,7 @@ void Navigation::allocateglocpbias(int n)
{ {
_nav->glo_cpbias = (double *)realloc(_nav->glo_cpbias, n * sizeof(double)); _nav->glo_cpbias = (double *)realloc(_nav->glo_cpbias, n * sizeof(double));
} }
else else
{ {
_nav->glo_cpbias = (double *) malloc(n * sizeof(double)); _nav->glo_cpbias = (double *) malloc(n * sizeof(double));
...@@ -650,7 +652,7 @@ void Navigation::allocateglofcn(int n) ...@@ -650,7 +652,7 @@ void Navigation::allocateglofcn(int n)
{ {
_nav->glo_fcn = (char *)realloc(_nav->glo_fcn, n * sizeof(char)); _nav->glo_fcn = (char *)realloc(_nav->glo_fcn, n * sizeof(char));
} }
else else
{ {
_nav->glo_fcn = (char *) malloc(n * sizeof(char)); _nav->glo_fcn = (char *) malloc(n * sizeof(char));
...@@ -678,7 +680,7 @@ void Navigation::allocatepcv(int n) ...@@ -678,7 +680,7 @@ void Navigation::allocatepcv(int n)
{ {
_nav->pcvs = (pcv_t *)realloc(_nav->pcvs, n * sizeof(pcv_t)); _nav->pcvs = (pcv_t *)realloc(_nav->pcvs, n * sizeof(pcv_t));
} }
else else
{ {
_nav->pcvs = (pcv_t*) malloc(n * sizeof(pcv_t)); _nav->pcvs = (pcv_t*) malloc(n * sizeof(pcv_t));
...@@ -706,7 +708,7 @@ void Navigation::allocatesbsion(int n) ...@@ -706,7 +708,7 @@ void Navigation::allocatesbsion(int n)
{ {
_nav->sbsion = (sbsion_t *)realloc(_nav->sbsion, n * sizeof(sbsion_t)); _nav->sbsion = (sbsion_t *)realloc(_nav->sbsion, n * sizeof(sbsion_t));
} }
else else
{ {
_nav->sbsion = (sbsion_t*) malloc(n * sizeof(sbsion_t)); _nav->sbsion = (sbsion_t*) malloc(n * sizeof(sbsion_t));
...@@ -727,5 +729,3 @@ void Navigation::deletesbsion() ...@@ -727,5 +729,3 @@ void Navigation::deletesbsion()
} }
} }
*/ */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment