mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-09-14 11:57:33 +02:00
commit 198318654d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,6 +1082,12 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg)
case 8: // L1+L5 case 8: // L1+L5
rp->log_rinex_nav(rp->navFile, new_eph); rp->log_rinex_nav(rp->navFile, new_eph);
break; 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 case 11: // GPS L1 C/A + Galileo E5b
rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph); rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph);
break; 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; new_gal_eph[galileo_eph->i_satellite_PRN] = *galileo_eph;
switch (type_of_rx) 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 case 6: // Galileo E5b only
rp->log_rinex_nav(rp->navGalFile, new_gal_eph); rp->log_rinex_nav(rp->navGalFile, new_gal_eph);
break; 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); rp->log_rinex_nav(rp->navMixFile, new_eph, new_gal_eph);
break; 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); rp->log_rinex_nav(rp->navFile, new_cnav_eph, new_gal_eph);
break; break;
case 15: // Galileo E1B + Galileo E5b case 15: // Galileo E1B + Galileo E5b
rp->log_rinex_nav(rp->navGalFile, new_gal_eph); rp->log_rinex_nav(rp->navGalFile, new_gal_eph);
break; 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); rp->log_rinex_nav(rp->navMixFile, new_gal_eph, new_glo_eph);
break; 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); rp->log_rinex_nav(rp->navMixFile, new_gal_eph, new_glo_eph);
break; break;
case 32: // L1+E1+L5+E5a case 32: // L1+E1+L5+E5a