From a144d52c740a0b543c17c4377ddd1f6d03421a5a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 3 Aug 2020 10:46:07 +0200 Subject: [PATCH] Make declarations more readable Remove unused parameters --- src/algorithms/channel/adapters/channel.cc | 20 ++++++++------ src/algorithms/channel/adapters/channel.h | 26 +++++++++++-------- .../channel/libs/channel_msg_receiver_cc.cc | 7 ++--- .../adapters/array_signal_conditioner.cc | 16 ++++-------- .../adapters/array_signal_conditioner.h | 10 +++---- .../adapters/signal_conditioner.cc | 17 ++++-------- .../conditioner/adapters/signal_conditioner.h | 12 ++++----- src/core/receiver/gnss_block_factory.cc | 8 +++--- 8 files changed, 55 insertions(+), 61 deletions(-) diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 298896901..450d65a7b 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -29,15 +29,19 @@ #include // for std::move -Channel::Channel(const ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, - std::shared_ptr trk, std::shared_ptr nav, - const std::string& role, const std::string& signal_str, Concurrent_Queue* queue) +Channel::Channel(const ConfigurationInterface* configuration, + uint32_t channel, + std::shared_ptr acq, + std::shared_ptr trk, + std::shared_ptr nav, + const std::string& role, + const std::string& signal_str, + Concurrent_Queue* queue) : acq_(std::move(acq)), + trk_(std::move(trk)), + nav_(std::move(nav)), + role_(role), + channel_(channel) { - acq_ = std::move(acq); - trk_ = std::move(trk); - nav_ = std::move(nav); - role_ = role; - channel_ = channel; channel_fsm_ = std::make_shared(); flag_enable_fpga_ = configuration->property("GNSS-SDR.enable_FPGA", false); diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 9a502bf5a..0775c915b 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -54,23 +54,27 @@ class Channel : public ChannelInterface { public: //! Constructor - Channel(const ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, - std::shared_ptr trk, std::shared_ptr nav, - const std::string& role, const std::string& signal_str, Concurrent_Queue* queue); + Channel(const ConfigurationInterface* configuration, + uint32_t channel, + std::shared_ptr acq, + std::shared_ptr trk, + std::shared_ptr nav, + const std::string& role, + const std::string& signal_str, + Concurrent_Queue* queue); ~Channel() = default; //!< Destructor - void connect(gr::top_block_sptr top_block) override; //!< connects the tracking block to the top_block and to the telemetry + void connect(gr::top_block_sptr top_block) override; //!< Connects the tracking block to the top_block and to the telemetry void disconnect(gr::top_block_sptr top_block) override; - gr::basic_block_sptr get_left_block() override; //!< gets the gnuradio tracking block pointer - gr::basic_block_sptr get_left_block_trk() override; //!< gets the gnuradio tracking block pointer - gr::basic_block_sptr get_left_block_acq() override; //!< gets the gnuradio tracking block pointer - gr::basic_block_sptr get_right_block() override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_left_block_trk() override; //!< Gets the GNU Radio tracking block input pointer + gr::basic_block_sptr get_left_block_acq() override; //!< Gets the GNU Radio acquisition block input pointer + gr::basic_block_sptr get_right_block() override; //!< Gets the GNU Radio channel block output pointer inline std::string role() override { return role_; } - //! Returns "Channel" - inline std::string implementation() override { return std::string("Channel"); } - inline size_t item_size() override { return 0; } + inline std::string implementation() override { return std::string("Channel"); } //!< Returns "Channel" + inline size_t item_size() override { return 2 * sizeof(float); } inline Gnss_Signal get_signal() const override { return gnss_signal_; } void start_acquisition() override; //!< Start the State Machine void stop_channel() override; //!< Stop the State Machine diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 998bafe30..be3ed06b4 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -38,9 +38,10 @@ channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat) : gr::block("channel_msg_receiver_cc", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), - d_channel_fsm(std::move(channel_fsm)), - d_repeat(repeat) +channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr channel_fsm, + bool repeat) : gr::block("channel_msg_receiver_cc", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), + d_channel_fsm(std::move(channel_fsm)), + d_repeat(repeat) { this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc index a922b8d63..f6b4ae1ef 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc @@ -25,21 +25,15 @@ // Constructor -ArraySignalConditioner::ArraySignalConditioner(const ConfigurationInterface *configuration, - std::shared_ptr data_type_adapt, +ArraySignalConditioner::ArraySignalConditioner(std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, - std::string role, - std::string implementation) : data_type_adapt_(std::move(data_type_adapt)), - in_filt_(std::move(in_filt)), - res_(std::move(res)), - role_(std::move(role)), - implementation_(std::move(implementation)) + std::string role) : data_type_adapt_(std::move(data_type_adapt)), + in_filt_(std::move(in_filt)), + res_(std::move(res)), + role_(std::move(role)) { connected_ = false; - if (configuration) - { - }; } diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h index fd31deebc..44f1c5a69 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h @@ -40,9 +40,10 @@ class ArraySignalConditioner : public GNSSBlockInterface { public: //! Constructor - ArraySignalConditioner(const ConfigurationInterface *configuration, - std::shared_ptr data_type_adapt, std::shared_ptr in_filt, - std::shared_ptr res, std::string role, std::string implementation); + ArraySignalConditioner(std::shared_ptr data_type_adapt, + std::shared_ptr in_filt, + std::shared_ptr res, + std::string role); //! Destructor ~ArraySignalConditioner() = default; @@ -55,7 +56,7 @@ public: inline std::string role() override { return role_; } //! Returns "Array_Signal_Conditioner" inline std::string implementation() override { return "Array_Signal_Conditioner"; } - inline size_t item_size() override { return 0; } + inline size_t item_size() override { return data_type_adapt_->item_size(); } inline std::shared_ptr data_type_adapter() { return data_type_adapt_; } inline std::shared_ptr input_filter() { return in_filt_; } @@ -66,7 +67,6 @@ private: std::shared_ptr in_filt_; std::shared_ptr res_; std::string role_; - std::string implementation_; bool connected_; }; diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc index 676fdecd0..2ca8137c1 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc @@ -19,27 +19,20 @@ */ #include "signal_conditioner.h" -#include "configuration_interface.h" #include #include // Constructor -SignalConditioner::SignalConditioner(const ConfigurationInterface *configuration, - std::shared_ptr data_type_adapt, +SignalConditioner::SignalConditioner(std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, - std::string role, - std::string implementation) : data_type_adapt_(std::move(data_type_adapt)), - in_filt_(std::move(in_filt)), - res_(std::move(res)), - role_(std::move(role)), - implementation_(std::move(implementation)) + std::string role) : data_type_adapt_(std::move(data_type_adapt)), + in_filt_(std::move(in_filt)), + res_(std::move(res)), + role_(std::move(role)) { connected_ = false; - if (configuration) - { - }; } diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index 6b4657363..42027abe7 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -27,8 +27,6 @@ #include #include -class ConfigurationInterface; - /*! * \brief This class wraps blocks to change data_type_adapter, input_filter and resampler * to be applied to the input flow of sampled signal. @@ -37,9 +35,10 @@ class SignalConditioner : public GNSSBlockInterface { public: //! Constructor - SignalConditioner(const ConfigurationInterface *configuration, - std::shared_ptr data_type_adapt, std::shared_ptr in_filt, - std::shared_ptr res, std::string role, std::string implementation); + SignalConditioner(std::shared_ptr data_type_adapt, + std::shared_ptr in_filt, + std::shared_ptr res, + std::string role); //! Destructor ~SignalConditioner() = default; @@ -53,7 +52,7 @@ public: inline std::string implementation() override { return "Signal_Conditioner"; } //!< Returns "Signal_Conditioner" - inline size_t item_size() override { return 0; } + inline size_t item_size() override { return data_type_adapt_->item_size(); } inline std::shared_ptr data_type_adapter() { return data_type_adapt_; } inline std::shared_ptr input_filter() { return in_filt_; } @@ -64,7 +63,6 @@ private: std::shared_ptr in_filt_; std::shared_ptr res_; std::string role_; - std::string implementation_; bool connected_; }; diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 91040fd78..d2cdc573b 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -242,20 +242,20 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( if (signal_conditioner == "Array_Signal_Conditioner") { // instantiate the array version - std::unique_ptr conditioner_ = std::make_unique(configuration, + std::unique_ptr conditioner_ = std::make_unique( GetBlock(configuration, role_datatypeadapter, 1, 1), GetBlock(configuration, role_inputfilter, 1, 1), GetBlock(configuration, role_resampler, 1, 1), - role_conditioner, "Signal_Conditioner"); + role_conditioner); return conditioner_; } // single-antenna version - std::unique_ptr conditioner_ = std::make_unique(configuration, + std::unique_ptr conditioner_ = std::make_unique( GetBlock(configuration, role_datatypeadapter, 1, 1), GetBlock(configuration, role_inputfilter, 1, 1), GetBlock(configuration, role_resampler, 1, 1), - role_conditioner, "Signal_Conditioner"); + role_conditioner); return conditioner_; }