mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Adding mixed navigation RINEX file data

Browse Source
This commit is contained in:
Carles Fernandez 2014-09-05 13:28:13 +02:00
parent 0d0c603420
commit 286cad820f
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
View File

@ -151,8 +151,6 @@ int hybrid_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
//d_rx_time = in[i][0].d_TOW_at_current_symbol; // all the channels have the same RX timestamp (common RX time pseudoranges) //d_rx_time = in[i][0].d_TOW_at_current_symbol; // all the channels have the same RX timestamp (common RX time pseudoranges)
d_TOW_at_curr_symbol_constellation = in[i][0].d_TOW_at_current_symbol; // d_TOW_at_current_symbol not corrected by delta t (just for debug) d_TOW_at_curr_symbol_constellation = in[i][0].d_TOW_at_current_symbol; // d_TOW_at_current_symbol not corrected by delta t (just for debug)
d_rx_time = in[i][0].d_TOW_hybrid_at_current_symbol; // hybrid rx time, all the channels have the same RX timestamp (common RX time pseudoranges) d_rx_time = in[i][0].d_TOW_hybrid_at_current_symbol; // hybrid rx time, all the channels have the same RX timestamp (common RX time pseudoranges)
//std::cout<<"CH PVT = "<< i << ", d_TOW = " << d_TOW_at_curr_symbol_constellation<<", rx_time_hybrid_PVT = " << d_rx_time << " same RX timestamp (common RX time pseudoranges)"<< std::endl;
} }
} }
@ -237,22 +235,22 @@ int hybrid_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
} }
} }
} }
//if(b_rinex_header_writen) // Put here another condition to separate annotations (e.g 30 s) if(b_rinex_header_writen) // Put here another condition to separate annotations (e.g 30 s)
// { {
// // Limit the RINEX navigation output rate to 1/6 seg // Limit the RINEX navigation output rate to 1/6 seg
// // Notice that d_sample_counter period is 4ms (for Galileo correlators) // Notice that d_sample_counter period is 4ms (for Galileo correlators)
// if ((d_sample_counter - d_last_sample_nav_output) >= 6000) if ((d_sample_counter - d_last_sample_nav_output) >= 6000)
// { {
// rp->log_rinex_nav(rp->navGalFile, d_ls_pvt->galileo_ephemeris_map); rp->log_rinex_nav(rp->navMixFile, d_ls_pvt->gps_ephemeris_map, d_ls_pvt->galileo_ephemeris_map);
// d_last_sample_nav_output = d_sample_counter; d_last_sample_nav_output = d_sample_counter;
// } }
// std::map<int, Galileo_Ephemeris>::iterator galileo_ephemeris_iter; // std::map<int, Galileo_Ephemeris>::iterator galileo_ephemeris_iter;
// galileo_ephemeris_iter = d_ls_pvt->galileo_ephemeris_map.begin(); // galileo_ephemeris_iter = d_ls_pvt->galileo_ephemeris_map.begin();
// if (galileo_ephemeris_iter != d_ls_pvt->galileo_ephemeris_map.end()) // if (galileo_ephemeris_iter != d_ls_pvt->galileo_ephemeris_map.end())
// { // {
// rp->log_rinex_obs(rp->obsFile, galileo_ephemeris_iter->second, d_rx_time, gnss_pseudoranges_map); // rp->log_rinex_obs(rp->obsFile, galileo_ephemeris_iter->second, d_rx_time, gnss_pseudoranges_map);
// } // }
// } }
} }
} }

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

@ -29,7 +29,7 @@
*/ */
#include "rinex_printer.h" #include "rinex_printer.h"
#include <unistd.h> #include <unistd.h> // for getlogin_r()
#include <algorithm> // for min and max #include <algorithm> // for min and max
#include <cmath> // for floor #include <cmath> // for floor
#include <cstdlib> // for getenv() #include <cstdlib> // for getenv()
@ -1388,6 +1388,14 @@ void Rinex_Printer::log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephe
} }
void Rinex_Printer::log_rinex_nav(std::ofstream& out, std::map<int, Gps_Ephemeris> gps_eph_map, std::map<int, Galileo_Ephemeris> galileo_eph_map)
{
version = 3;
stringVersion = "3.02";
Rinex_Printer::log_rinex_nav(out, gps_eph_map);
Rinex_Printer::log_rinex_nav(out, galileo_eph_map);
}
void Rinex_Printer::rinex_obs_header(std::ofstream& out, Gps_Ephemeris eph, double d_TOW_first_observation) void Rinex_Printer::rinex_obs_header(std::ofstream& out, Gps_Ephemeris eph, double d_TOW_first_observation)
{ {

5
src/algorithms/PVT/libs/rinex_printer.h
View File

@ -145,6 +145,11 @@ public:
*/ */
void log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephemeris> eph_map); void log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephemeris> eph_map);
/*!
* \brief Writes data from the Mixed (GPS/Galileo) navigation message into the RINEX file
*/
void log_rinex_nav(std::ofstream& out, std::map<int, Gps_Ephemeris> gps_eph_map, std::map<int, Galileo_Ephemeris> galileo_eph_map);
/*! /*!
* \brief Writes GPS observables into the RINEX file * \brief Writes GPS observables into the RINEX file
*/ */