mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-30 23:03:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' into fix-nmea

Browse Source
This commit is contained in:
Carles Fernandez
2018-11-05 19:43:25 +01:00
parent 9bf8f14a54 e3446e47ca
commit f986fde4d0
4 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/algorithms/PVT/libs/rinex_printer.cc
View File

@@ -3296,8 +3296,8 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Glo
std::string line; std::string line;
std::map<int32_t, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_ephemeris_iter; std::map<int32_t, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_ephemeris_iter;
for (glonass_gnav_ephemeris_iter = eph_map.begin(); for (glonass_gnav_ephemeris_iter = eph_map.cbegin();
glonass_gnav_ephemeris_iter != eph_map.end(); glonass_gnav_ephemeris_iter != eph_map.cend();
glonass_gnav_ephemeris_iter++) glonass_gnav_ephemeris_iter++)
{ {
// -------- SV / EPOCH / SV CLK // -------- SV / EPOCH / SV CLK
@@ -7114,15 +7114,15 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
//Number of satellites observed in current epoch //Number of satellites observed in current epoch
int32_t numSatellitesObserved = 0; int32_t numSatellitesObserved = 0;
std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter; std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
numSatellitesObserved++; numSatellitesObserved++;
} }
line += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(numSatellitesObserved), 3); line += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(numSatellitesObserved), 3);
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
line += satelliteSystem["GLONASS"]; line += satelliteSystem["GLONASS"];
@@ -7135,8 +7135,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
Rinex_Printer::lengthCheck(line); Rinex_Printer::lengthCheck(line);
out << line << std::endl; out << line << std::endl;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
std::string lineObs; std::string lineObs;
@@ -7218,8 +7218,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
//Number of satellites observed in current epoch //Number of satellites observed in current epoch
int32_t numSatellitesObserved = 0; int32_t numSatellitesObserved = 0;
std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter; std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
numSatellitesObserved++; numSatellitesObserved++;
@@ -7233,8 +7233,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
Rinex_Printer::lengthCheck(line); Rinex_Printer::lengthCheck(line);
out << line << std::endl; out << line << std::endl;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
std::string lineObs; std::string lineObs;
@@ -7390,8 +7390,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
std::map<int32_t, Gnss_Synchro> observablesR2C; std::map<int32_t, Gnss_Synchro> observablesR2C;
std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter; std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
std::string system_(&observables_iter->second.System, 1); std::string system_(&observables_iter->second.System, 1);
@@ -7413,8 +7413,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
std::multimap<uint32_t, Gnss_Synchro> total_glo_map; std::multimap<uint32_t, Gnss_Synchro> total_glo_map;
std::set<uint32_t> available_glo_prns; std::set<uint32_t> available_glo_prns;
std::set<uint32_t>::iterator it; std::set<uint32_t>::iterator it;
for (observables_iter = observablesR1C.begin(); for (observables_iter = observablesR1C.cbegin();
observables_iter != observablesR1C.end(); observables_iter != observablesR1C.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;
@@ -7426,8 +7426,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
} }
} }
for (observables_iter = observablesR2C.begin(); for (observables_iter = observablesR2C.cbegin();
observables_iter != observablesR2C.end(); observables_iter != observablesR2C.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;
@@ -7446,8 +7446,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
if (version == 2) if (version == 2)
{ {
// Add list of GPS satellites // Add list of GPS satellites
for (observables_iter = observablesG1C.begin(); for (observables_iter = observablesG1C.cbegin();
observables_iter != observablesG1C.end(); observables_iter != observablesG1C.cend();
observables_iter++) observables_iter++)
{ {
line += satelliteSystem["GPS"]; line += satelliteSystem["GPS"];
@@ -7455,8 +7455,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
line += boost::lexical_cast<std::string>(static_cast<int32_t>(observables_iter->second.PRN)); line += boost::lexical_cast<std::string>(static_cast<int32_t>(observables_iter->second.PRN));
} }
// Add list of GLONASS L1 satellites // Add list of GLONASS L1 satellites
for (observables_iter = observablesR1C.begin(); for (observables_iter = observablesR1C.cbegin();
observables_iter != observablesR1C.end(); observables_iter != observablesR1C.cend();
observables_iter++) observables_iter++)
{ {
line += satelliteSystem["GLONASS"]; line += satelliteSystem["GLONASS"];
@@ -7464,8 +7464,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
line += boost::lexical_cast<std::string>(static_cast<int32_t>(observables_iter->second.PRN)); line += boost::lexical_cast<std::string>(static_cast<int32_t>(observables_iter->second.PRN));
} }
// Add list of GLONASS L2 satellites // Add list of GLONASS L2 satellites
for (observables_iter = observablesR2C.begin(); for (observables_iter = observablesR2C.cbegin();
observables_iter != observablesR2C.end(); observables_iter != observablesR2C.cend();
observables_iter++) observables_iter++)
{ {
line += satelliteSystem["GLONASS"]; line += satelliteSystem["GLONASS"];
@@ -7480,8 +7480,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
// -------- OBSERVATION record // -------- OBSERVATION record
std::string s; std::string s;
std::string lineObs; std::string lineObs;
for (observables_iter = observablesG1C.begin(); for (observables_iter = observablesG1C.cbegin();
observables_iter != observablesG1C.end(); observables_iter != observablesG1C.cend();
observables_iter++) observables_iter++)
{ {
lineObs.clear(); lineObs.clear();
@@ -7664,8 +7664,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
std::map<int32_t, Gnss_Synchro> observablesR2C; std::map<int32_t, Gnss_Synchro> observablesR2C;
std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter; std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
std::string system_(&observables_iter->second.System, 1); std::string system_(&observables_iter->second.System, 1);
@@ -7687,8 +7687,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
std::multimap<uint32_t, Gnss_Synchro> total_glo_map; std::multimap<uint32_t, Gnss_Synchro> total_glo_map;
std::set<uint32_t> available_glo_prns; std::set<uint32_t> available_glo_prns;
std::set<uint32_t>::iterator it; std::set<uint32_t>::iterator it;
for (observables_iter = observablesR1C.begin(); for (observables_iter = observablesR1C.cbegin();
observables_iter != observablesR1C.end(); observables_iter != observablesR1C.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;
@@ -7700,8 +7700,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
} }
} }
for (observables_iter = observablesR2C.begin(); for (observables_iter = observablesR2C.cbegin();
observables_iter != observablesR2C.end(); observables_iter != observablesR2C.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;
@@ -7725,8 +7725,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
// -------- OBSERVATION record // -------- OBSERVATION record
std::string s; std::string s;
std::string lineObs; std::string lineObs;
for (observables_iter = observablesG2S.begin(); for (observables_iter = observablesG2S.cbegin();
observables_iter != observablesG2S.end(); observables_iter != observablesG2S.cend();
observables_iter++) observables_iter++)
{ {
lineObs.clear(); lineObs.clear();
@@ -7904,8 +7904,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
std::map<int32_t, Gnss_Synchro> observablesR2C; std::map<int32_t, Gnss_Synchro> observablesR2C;
std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter; std::map<int32_t, Gnss_Synchro>::const_iterator observables_iter;
for (observables_iter = observables.begin(); for (observables_iter = observables.cbegin();
observables_iter != observables.end(); observables_iter != observables.cend();
observables_iter++) observables_iter++)
{ {
std::string system_(&observables_iter->second.System, 1); std::string system_(&observables_iter->second.System, 1);
@@ -7927,8 +7927,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
std::multimap<uint32_t, Gnss_Synchro> total_glo_map; std::multimap<uint32_t, Gnss_Synchro> total_glo_map;
std::set<uint32_t> available_glo_prns; std::set<uint32_t> available_glo_prns;
std::set<uint32_t>::iterator it; std::set<uint32_t>::iterator it;
for (observables_iter = observablesR1C.begin(); for (observables_iter = observablesR1C.cbegin();
observables_iter != observablesR1C.end(); observables_iter != observablesR1C.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;
@@ -7939,8 +7939,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
available_glo_prns.insert(prn_); available_glo_prns.insert(prn_);
} }
} }
for (observables_iter = observablesR2C.begin(); for (observables_iter = observablesR2C.cbegin();
observables_iter != observablesR2C.end(); observables_iter != observablesR2C.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;
@@ -7966,8 +7966,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
std::string s; std::string s;
std::string lineObs; std::string lineObs;
for (observables_iter = observablesE1B.begin(); for (observables_iter = observablesE1B.cbegin();
observables_iter != observablesE1B.end(); observables_iter != observablesE1B.cend();
observables_iter++) observables_iter++)
{ {
lineObs.clear(); lineObs.clear();
@@ -8747,8 +8747,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep
std::set<uint32_t>::iterator it; std::set<uint32_t>::iterator it;
if (found_1B != std::string::npos) if (found_1B != std::string::npos)
{ {
for (observables_iter = observablesE1B.begin(); for (observables_iter = observablesE1B.cbegin();
observables_iter != observablesE1B.end(); observables_iter != observablesE1B.cend();
observables_iter++) observables_iter++)
{ {
uint32_t prn_ = observables_iter->second.PRN; uint32_t prn_ = observables_iter->second.PRN;

7
src/algorithms/libs/CMakeLists.txt
View File

@@ -64,6 +64,7 @@ set(GNSS_SPLIBS_HEADERS
conjugate_ic.h conjugate_ic.h
gnss_sdr_create_directory.h gnss_sdr_create_directory.h
gnss_circular_deque.h gnss_circular_deque.h
geofunctions.h
) )
@@ -102,6 +103,7 @@ include_directories(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${GLOG_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS}
${ARMADILLO_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS}
${GNURADIO_BLOCKS_INCLUDE_DIRS} ${GNURADIO_BLOCKS_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS}
@@ -129,6 +131,7 @@ target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES}
${VOLK_LIBRARIES} ${ORC_LIBRARIES} ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
${GFlags_LIBS} ${GFlags_LIBS}
${ARMADILLO_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}
${GNURADIO_FFT_LIBRARIES} ${GNURADIO_FFT_LIBRARIES}
${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES}
@@ -137,7 +140,9 @@ target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES}
) )
if(NOT VOLK_GNSSSDR_FOUND) if(NOT VOLK_GNSSSDR_FOUND)
add_dependencies(gnss_sp_libs volk_gnsssdr_module) add_dependencies(gnss_sp_libs volk_gnsssdr_module armadillo-${armadillo_RELEASE})
else(NOT VOLK_GNSSSDR_FOUND)
add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE})
endif(NOT VOLK_GNSSSDR_FOUND) endif(NOT VOLK_GNSSSDR_FOUND)
if(${GFLAGS_GREATER_20}) if(${GFLAGS_GREATER_20})

6
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
View File

@@ -50,7 +50,7 @@
#include "GPS_L5.h" #include "GPS_L5.h"
#include "gps_l5_signal.h" #include "gps_l5_signal.h"
#include "gnss_sdr_create_directory.h" #include "gnss_sdr_create_directory.h"
#include <boost/lexical_cast.hpp> #include <boost/filesystem/path.hpp>
#include <glog/logging.h> #include <glog/logging.h>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
@@ -1091,7 +1091,7 @@ int32_t dll_pll_veml_tracking::save_matfile()
std::ifstream dump_file; std::ifstream dump_file;
std::string dump_filename_ = d_dump_filename; std::string dump_filename_ = d_dump_filename;
// add channel number to the filename // add channel number to the filename
dump_filename_.append(boost::lexical_cast<std::string>(d_channel)); dump_filename_.append(std::to_string(d_channel));
// add extension // add extension
dump_filename_.append(".dat"); dump_filename_.append(".dat");
std::cout << "Generating .mat file for " << dump_filename_ << std::endl; std::cout << "Generating .mat file for " << dump_filename_ << std::endl;
@@ -1335,7 +1335,7 @@ void dll_pll_veml_tracking::set_channel(uint32_t channel)
{ {
std::string dump_filename_ = d_dump_filename; std::string dump_filename_ = d_dump_filename;
// add channel number to the filename // add channel number to the filename
dump_filename_.append(boost::lexical_cast<std::string>(d_channel)); dump_filename_.append(std::to_string(d_channel));
// add extension // add extension
dump_filename_.append(".dat"); dump_filename_.append(".dat");

6
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
View File

@@ -48,7 +48,7 @@
#include "GPS_L5.h" #include "GPS_L5.h"
#include "gps_l5_signal.h" #include "gps_l5_signal.h"
#include "gnss_sdr_create_directory.h" #include "gnss_sdr_create_directory.h"
#include <boost/lexical_cast.hpp> #include <boost/filesystem/path.hpp>
#include <glog/logging.h> #include <glog/logging.h>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <matio.h> #include <matio.h>
@@ -999,7 +999,7 @@ int32_t dll_pll_veml_tracking_fpga::save_matfile()
std::ifstream dump_file; std::ifstream dump_file;
std::string dump_filename_ = d_dump_filename; std::string dump_filename_ = d_dump_filename;
// add channel number to the filename // add channel number to the filename
dump_filename_.append(boost::lexical_cast<std::string>(d_channel)); dump_filename_.append(std::to_string(d_channel));
// add extension // add extension
dump_filename_.append(".dat"); dump_filename_.append(".dat");
std::cout << "Generating .mat file for " << dump_filename_ << std::endl; std::cout << "Generating .mat file for " << dump_filename_ << std::endl;
@@ -1227,7 +1227,7 @@ void dll_pll_veml_tracking_fpga::set_channel(uint32_t channel)
{ {
std::string dump_filename_ = d_dump_filename; std::string dump_filename_ = d_dump_filename;
// add channel number to the filename // add channel number to the filename
dump_filename_.append(boost::lexical_cast<std::string>(d_channel)); dump_filename_.append(std::to_string(d_channel));
// add extension // add extension
dump_filename_.append(".dat"); dump_filename_.append(".dat");