1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00

Prepare for boost::any to std::any transition

Replace private member d_sample_counter by the more accurate name of d_symbol_counter
Remove clauses in switch statements for code uniformity
Fix terminal color for Galileo E5b received almanac
This commit is contained in:
Carles Fernandez 2022-06-11 14:26:42 +02:00
parent 5ec7548886
commit 7317bf4f7f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 462 additions and 499 deletions

View File

@ -60,6 +60,7 @@ target_link_libraries(telemetry_decoder_gr_blocks
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Gnuradio::pmt
) )
if(GNURADIO_USES_STD_POINTERS) if(GNURADIO_USES_STD_POINTERS)

View File

@ -3,7 +3,7 @@
* \brief Implementation of a Galileo unified INAV and FNAV message demodulator * \brief Implementation of a Galileo unified INAV and FNAV message demodulator
* block * block
* \author Javier Arribas 2018. jarribas(at)cttc.es * \author Javier Arribas 2018. jarribas(at)cttc.es
* \author Carles Fernandez, 2021. cfernandez(at)cttc.es * \author Carles Fernandez, 2021-2022. cfernandez(at)cttc.es
* *
* *
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
@ -11,7 +11,7 @@
* GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *
* Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) * Copyright (C) 2010-2022 (see AUTHORS file for a list of contributors)
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* *
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
@ -72,7 +72,6 @@ public:
int general_work(int noutput_items, gr_vector_int &ninput_items, int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) override; gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) override;
private: private:
friend galileo_telemetry_decoder_gs_sptr galileo_make_telemetry_decoder_gs( friend galileo_telemetry_decoder_gs_sptr galileo_make_telemetry_decoder_gs(
const Gnss_Satellite &satellite, const Gnss_Satellite &satellite,
@ -110,7 +109,7 @@ private:
double d_delta_t; // GPS-GALILEO time offset double d_delta_t; // GPS-GALILEO time offset
uint64_t d_sample_counter; uint64_t d_symbol_counter;
uint64_t d_preamble_index; uint64_t d_preamble_index;
uint64_t d_last_valid_preamble; uint64_t d_last_valid_preamble;
uint64_t d_received_sample_counter; uint64_t d_received_sample_counter;