From 0520d400b35ed5783e91746f9f7b12720b20e3d0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 11 Sep 2019 22:31:34 +0000 Subject: [PATCH] Apply clang-tidy --- .clang-tidy | 1 - src/algorithms/PVT/libs/pvt_conf.cc | 2 +- src/algorithms/PVT/libs/rtklib_solver.cc | 2 +- src/algorithms/PVT/libs/rtklib_solver.h | 2 +- src/algorithms/channel/adapters/channel.cc | 6 ++-- src/algorithms/channel/adapters/channel.h | 6 ++-- ...nsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h | 1 - ...dr_16ic_16i_rotator_dotprodxnpuppet_16ic.h | 2 -- .../volk_gnsssdr_8ic_magnitude_squared_8i.h | 1 - .../gnuradio_blocks/hybrid_observables_gs.cc | 8 ++--- .../gnuradio_blocks/hybrid_observables_gs.h | 6 ++-- .../adapters/file_signal_source.cc | 2 +- .../adapters/file_signal_source.h | 2 +- .../multichannel_file_signal_source.cc | 2 +- .../multichannel_file_signal_source.h | 2 +- .../adapters/nsr_file_signal_source.cc | 2 +- .../adapters/nsr_file_signal_source.h | 2 +- .../adapters/spir_file_signal_source.cc | 2 +- .../adapters/spir_file_signal_source.h | 2 +- .../two_bit_cpx_file_signal_source.cc | 8 ++--- .../adapters/two_bit_cpx_file_signal_source.h | 2 +- .../two_bit_packed_file_signal_source.cc | 8 ++--- .../two_bit_packed_file_signal_source.h | 2 +- .../gr_complex_ip_packet_source.h | 2 +- .../gnuradio_blocks/dll_pll_veml_tracking.cc | 2 +- ...glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 6 ++-- .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h | 8 ++--- ...glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc | 6 ++-- .../glonass_l1_ca_dll_pll_c_aid_tracking_sc.h | 8 ++--- .../glonass_l1_ca_dll_pll_tracking_cc.cc | 4 +-- .../glonass_l1_ca_dll_pll_tracking_cc.h | 6 ++-- ...glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 6 ++-- .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h | 8 ++--- ...glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | 6 ++-- .../glonass_l2_ca_dll_pll_c_aid_tracking_sc.h | 8 ++--- .../glonass_l2_ca_dll_pll_tracking_cc.cc | 4 +-- .../glonass_l2_ca_dll_pll_tracking_cc.h | 6 ++-- .../gps_l1_ca_kf_tracking_cc.cc | 4 +-- .../gps_l1_ca_kf_tracking_cc.h | 6 ++-- src/algorithms/tracking/libs/dll_pll_conf.cc | 8 ++--- .../tracking/libs/dll_pll_conf_fpga.cc | 8 ++--- .../tracking/libs/tcp_communication.cc | 4 +-- .../tracking/libs/tracking_discriminators.cc | 12 ++++--- src/core/receiver/control_thread.cc | 2 +- src/core/receiver/control_thread.h | 2 +- src/core/receiver/gnss_block_factory.cc | 36 +++++++++---------- src/core/receiver/gnss_block_factory.h | 18 +++++----- src/core/receiver/gnss_flowgraph.cc | 2 +- src/core/receiver/gnss_flowgraph.h | 2 +- .../gps_l1_ca_pcps_acquisition_test.cc | 4 +-- .../libs/acquisition_msg_rx.cc | 2 +- .../libs/acquisition_msg_rx.h | 2 +- src/utils/front-end-cal/main.cc | 4 +-- 53 files changed, 134 insertions(+), 135 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 196997bae..717db7f24 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -74,7 +74,6 @@ Checks: '-*, modernize-use-default-member-init, modernize-deprecated-headers, modernize-loop-convert, - modernize-pass-by-value, modernize-raw-string-literal, modernize-redundant-void-arg, modernize-return-braced-init-list, diff --git a/src/algorithms/PVT/libs/pvt_conf.cc b/src/algorithms/PVT/libs/pvt_conf.cc index 70b9e6af8..d2d144cb3 100644 --- a/src/algorithms/PVT/libs/pvt_conf.cc +++ b/src/algorithms/PVT/libs/pvt_conf.cc @@ -72,7 +72,7 @@ Pvt_Conf::Pvt_Conf() xml_output_path = std::string("."); rtcm_output_file_path = std::string("."); - enable_rx_clock_correction=true; + enable_rx_clock_correction = true; monitor_enabled = false; protobuf_enabled = true; udp_port = 0; diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 0e654e133..a3e3f4dd9 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -87,7 +87,7 @@ namespace errorlib = boost::system; #endif -Rtklib_Solver::Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t &rtk) +Rtklib_Solver::Rtklib_Solver(int nchannels, const std::string &dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t &rtk) { // init empty ephemeris for all the available GNSS channels d_nchannels = nchannels; diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h index 3bc11fc9d..b3ffc17f5 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.h +++ b/src/algorithms/PVT/libs/rtklib_solver.h @@ -89,7 +89,7 @@ class Rtklib_Solver : public Pvt_Solution { public: - Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk); + Rtklib_Solver(int nchannels, const std::string& dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk); ~Rtklib_Solver(); bool get_PVT(const std::map& gnss_observables_map, bool flag_averaging); diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index edaf48dbc..808f6e871 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -40,9 +40,9 @@ #include // for std::move -Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, - std::shared_ptr trk, std::shared_ptr nav, - std::string role, std::string implementation, std::shared_ptr > queue) +Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, const std::shared_ptr& acq, + const std::shared_ptr& trk, const std::shared_ptr& nav, + const std::string& role, const std::string& implementation, const std::shared_ptr >& queue) { acq_ = std::move(acq); trk_ = std::move(trk); diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 40348601c..1586fe85a 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -65,9 +65,9 @@ class Channel : public ChannelInterface { public: //! Constructor - Channel(ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, - std::shared_ptr trk, std::shared_ptr nav, - std::string role, std::string implementation, std::shared_ptr> queue); + Channel(ConfigurationInterface* configuration, uint32_t channel, const std::shared_ptr& acq, + const std::shared_ptr& trk, const std::shared_ptr& nav, + const std::string& role, const std::string& implementation, const std::shared_ptr>& queue); ~Channel() = default; //!< Destructor diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h index 496ab809d..9d91ef696 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h @@ -334,7 +334,6 @@ static inline void volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn_a_sse3(lv_16sc #endif /* LV_HAVE_SSE3 */ - #ifdef LV_HAVE_SSE3 #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h index 436988087..13a34089e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic.h @@ -131,7 +131,6 @@ static inline void volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic_a_sse3(lv_ #endif // SSE3 - #ifdef LV_HAVE_SSE3 static inline void volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic_u_sse3(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) { @@ -194,7 +193,6 @@ static inline void volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic_a_avx2(lv_ #endif // AVX2 - #ifdef LV_HAVE_AVX2 static inline void volk_gnsssdr_16ic_16i_rotator_dotprodxnpuppet_16ic_u_avx2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) { diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h index 2c4cfa503..658e532fd 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8ic_magnitude_squared_8i.h @@ -189,7 +189,6 @@ static inline void volk_gnsssdr_8ic_magnitude_squared_8i_a_sse3(char* magnitudeV #endif /* LV_HAVE_SSSE3 */ - #ifdef LV_HAVE_ORC extern void volk_gnsssdr_8ic_magnitude_squared_8i_a_orc_impl(char* magnitudeVector, const lv_8sc_t* complexVector, unsigned int num_points); diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 967911e90..1bb373689 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -66,7 +66,7 @@ namespace errorlib = boost::system; #endif -hybrid_observables_gs_sptr hybrid_observables_gs_make(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename) +hybrid_observables_gs_sptr hybrid_observables_gs_make(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, const std::string &dump_filename) { return hybrid_observables_gs_sptr(new hybrid_observables_gs(nchannels_in, nchannels_out, dump, dump_mat, std::move(dump_filename))); } @@ -76,9 +76,9 @@ hybrid_observables_gs::hybrid_observables_gs(uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, - std::string dump_filename) : gr::block("hybrid_observables_gs", - gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)), - gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro))) + const std::string &dump_filename) : gr::block("hybrid_observables_gs", + gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)), + gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro))) { // PVT input message port this->message_port_register_in(pmt::mp("pvt_to_observables")); diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h index b8505e21f..aaabf4cbc 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h @@ -57,7 +57,7 @@ hybrid_observables_gs_sptr hybrid_observables_gs_make( unsigned int nchannels_out, bool dump, bool dump_mat, - std::string dump_filename); + const std::string& dump_filename); /*! * \brief This class implements a block that computes observables @@ -76,14 +76,14 @@ private: uint32_t nchannels_out, bool dump, bool dump_mat, - std::string dump_filename); + const std::string& dump_filename); hybrid_observables_gs( uint32_t nchannels_in, uint32_t nchannels_out, bool dump, bool dump_mat, - std::string dump_filename); + const std::string& dump_filename); bool T_rx_TOW_set; // rx time follow GPST bool d_dump; diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index 7603e9e18..016c8e7e4 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -44,7 +44,7 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) + const std::shared_ptr>& queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) { std::string default_filename = "./example_capture.dat"; std::string default_item_type = "short"; diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index c167a0c1e..3a5115aa6 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -57,7 +57,7 @@ class FileSignalSource : public GNSSBlockInterface public: FileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue); + const std::shared_ptr>& queue); ~FileSignalSource() = default; diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc index d280c2548..5ee5dbc63 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc @@ -43,7 +43,7 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) + const std::shared_ptr>& queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) { std::string default_filename = "./example_capture.dat"; std::string default_item_type = "short"; diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h index 82936177b..0647032a3 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h @@ -58,7 +58,7 @@ class MultichannelFileSignalSource : public GNSSBlockInterface public: MultichannelFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue); + const std::shared_ptr>& queue); ~MultichannelFileSignalSource() = default; diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc index 63812f224..03e83b229 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -44,7 +44,7 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) + const std::shared_ptr>& queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) { std::string default_filename = "../data/my_capture.dat"; std::string default_item_type = "byte"; diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h index 53e8063b8..6ee4d6140 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -57,7 +57,7 @@ class NsrFileSignalSource : public GNSSBlockInterface public: NsrFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue); + const std::shared_ptr>& queue); ~NsrFileSignalSource() = default; inline std::string role() override diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc index 9863c4438..fa512d387 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -43,7 +43,7 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) + const std::shared_ptr>& queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(std::move(queue)) { std::string default_filename = "../data/my_capture.dat"; std::string default_item_type = "int"; diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h index b94b81591..472b0f60a 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h @@ -55,7 +55,7 @@ class SpirFileSignalSource : public GNSSBlockInterface public: SpirFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue); + const std::shared_ptr>& queue); ~SpirFileSignalSource() = default; inline std::string role() override diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc index ebfd8ab24..e23997236 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc @@ -45,10 +45,10 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* con const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue) : role_(role), - in_streams_(in_streams), - out_streams_(out_streams), - queue_(std::move(queue)) + const std::shared_ptr>& queue) : role_(role), + in_streams_(in_streams), + out_streams_(out_streams), + queue_(std::move(queue)) { std::string default_filename = "../data/my_capture.dat"; std::string default_item_type = "byte"; diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h index 41f524be3..01e680f69 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h @@ -61,7 +61,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue); + const std::shared_ptr>& queue); ~TwoBitCpxFileSignalSource() = default; inline std::string role() override diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc index 6ca30c1e5..ef6431632 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc @@ -47,10 +47,10 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue) : role_(role), - in_streams_(in_streams), - out_streams_(out_streams), - queue_(std::move(queue)) + const std::shared_ptr>& queue) : role_(role), + in_streams_(in_streams), + out_streams_(out_streams), + queue_(std::move(queue)) { std::string default_filename = "../data/my_capture.dat"; std::string default_item_type = "byte"; diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h index 5726e2dc5..1b4f02107 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h @@ -60,7 +60,7 @@ class TwoBitPackedFileSignalSource : public GNSSBlockInterface public: TwoBitPackedFileSignalSource(ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, - std::shared_ptr> queue); + const std::shared_ptr>& queue); ~TwoBitPackedFileSignalSource() = default; inline std::string role() override diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h index 851a2ff4f..ff46d1970 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h @@ -98,7 +98,7 @@ private: size_t d_item_size; bool d_IQ_swap; boost::thread *d_pcap_thread; - void demux_samples(const gr_vector_void_star& output_items, int num_samples_readed); + void demux_samples(const gr_vector_void_star &output_items, int num_samples_readed); void my_pcap_loop_thread(pcap_t *pcap_handle); void pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet); static void static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet); diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index b92aeb196..c31751f1e 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -1000,7 +1000,7 @@ void dll_pll_veml_tracking::run_dll_pll() if (d_dll_filt_history.full()) { float avg_code_error_chips_s = std::accumulate(d_dll_filt_history.begin(), d_dll_filt_history.end(), 0.0) / static_cast(d_dll_filt_history.capacity()); - if (fabs(avg_code_error_chips_s) > 1.0) + if (std::fabs(avg_code_error_chips_s) > 1.0) { float carrier_doppler_error_hz = static_cast(d_signal_carrier_freq) * avg_code_error_chips_s / static_cast(d_code_chip_rate); LOG(INFO) << "Detected and corrected carrier doppler error: " << carrier_doppler_error_hz << " [Hz] on sat " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc index 00d59a903..1adce77af 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -65,7 +65,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -88,7 +88,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items, } -void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg) +void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg) { // pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -105,7 +105,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h index f6377f0d6..1bf79e13d 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -60,7 +60,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -91,7 +91,7 @@ private: glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -102,7 +102,7 @@ private: glonass_l1_ca_dll_pll_c_aid_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -170,7 +170,7 @@ private: int32_t d_extend_correlation_ms; bool d_enable_extended_integration; bool d_preamble_synchronized; - void msg_handler_preamble_index(pmt::pmt_t msg); + void msg_handler_preamble_index(const pmt::pmt_t& msg); // Integration period in samples int32_t d_correlation_length_samples; diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc index 197a60eb5..c34d85d25 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc @@ -63,7 +63,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -86,7 +86,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_sc::forecast(int noutput_items, } -void glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index(pmt::pmt_t msg) +void glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index(const pmt::pmt_t &msg) { // pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -103,7 +103,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h index 1b95f3917..f7e439319 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h @@ -60,7 +60,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr glonass_l1_ca_dll_pll_c_aid_make_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -91,7 +91,7 @@ private: glonass_l1_ca_dll_pll_c_aid_make_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -102,7 +102,7 @@ private: glonass_l1_ca_dll_pll_c_aid_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -167,7 +167,7 @@ private: bool d_preamble_synchronized; double d_code_error_filt_chips_s; double d_code_error_filt_chips_Ti; - void msg_handler_preamble_index(pmt::pmt_t msg); + void msg_handler_preamble_index(const pmt::pmt_t& msg); // symbol history to detect bit transition std::deque d_E_history; diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc index 8617fe343..f161ffbd4 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc @@ -62,7 +62,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) @@ -86,7 +86,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) : gr::block("Glonass_L1_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h index f49337c4a..ccecbde5b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h @@ -57,7 +57,7 @@ glonass_l1_ca_dll_pll_tracking_cc_sptr glonass_l1_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -85,7 +85,7 @@ private: glonass_l1_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -93,7 +93,7 @@ private: Glonass_L1_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc index 6ee1b1e40..871f0c56e 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc @@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -85,7 +85,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items, } -void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg) +void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg) { // pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -102,7 +102,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h index 0fe6ecb2d..b1e3fc7bc 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h @@ -58,7 +58,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -89,7 +89,7 @@ private: glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -100,7 +100,7 @@ private: glonass_l2_ca_dll_pll_c_aid_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -168,7 +168,7 @@ private: int32_t d_extend_correlation_ms; bool d_enable_extended_integration; bool d_preamble_synchronized; - void msg_handler_preamble_index(pmt::pmt_t msg); + void msg_handler_preamble_index(const pmt::pmt_t& msg); // Integration period in samples int32_t d_correlation_length_samples; diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc index 26c756b47..38c46e6e5 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc @@ -61,7 +61,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -84,7 +84,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_sc::forecast(int noutput_items, } -void glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index(pmt::pmt_t msg) +void glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index(const pmt::pmt_t &msg) { // pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -101,7 +101,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h index a045ff945..171059689 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h @@ -58,7 +58,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr glonass_l2_ca_dll_pll_c_aid_make_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -89,7 +89,7 @@ private: glonass_l2_ca_dll_pll_c_aid_make_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -100,7 +100,7 @@ private: glonass_l2_ca_dll_pll_c_aid_tracking_sc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -165,7 +165,7 @@ private: bool d_preamble_synchronized; double d_code_error_filt_chips_s; double d_code_error_filt_chips_Ti; - void msg_handler_preamble_index(pmt::pmt_t msg); + void msg_handler_preamble_index(const pmt::pmt_t& msg); // symbol history to detect bit transition std::deque d_E_history; diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc index 166983d4a..e260de31f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc @@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) @@ -86,7 +86,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) : gr::block("Glonass_L2_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h index e0e64dfbf..a9b0f499d 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h @@ -55,7 +55,7 @@ glonass_l2_ca_dll_pll_tracking_cc_sptr glonass_l2_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -83,7 +83,7 @@ private: glonass_l2_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -91,7 +91,7 @@ private: Glonass_L2_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc index 973ab617d..9ed166924 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc @@ -64,7 +64,7 @@ gps_l1_ca_kf_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, @@ -95,7 +95,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string &dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h index 674ac4ae9..5317e3b91 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h @@ -65,7 +65,7 @@ gps_l1_ca_kf_make_tracking_cc(uint32_t order, int64_t if_freq, int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, @@ -98,7 +98,7 @@ private: int64_t if_freq, int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, @@ -111,7 +111,7 @@ private: int64_t if_freq, int64_t fs_in, uint32_t vector_length, bool dump, - std::string dump_filename, + const std::string& dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, diff --git a/src/algorithms/tracking/libs/dll_pll_conf.cc b/src/algorithms/tracking/libs/dll_pll_conf.cc index 5bdf00e8f..1cf6569ca 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf.cc +++ b/src/algorithms/tracking/libs/dll_pll_conf.cc @@ -63,10 +63,10 @@ Dll_Pll_Conf::Dll_Pll_Conf() very_early_late_space_narrow_chips = 0.1; extend_correlation_symbols = 5; cn0_samples = FLAGS_cn0_samples; - cn0_smoother_samples=200; - cn0_smoother_alpha=0.002; - carrier_lock_test_smoother_alpha=0.002; - carrier_lock_test_smoother_samples=25; + cn0_smoother_samples = 200; + cn0_smoother_alpha = 0.002; + carrier_lock_test_smoother_alpha = 0.002; + carrier_lock_test_smoother_samples = 25; cn0_min = FLAGS_cn0_min; max_carrier_lock_fail = FLAGS_max_carrier_lock_fail; max_code_lock_fail = FLAGS_max_lock_fail; diff --git a/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc b/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc index 91e4a4050..5f096a2ab 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc +++ b/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc @@ -65,10 +65,10 @@ Dll_Pll_Conf_Fpga::Dll_Pll_Conf_Fpga() very_early_late_space_narrow_chips = 0.1; extend_correlation_symbols = 5; cn0_samples = FLAGS_cn0_samples; - cn0_smoother_samples=200; - cn0_smoother_alpha=0.002; - carrier_lock_test_smoother_alpha=0.002; - carrier_lock_test_smoother_samples=25; + cn0_smoother_samples = 200; + cn0_smoother_alpha = 0.002; + carrier_lock_test_smoother_alpha = 0.002; + carrier_lock_test_smoother_samples = 25; cn0_min = FLAGS_cn0_min; max_carrier_lock_fail = FLAGS_max_carrier_lock_fail; max_code_lock_fail = FLAGS_max_lock_fail; diff --git a/src/algorithms/tracking/libs/tcp_communication.cc b/src/algorithms/tracking/libs/tcp_communication.cc index a801acab0..0d49f0fe4 100644 --- a/src/algorithms/tracking/libs/tcp_communication.cc +++ b/src/algorithms/tracking/libs/tcp_communication.cc @@ -102,7 +102,7 @@ void Tcp_Communication::send_receive_tcp_packet_galileo_e1(boost::array> controlc; } - } +} void Tcp_Communication::send_receive_tcp_packet_gps_l1_ca(boost::array buf, Tcp_Packet_Data* tcp_data_) @@ -136,7 +136,7 @@ void Tcp_Communication::send_receive_tcp_packet_gps_l1_ca(boost::array> controlc; } - } +} void Tcp_Communication::close_tcp_connection(size_t d_port_) diff --git a/src/algorithms/tracking/libs/tracking_discriminators.cc b/src/algorithms/tracking/libs/tracking_discriminators.cc index cc091fc5f..6c5e9dbb5 100644 --- a/src/algorithms/tracking/libs/tracking_discriminators.cc +++ b/src/algorithms/tracking/libs/tracking_discriminators.cc @@ -53,6 +53,8 @@ double phase_unwrap(double phase_rad) return phase_rad; } } + + /* * FLL four quadrant arctan discriminator: * \f{equation} @@ -64,13 +66,14 @@ double phase_unwrap(double phase_rad) */ double fll_four_quadrant_atan(gr_complex prompt_s1, gr_complex prompt_s2, double t1, double t2) { - double cross; - double dot; + float cross; + float dot; dot = prompt_s1.real() * prompt_s2.real() + prompt_s1.imag() * prompt_s2.imag(); cross = prompt_s1.real() * prompt_s2.imag() - prompt_s2.real() * prompt_s1.imag(); - return atan2(cross, dot) / (t2 - t1); + return std::atan2(cross, dot) / (t2 - t1); } + /* * FLL differential arctan discriminator: * \f{equation} @@ -80,7 +83,7 @@ double fll_four_quadrant_atan(gr_complex prompt_s1, gr_complex prompt_s2, double */ double fll_diff_atan(gr_complex prompt_s1, gr_complex prompt_s2, double t1, double t2) { - double diff_atan = atan(prompt_s2.imag() / prompt_s2.real()) - atan(prompt_s1.imag() / prompt_s1.real()); + double diff_atan = std::atan(prompt_s2.imag() / prompt_s2.real()) - std::atan(prompt_s1.imag() / prompt_s1.real()); if (std::isnan(diff_atan)) { diff_atan = 0; @@ -88,6 +91,7 @@ double fll_diff_atan(gr_complex prompt_s1, gr_complex prompt_s2, double t1, doub return phase_unwrap(diff_atan) / (t2 - t1); } + /* * PLL four quadrant arctan discriminator: * \f{equation} diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index b912ae9d2..113eb8183 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -105,7 +105,7 @@ ControlThread::ControlThread() } -ControlThread::ControlThread(std::shared_ptr configuration) +ControlThread::ControlThread(const std::shared_ptr &configuration) { configuration_ = std::move(configuration); delete_configuration_ = false; diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h index 300b9e9cf..27cb8cef6 100644 --- a/src/core/receiver/control_thread.h +++ b/src/core/receiver/control_thread.h @@ -77,7 +77,7 @@ public: * * \param[in] configuration Pointer to a ConfigurationInterface */ - explicit ControlThread(std::shared_ptr configuration); + explicit ControlThread(const std::shared_ptr &configuration); /*! * \brief Destructor diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index a0487285f..08c7f47ee 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -315,7 +315,7 @@ std::unique_ptr GNSSBlockFactory::GetPVT(const std::shared_p std::unique_ptr GNSSBlockFactory::GetChannel_1C( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { // "appendix" is added to the "role" with the aim of Acquisition, Tracking and Telemetry Decoder adapters // can find their specific configurations when they read the config @@ -373,7 +373,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1C( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "1C", std::move(queue))); + "Channel", "1C", queue)); return channel_; } @@ -383,7 +383,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1C( std::unique_ptr GNSSBlockFactory::GetChannel_2S( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { LOG(INFO) << "Instantiating Channel " << channel << " with Acquisition Implementation: " << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; @@ -437,7 +437,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2S( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "2S", std::move(queue))); + "Channel", "2S", queue)); return channel_; } @@ -447,7 +447,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2S( std::unique_ptr GNSSBlockFactory::GetChannel_1B( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -504,7 +504,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1B( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "1B", std::move(queue))); + "Channel", "1B", queue)); return channel_; } @@ -514,7 +514,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1B( std::unique_ptr GNSSBlockFactory::GetChannel_5X( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -571,7 +571,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5X( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "5X", std::move(queue))); + "Channel", "5X", queue)); return channel_; } @@ -581,7 +581,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5X( std::unique_ptr GNSSBlockFactory::GetChannel_1G( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -639,7 +639,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1G( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "1G", std::move(queue))); + "Channel", "1G", queue)); return channel_; } @@ -649,7 +649,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1G( std::unique_ptr GNSSBlockFactory::GetChannel_2G( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -707,7 +707,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2G( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "2G", std::move(queue))); + "Channel", "2G", queue)); return channel_; } @@ -717,7 +717,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2G( std::unique_ptr GNSSBlockFactory::GetChannel_L5( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -774,7 +774,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_L5( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "L5", std::move(queue))); + "Channel", "L5", queue)); return channel_; } @@ -784,7 +784,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_L5( std::unique_ptr GNSSBlockFactory::GetChannel_B1( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -841,7 +841,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B1( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "B1", std::move(queue))); + "Channel", "B1", queue)); return channel_; } @@ -851,7 +851,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B1( std::unique_ptr GNSSBlockFactory::GetChannel_B3( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue) + const std::shared_ptr>& queue) { std::stringstream stream; stream << channel; @@ -908,7 +908,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B3( std::move(acq_), std::move(trk_), std::move(tlm_), - "Channel", "B3", std::move(queue))); + "Channel", "B3", queue)); return channel_; } diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index 02a24cf90..868b79d18 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -82,39 +82,39 @@ public: private: std::unique_ptr GetChannel_1C(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_2S(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_1B(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_5X(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_L5(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_1G(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_2G(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_B1(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetChannel_B3(const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, - std::shared_ptr> queue); + const std::shared_ptr>& queue); std::unique_ptr GetAcqBlock( const std::shared_ptr& configuration, diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 7fef2678f..b8ecf429f 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -1440,7 +1440,7 @@ void GNSSFlowgraph::priorize_satellites(const std::vector configuration) +void GNSSFlowgraph::set_configuration(const std::shared_ptr& configuration) { if (running_) { diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h index d193cd3c1..f200425b0 100644 --- a/src/core/receiver/gnss_flowgraph.h +++ b/src/core/receiver/gnss_flowgraph.h @@ -128,7 +128,7 @@ public: /*! * \brief Set flow graph configuratiob */ - void set_configuration(std::shared_ptr configuration); + void set_configuration(const std::shared_ptr& configuration); bool connected() const { diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index 37f22321d..63d884a2c 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -83,7 +83,7 @@ class GpsL1CaPcpsAcquisitionTest_msg_rx : public gr::block { private: friend GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_events(const pmt::pmt_t &msg); GpsL1CaPcpsAcquisitionTest_msg_rx(); public: @@ -98,7 +98,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make() } -void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(const pmt::pmt_t &msg) { try { diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc index c7b71772f..d4b21d34c 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc @@ -44,7 +44,7 @@ Acquisition_msg_rx_sptr Acquisition_msg_rx_make() } -void Acquisition_msg_rx::msg_handler_events(pmt::pmt_t msg) +void Acquisition_msg_rx::msg_handler_events(const pmt::pmt_t& msg) { try { diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h index 01ee718c7..cb1d1a9be 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h @@ -49,7 +49,7 @@ class Acquisition_msg_rx : public gr::block { private: friend Acquisition_msg_rx_sptr Acquisition_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_events(const pmt::pmt_t& msg); Acquisition_msg_rx(); public: diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 564adfde4..889d6b849 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -116,7 +116,7 @@ class FrontEndCal_msg_rx : public gr::block { private: friend FrontEndCal_msg_rx_sptr FrontEndCal_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_events(const pmt::pmt_t& msg); FrontEndCal_msg_rx(); public: @@ -130,7 +130,7 @@ FrontEndCal_msg_rx_sptr FrontEndCal_msg_rx_make() } -void FrontEndCal_msg_rx::msg_handler_events(pmt::pmt_t msg) +void FrontEndCal_msg_rx::msg_handler_events(const pmt::pmt_t& msg) { try {