From 19fcd6052206ac161d64ef51614ed16e2e209069 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 27 Apr 2019 13:09:36 +0200 Subject: [PATCH] Clean files --- src/algorithms/channel/adapters/channel.cc | 7 +++---- src/algorithms/channel/adapters/channel.h | 9 +++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index d632be535..6abaf2229 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -38,10 +38,9 @@ #include "tracking_interface.h" #include #include // for memcpy -#include +#include // for std::move -// Constructor 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, gr::msg_queue::sptr queue) @@ -120,7 +119,6 @@ Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::s } -// Destructor Channel::~Channel() = default; @@ -133,8 +131,9 @@ void Channel::connect(gr::top_block_sptr top_block) trk_->connect(top_block); nav_->connect(top_block); - //Synchronous ports + // Synchronous ports top_block->connect(trk_->get_right_block(), 0, nav_->get_left_block(), 0); + // Message ports top_block->msg_connect(nav_->get_left_block(), pmt::mp("telemetry_to_trk"), trk_->get_right_block(), pmt::mp("telemetry_to_trk")); DLOG(INFO) << "tracking -> telemetry_decoder"; diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 975122852..a238f490c 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -34,6 +34,7 @@ #ifndef GNSS_SDR_CHANNEL_H_ #define GNSS_SDR_CHANNEL_H_ + #include "channel_fsm.h" #include "channel_interface.h" #include "channel_msg_receiver_cc.h" @@ -51,7 +52,7 @@ class ConfigurationInterface; class AcquisitionInterface; class TrackingInterface; class TelemetryDecoderInterface; -//class ChannelFsm; + /*! * \brief This class represents a GNSS channel. It wraps an AcquisitionInterface, @@ -66,8 +67,8 @@ public: Channel(ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, std::shared_ptr trk, std::shared_ptr nav, std::string role, std::string implementation, gr::msg_queue::sptr queue); - //! Virtual destructor - virtual ~Channel(); + + virtual ~Channel(); //!< Virtual destructor 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; @@ -108,4 +109,4 @@ private: std::mutex mx; }; -#endif /*GNSS_SDR_CHANNEL_H_*/ +#endif // GNSS_SDR_CHANNEL_H_