mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 15:23:04 +00:00
Code Issues Releases Wiki Activity

Clean files

Browse Source
This commit is contained in:
Carles Fernandez
2019-04-27 13:09:36 +02:00
parent baeb326f84
commit 19fcd60522
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,10 +38,9 @@
#include "tracking_interface.h"
#include <glog/logging.h>
#include <cstring> // for memcpy
#include <utility>
#include <utility> // for std::move
// Constructor
Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr<AcquisitionInterface> acq,
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> 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";

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

@@ -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<AcquisitionInterface> acq,
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> 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_