From 73b49b979db4fd5e041f9f9ae93a08386b6987e8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 14 Sep 2019 11:57:08 +0200 Subject: [PATCH] More fixes to the generation of RINEX navigation files --- .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index fd0e547f0..aaee7d279 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -1082,6 +1082,12 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg) case 8: // L1+L5 rp->log_rinex_nav(rp->navFile, new_eph); break; + case 9: // GPS L1 C/A + Galileo E1B + rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); + break; + case 10: // GPS L1 C/A + Galileo E5a + rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); + break; case 11: // GPS L1 C/A + Galileo E5b rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); break; @@ -1283,22 +1289,34 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg) new_gal_eph[galileo_eph->i_satellite_PRN] = *galileo_eph; switch (type_of_rx) { + case 4: // Galileo E1B only + rp->log_rinex_nav(rp->navGalFile, new_gal_eph); + break; + case 5: // Galileo E5a only + rp->log_rinex_nav(rp->navGalFile, new_gal_eph); + break; case 6: // Galileo E5b only rp->log_rinex_nav(rp->navGalFile, new_gal_eph); break; - case 11: // GPS L1 C/A + Galileo E5b + case 9: // GPS L1 C/A + Galileo E1B rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); break; - case 13: // L5+E5a + case 10: // GPS L1 C/A + Galileo E5a + rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); + break; + case 11: // GPS L1 C/A + Galileo E5b + rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); + break; + case 13: // L5+E5a rp->log_rinex_nav(rp->navFile, new_cnav_eph, new_gal_eph); break; - case 15: // Galileo E1B + Galileo E5b + case 15: // Galileo E1B + Galileo E5b rp->log_rinex_nav(rp->navGalFile, new_gal_eph); break; - case 27: // Galileo E1B + GLONASS L1 C/A + case 27: // Galileo E1B + GLONASS L1 C/A rp->log_rinex_nav(rp->navMixFile, new_gal_eph, new_glo_eph); break; - case 30: // Galileo E1B + GLONASS L2 C/A + case 30: // Galileo E1B + GLONASS L2 C/A rp->log_rinex_nav(rp->navMixFile, new_gal_eph, new_glo_eph); break; case 32: // L1+E1+L5+E5a