From 06dbbca3146b10cbe720fff6d72eb5a691e486a0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 13 Jul 2020 13:40:59 +0200 Subject: [PATCH] Sort private members --- .../adapters/galileo_e5b_pcps_acquisition.h | 24 ++++++++++++------- .../galileo_e5b_pcps_acquisition_fpga.h | 14 ++++++----- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h index 06216cea9..3819dca1b 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h @@ -177,27 +177,33 @@ public: private: pcps_acquisition_sptr acquisition_; + + std::vector> code_; + std::weak_ptr channel_fsm_; + + Gnss_Synchro* gnss_synchro_; Acq_Conf acq_parameters_; - size_t item_size_; + std::string item_type_; std::string dump_filename_; std::string role_; - bool acq_pilot_; - bool acq_iq_; + + size_t item_size_; + int64_t fs_in_; + + float threshold_; + int doppler_center_; unsigned int vector_length_; unsigned int code_length_; unsigned int channel_; - std::weak_ptr channel_fsm_; unsigned int doppler_max_; unsigned int doppler_step_; - int doppler_center_; unsigned int sampled_ms_; unsigned int in_streams_; unsigned int out_streams_; - int64_t fs_in_; - float threshold_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; + + bool acq_pilot_; + bool acq_iq_; }; #endif // GNSS_SDR_GALILEO_E5B_PCPS_ACQUISITION_H diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h index a6ada92b5..384d42fdc 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h @@ -193,20 +193,22 @@ private: static const uint32_t shl_code_bits = 65536; // shift left by 10 bits pcps_acquisition_fpga_sptr acquisition_fpga_; + std::vector d_all_fft_codes_; // memory that contains all the code ffts + std::weak_ptr channel_fsm_; + + Gnss_Synchro* gnss_synchro_; + std::string item_type_; std::string dump_filename_; std::string role_; - bool acq_pilot_; - bool acq_iq_; + int32_t doppler_center_; uint32_t channel_; - std::weak_ptr channel_fsm_; uint32_t doppler_max_; uint32_t doppler_step_; - int32_t doppler_center_; unsigned int in_streams_; unsigned int out_streams_; - Gnss_Synchro* gnss_synchro_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + bool acq_pilot_; + bool acq_iq_; }; #endif // GNSS_SDR_GALILEO_E5B_PCPS_ACQUISITION_FPGA_H