mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Make declarations more readable 

Remove unused parameters
This commit is contained in:
Carles Fernandez 2020-08-03 10:46:07 +02:00
parent 47f6855610
commit a144d52c74
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
8 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/algorithms/channel/adapters/channel.cc
View File

@ -29,15 +29,19 @@
#include <utility> // for std::move
Channel::Channel(const ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr<AcquisitionInterface> acq,
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> nav,
const std::string& role, const std::string& signal_str, Concurrent_Queue<pmt::pmt_t>* queue)
Channel::Channel(const ConfigurationInterface* configuration,
uint32_t channel,
std::shared_ptr<AcquisitionInterface> acq,
std::shared_ptr<TrackingInterface> trk,
std::shared_ptr<TelemetryDecoderInterface> nav,
const std::string& role,
const std::string& signal_str,
Concurrent_Queue<pmt::pmt_t>* 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<ChannelFsm>();
flag_enable_fpga_ = configuration->property("GNSS-SDR.enable_FPGA", false);

26
src/algorithms/channel/adapters/channel.h
View File

@ -54,23 +54,27 @@ class Channel : public ChannelInterface
{
public:
//! Constructor
Channel(const ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr<AcquisitionInterface> acq,
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> nav,
const std::string& role, const std::string& signal_str, Concurrent_Queue<pmt::pmt_t>* queue);
Channel(const ConfigurationInterface* configuration,
uint32_t channel,
std::shared_ptr<AcquisitionInterface> acq,
std::shared_ptr<TrackingInterface> trk,
std::shared_ptr<TelemetryDecoderInterface> nav,
const std::string& role,
const std::string& signal_str,
Concurrent_Queue<pmt::pmt_t>* 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

7
src/algorithms/channel/libs/channel_msg_receiver_cc.cc
View File

@ -38,9 +38,10 @@ channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr<Channe
}
channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr<ChannelFsm> 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<ChannelFsm> 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"),

16
src/algorithms/conditioner/adapters/array_signal_conditioner.cc
View File

@ -25,21 +25,15 @@
// Constructor
ArraySignalConditioner::ArraySignalConditioner(const ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt,
ArraySignalConditioner::ArraySignalConditioner(std::shared_ptr<GNSSBlockInterface> data_type_adapt,
std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> 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)
{
};
}

10
src/algorithms/conditioner/adapters/array_signal_conditioner.h
View File

@ -40,9 +40,10 @@ class ArraySignalConditioner : public GNSSBlockInterface
{
public:
//! Constructor
ArraySignalConditioner(const ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
ArraySignalConditioner(std::shared_ptr<GNSSBlockInterface> data_type_adapt,
std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> 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<GNSSBlockInterface> data_type_adapter() { return data_type_adapt_; }
inline std::shared_ptr<GNSSBlockInterface> input_filter() { return in_filt_; }
@ -66,7 +67,6 @@ private:
std::shared_ptr<GNSSBlockInterface> in_filt_;
std::shared_ptr<GNSSBlockInterface> res_;
std::string role_;
std::string implementation_;
bool connected_;
};

17
src/algorithms/conditioner/adapters/signal_conditioner.cc
View File

@ -19,27 +19,20 @@
*/
#include "signal_conditioner.h"
#include "configuration_interface.h"
#include <glog/logging.h>
#include <utility>
// Constructor
SignalConditioner::SignalConditioner(const ConfigurationInterface *configuration,
std::shared_ptr<GNSSBlockInterface> data_type_adapt,
SignalConditioner::SignalConditioner(std::shared_ptr<GNSSBlockInterface> data_type_adapt,
std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> 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)
{
};
}

12
src/algorithms/conditioner/adapters/signal_conditioner.h
View File

@ -27,8 +27,6 @@
#include <memory>
#include <string>
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<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
SignalConditioner(std::shared_ptr<GNSSBlockInterface> data_type_adapt,
std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> 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<GNSSBlockInterface> data_type_adapter() { return data_type_adapt_; }
inline std::shared_ptr<GNSSBlockInterface> input_filter() { return in_filt_; }
@ -64,7 +63,6 @@ private:
std::shared_ptr<GNSSBlockInterface> in_filt_;
std::shared_ptr<GNSSBlockInterface> res_;
std::string role_;
std::string implementation_;
bool connected_;
};

8
src/core/receiver/gnss_block_factory.cc
View File

@ -242,20 +242,20 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
if (signal_conditioner == "Array_Signal_Conditioner")
{
// instantiate the array version
std::unique_ptr<GNSSBlockInterface> conditioner_ = std::make_unique<ArraySignalConditioner>(configuration,
std::unique_ptr<GNSSBlockInterface> conditioner_ = std::make_unique<ArraySignalConditioner>(
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<GNSSBlockInterface> conditioner_ = std::make_unique<SignalConditioner>(configuration,
std::unique_ptr<GNSSBlockInterface> conditioner_ = std::make_unique<SignalConditioner>(
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_;
}