mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-28 16:12:59 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Javier Arribas 2021-06-28 10:39:19 +02:00
commit fae5940ce7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
View File

@ -119,6 +119,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block(
} }
d_T_rx_TOW_ms = 0U; d_T_rx_TOW_ms = 0U;
d_T_rx_step_ms = conf_.observable_interval_ms; d_T_rx_step_ms = conf_.observable_interval_ms;
d_T_rx_step_s = static_cast<double>(d_T_rx_step_ms) / 1000.0;
d_T_rx_TOW_set = false; d_T_rx_TOW_set = false;
d_T_status_report_timer_ms = 0; d_T_status_report_timer_ms = 0;
d_Rx_clock_buffer.set_capacity(std::min(std::max(200U / d_T_rx_step_ms, 3U), 10U)); d_Rx_clock_buffer.set_capacity(std::min(std::max(200U / d_T_rx_step_ms, 3U), 10U));
@ -377,7 +378,7 @@ bool hybrid_observables_gs::interp_trk_obs(Gnss_Synchro &interpolated_obs, uint3
if (nearest_element != -1 and nearest_element != static_cast<int32_t>(d_gnss_synchro_history->size(ch))) if (nearest_element != -1 and nearest_element != static_cast<int32_t>(d_gnss_synchro_history->size(ch)))
{ {
if ((static_cast<double>(old_abs_diff) / static_cast<double>(d_gnss_synchro_history->get(ch, nearest_element).fs)) < static_cast<double>(d_T_rx_step_ms) / 1000.0) if ((static_cast<double>(old_abs_diff) / static_cast<double>(d_gnss_synchro_history->get(ch, nearest_element).fs)) < d_T_rx_step_s)
{ {
int32_t neighbor_element; int32_t neighbor_element;
if (rx_clock > d_gnss_synchro_history->get(ch, nearest_element).Tracking_sample_counter) if (rx_clock > d_gnss_synchro_history->get(ch, nearest_element).Tracking_sample_counter)

1
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
View File

@ -117,6 +117,7 @@ private:
std::ofstream d_dump_file; std::ofstream d_dump_file;
double d_smooth_filter_M; double d_smooth_filter_M;
double d_T_rx_step_s;
uint32_t d_T_rx_TOW_ms; uint32_t d_T_rx_TOW_ms;
double last_rx_clock_round20ms_error; double last_rx_clock_round20ms_error;