Skip to content
Snippets Groups Projects
Commit e6fb46fa authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

bug in initialization of arrays and debugs couts removed

parent c9c4657b
No related branches found
No related tags found
2 merge requests!20new tag,!19new tag
...@@ -24,7 +24,7 @@ namespace GNSSUtils ...@@ -24,7 +24,7 @@ namespace GNSSUtils
if (output.pos_stat == 0) if (output.pos_stat == 0)
{ {
std::cout << "Bad computing: " << msg << "\n"; std::cout << "computePos: error in computing positioning, message: " << msg << "\n";
} }
output.time = sol.time.time; output.time = sol.time.time;
......
...@@ -4,12 +4,32 @@ using namespace GNSSUtils; ...@@ -4,12 +4,32 @@ using namespace GNSSUtils;
Navigation::Navigation() Navigation::Navigation()
{ {
// initialization // array initialization
nav_.n = nav_.nmax = nav_.ng = nav_.ngmax = nav_.ns = nav_.nsmax = nav_.ne = nav_.nemax = nav_.nc = nav_.ncmax = nav_.na = nav_.namax = nav_.nt = nav_.ntmax = nav_.nf = nav_.nfmax = 0;
nav_.eph = NULL;
nav_.geph = NULL;
nav_.seph = NULL;
nav_.peph = NULL;
nav_.pclk = NULL;
nav_.alm = NULL;
nav_.tec = NULL;
nav_.fcb = NULL;
clearNavigation(); clearNavigation();
} }
Navigation::Navigation(const Navigation& nav) Navigation::Navigation(const Navigation& nav)
{ {
// array initialization
nav_.n = nav_.nmax = nav_.ng = nav_.ngmax = nav_.ns = nav_.nsmax = nav_.ne = nav_.nemax = nav_.nc = nav_.ncmax = nav_.na = nav_.namax = nav_.nt = nav_.ntmax = nav_.nf = nav_.nfmax = 0;
nav_.eph = NULL;
nav_.geph = NULL;
nav_.seph = NULL;
nav_.peph = NULL;
nav_.pclk = NULL;
nav_.alm = NULL;
nav_.tec = NULL;
nav_.fcb = NULL;
clearNavigation();
setNavigation(nav.getNavigation()); setNavigation(nav.getNavigation());
} }
...@@ -225,12 +245,19 @@ void Navigation::freeNavigationArrays() ...@@ -225,12 +245,19 @@ void Navigation::freeNavigationArrays()
{ {
// RTKLIB "freenav(&nav_,255)" doesn't check if is NULL before freeing // RTKLIB "freenav(&nav_,255)" doesn't check if is NULL before freeing
freeEphemeris(); freeEphemeris();
//std::cout << "freeing glonass ephemeris...\n";
freeGlonassEphemeris(); freeGlonassEphemeris();
//std::cout << "freeing sbas ephemeris...\n";
freeSbasEphemeris(); freeSbasEphemeris();
//std::cout << "freeing precise ephemeris...\n";
freePreciseEphemeris(); freePreciseEphemeris();
//std::cout << "freeing precise clock...\n";
freePreciseClock(); freePreciseClock();
//std::cout << "freeing almanac...\n";
freeAlmanac(); freeAlmanac();
//std::cout << "freeing tec...\n";
freeTecData(); freeTecData();
//std::cout << "freeing fcb...\n";
freeFcbData(); freeFcbData();
} }
......
...@@ -27,34 +27,35 @@ RawDataType UBloxRaw::addDataStream(const std::vector<u_int8_t>& data_stream) ...@@ -27,34 +27,35 @@ RawDataType UBloxRaw::addDataStream(const std::vector<u_int8_t>& data_stream)
switch (raw_data_type_) switch (raw_data_type_)
{ {
case NO: // case NO: //
//std::cout << "0 received!\n";
break; break;
case OBS: // Observations case OBS: // Observations
std::cout << "Observations received!\n"; //std::cout << "Observations received!\n";
updateObservations(); updateObservations();
std::cout << "Observations updated!\n"; //std::cout << "Observations updated!\n";
break; break;
case NAV_EPH: // Ephemeris case NAV_EPH: // Ephemeris
std::cout << "Ephemeris received!\n"; std::cout << "Ephemeris received!\n";
nav_.copyEphemeris(raw_data_.nav); nav_.copyEphemeris(raw_data_.nav);
std::cout << "Ephemeris copied!\n"; //std::cout << "Ephemeris copied!\n";
break; break;
case NAV_SBAS: // SBAS case NAV_SBAS: // SBAS
std::cout << "SBAS received!\n"; std::cout << "SBAS received!\n";
nav_.addSbasMessage(raw_data_.sbsmsg); nav_.addSbasMessage(raw_data_.sbsmsg);
std::cout << "SBAS added!\n"; //std::cout << "SBAS added!\n";
break; break;
case NAV_ALM: // Almanac and ion/utc parameters case NAV_ALM: // Almanac and ion/utc parameters
std::cout << "Almanac and ion/utc parameters received!\n"; std::cout << "Almanac and ion/utc parameters received!\n";
nav_.freeAlmanac(); nav_.freeAlmanac();
std::cout << "Almanac freed!\n"; //std::cout << "Almanac freed!\n";
nav_.copyAlmanac(raw_data_.nav); nav_.copyAlmanac(raw_data_.nav);
std::cout << "Almanac copied!\n"; //std::cout << "Almanac copied!\n";
nav_.copyIonUtc(raw_data_.nav); nav_.copyIonUtc(raw_data_.nav);
std::cout << "ION UTC copied!\n"; //std::cout << "ION UTC copied!\n";
break; break;
// Not handled messages // Not handled messages
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment