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

Fix more rtcm printer issues

Browse Source
This commit is contained in:
Mathieu Favreau
2025-07-24 12:29:08 +00:00
parent 802b8bc1ff
commit ffd6893329
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2357,6 +2357,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
const bool rtcm_MT1077_enabled = d_rtcm_MT1077_rate_ms != 0;
const bool rtcm_MT1087_enabled = d_rtcm_MT1087_rate_ms != 0;
const bool rtcm_MT1097_enabled = d_rtcm_MT1097_rate_ms != 0;
const bool rtcm_MSM_enabled = d_rtcm_MSM_rate_ms != 0;
if (d_display_rate_ms != 0)
{
@@ -2379,7 +2380,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
flag_write_RTCM_1020_output = true;
}
}
if (rtcm_MT1045_enabled != 0)
if (rtcm_MT1045_enabled)
{
if (current_RX_time_ms % d_rtcm_MT1045_rate_ms == 0)
{
@@ -2401,7 +2402,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
// last_RTCM_1097_output_time = current_RX_time;
// }
if (d_rtcm_MSM_rate_ms != 0)
if (rtcm_MSM_enabled)
{
if (current_RX_time_ms % d_rtcm_MSM_rate_ms == 0)
{
@@ -2473,6 +2474,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
d_gnss_observables_map,
d_rx_time,
d_signal_enabled_flags,
rtcm_MSM_enabled,
rtcm_MT1019_enabled,
rtcm_MT1020_enabled,
rtcm_MT1045_enabled,

5
src/algorithms/PVT/libs/rtcm_printer.cc
View File

@@ -227,6 +227,7 @@ void Rtcm_Printer::Print_Rtcm_Messages(const Rtklib_Solver* pvt_solver,
const std::map<int, Gnss_Synchro>& gnss_observables_map,
double rx_time,
uint32_t signal_enabled_flags,
bool rtcm_MSM_enabled,
bool rtcm_MT1019_enabled,
bool rtcm_MT1020_enabled,
bool rtcm_MT1045_enabled,
@@ -251,7 +252,7 @@ void Rtcm_Printer::Print_Rtcm_Messages(const Rtklib_Solver* pvt_solver,
const auto print_MT1019 = (!d_rtcm_has_written_once && rtcm_MT1019_enabled) || flag_write_RTCM_1019_output;
const auto print_MT1020 = (!d_rtcm_has_written_once && rtcm_MT1020_enabled) || flag_write_RTCM_1020_output;
const auto print_MT1045 = (!d_rtcm_has_written_once && rtcm_MT1045_enabled) || flag_write_RTCM_1045_output;
const auto Print_MSM = !d_rtcm_has_written_once || flag_write_RTCM_MSM_output;
const auto print_MSM = (!d_rtcm_has_written_once && rtcm_MSM_enabled) || flag_write_RTCM_MSM_output;
if (print_MT1019 && flags.check_any_enabled(GPS_1C))
{
@@ -274,7 +275,7 @@ void Rtcm_Printer::Print_Rtcm_Messages(const Rtklib_Solver* pvt_solver,
Print_Rtcm_MT1045(gal_eph_iter.second);
}
}
if (Print_MSM)
if (print_MSM)
{
if (rtcm_MT1077_enabled && (flags.check_only_enabled(GPS_1C) || flags.check_only_enabled(GPS_1C, GAL_E6)))
{

1
src/algorithms/PVT/libs/rtcm_printer.h
View File

@@ -73,6 +73,7 @@ public:
const std::map<int, Gnss_Synchro>& gnss_observables_map,
double rx_time,
uint32_t signal_enabled_flags,
bool rtcm_MSM_enabled,
bool rtcm_MT1019_enabled,
bool rtcm_MT1020_enabled,
bool rtcm_MT1045_enabled,