mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-20 09:05:25 +00:00
Code Issues Releases Wiki Activity

Fix GLONASS, Beidou B3I and L5+E5a RINEX files generation

Browse Source
This commit is contained in:
Carles Fernandez
2019-09-15 18:10:05 +02:00
parent c7c50c37db
commit ddaf923090
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
View File

@@ -1197,7 +1197,7 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg)
rp->log_rinex_nav(rp->navFile, new_cnav_eph); rp->log_rinex_nav(rp->navFile, new_cnav_eph);
break; break;
case 13: // L5+E5a case 13: // L5+E5a
rp->log_rinex_nav(rp->navFile, new_cnav_eph, new_gal_eph); rp->log_rinex_nav(rp->navMixFile, new_cnav_eph, new_gal_eph);
break; break;
case 28: // GPS L2C + GLONASS L1 C/A case 28: // GPS L2C + GLONASS L1 C/A
rp->log_rinex_nav(rp->navMixFile, new_cnav_eph, new_glo_eph); rp->log_rinex_nav(rp->navMixFile, new_cnav_eph, new_glo_eph);
@@ -1449,6 +1449,12 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg)
new_glo_eph[glonass_gnav_eph->i_satellite_PRN] = *glonass_gnav_eph; new_glo_eph[glonass_gnav_eph->i_satellite_PRN] = *glonass_gnav_eph;
switch (type_of_rx) switch (type_of_rx)
{ {
case 23: // GLONASS L1 C/A
rp->log_rinex_nav(rp->navGloFile, new_glo_eph);
break;
case 24: // GLONASS L2 C/A
rp->log_rinex_nav(rp->navGloFile, new_glo_eph);
break;
case 25: // GLONASS L1 C/A + GLONASS L2 C/A case 25: // GLONASS L1 C/A + GLONASS L2 C/A
rp->log_rinex_nav(rp->navGloFile, new_glo_eph); rp->log_rinex_nav(rp->navGloFile, new_glo_eph);
break; break;
@@ -1557,6 +1563,9 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg)
case 500: // BDS B1I only case 500: // BDS B1I only
rp->log_rinex_nav(rp->navFile, new_bds_eph); rp->log_rinex_nav(rp->navFile, new_bds_eph);
break; break;
case 600: // BDS B3I only
rp->log_rinex_nav(rp->navFile, new_bds_eph);
break;
default: default:
break; break;
} }
@@ -2638,6 +2647,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
{ {
rp->rinex_obs_header(rp->obsFile, beidou_dnav_ephemeris_iter->second, d_rx_time, "B3"); rp->rinex_obs_header(rp->obsFile, beidou_dnav_ephemeris_iter->second, d_rx_time, "B3");
rp->rinex_nav_header(rp->navFile, d_user_pvt_solver->beidou_dnav_iono, d_user_pvt_solver->beidou_dnav_utc_model); rp->rinex_nav_header(rp->navFile, d_user_pvt_solver->beidou_dnav_iono, d_user_pvt_solver->beidou_dnav_utc_model);
rp->log_rinex_nav(rp->navFile, d_user_pvt_solver->beidou_dnav_ephemeris_map);
b_rinex_header_written = true; // do not write header anymore b_rinex_header_written = true; // do not write header anymore
} }
@@ -3014,6 +3024,18 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
b_rinex_header_updated = true; b_rinex_header_updated = true;
} }
break; break;
case 600: // BDS B3I only
if (beidou_dnav_ephemeris_iter != d_user_pvt_solver->beidou_dnav_ephemeris_map.cend())
{
rp->log_rinex_obs(rp->obsFile, beidou_dnav_ephemeris_iter->second, d_rx_time, gnss_observables_map, "B3");
}
if (!b_rinex_header_updated and (d_user_pvt_solver->beidou_dnav_utc_model.d_A0_UTC != 0))
{
rp->update_obs_header(rp->obsFile, d_user_pvt_solver->beidou_dnav_utc_model);
rp->update_nav_header(rp->navFile, d_user_pvt_solver->beidou_dnav_utc_model, d_user_pvt_solver->beidou_dnav_iono);
b_rinex_header_updated = true;
}
break;
case 1000: // GPS L1 C/A + GPS L2C + GPS L5 case 1000: // GPS L1 C/A + GPS L2C + GPS L5
if ((gps_ephemeris_iter != d_user_pvt_solver->gps_ephemeris_map.cend()) and if ((gps_ephemeris_iter != d_user_pvt_solver->gps_ephemeris_map.cend()) and
(gps_cnav_ephemeris_iter != d_user_pvt_solver->gps_cnav_ephemeris_map.cend())) (gps_cnav_ephemeris_iter != d_user_pvt_solver->gps_cnav_ephemeris_map.cend()))