1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-18 21:23:02 +00:00

Fix RTCM messages for the GPS L1 + Gal E6 receiver

This commit is contained in:
Carles Fernandez 2022-09-15 12:14:40 +02:00
parent 30dd2e5048
commit ac690d9f3b

View File

@ -1471,10 +1471,8 @@ void Rtcm_Printer::Print_Rtcm_Messages(const Rtklib_Solver* pvt_solver,
}
if (rtcm_MSM_rate_ms != 0)
{
auto gal_eph_iter = pvt_solver->galileo_ephemeris_map.cbegin();
auto gps_eph_iter = pvt_solver->gps_ephemeris_map.cbegin();
int gps_channel = 0;
int gal_channel = 0;
for (const auto& gnss_observables_iter : gnss_observables_map)
{
const std::string system(gnss_observables_iter.second.System, 1);
@ -1490,26 +1488,11 @@ void Rtcm_Printer::Print_Rtcm_Messages(const Rtklib_Solver* pvt_solver,
}
}
}
if (gal_channel == 0)
{
if (system == "E")
{
gal_eph_iter = pvt_solver->galileo_ephemeris_map.find(gnss_observables_iter.second.PRN);
if (gal_eph_iter != pvt_solver->galileo_ephemeris_map.cend())
{
gal_channel = 1;
}
}
}
}
if (gps_eph_iter != pvt_solver->gps_ephemeris_map.cend())
{
Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, rx_time, gnss_observables_map, enable_rx_clock_correction, 0, 0, false, false);
}
if (gal_eph_iter != pvt_solver->galileo_ephemeris_map.cend())
{
Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, rx_time, gnss_observables_map, enable_rx_clock_correction, 0, 0, false, false);
}
}
d_rtcm_writing_started = true;
break;