mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-20 05:33:33 +08:00
Automated style fixes in order to bring the code a little bit closer to compliance with MISRA C++ rules. No changes in logic.
This commit is contained in:
@@ -16,13 +16,13 @@ namespace uavcan
|
||||
class DataTypeInfoProvider : Noncopyable
|
||||
{
|
||||
typedef MethodBinder<DataTypeInfoProvider*,
|
||||
void (DataTypeInfoProvider::*)(const protocol::ComputeAggregateTypeSignature::Request&,
|
||||
protocol::ComputeAggregateTypeSignature::Response&)>
|
||||
void (DataTypeInfoProvider::*)(const protocol::ComputeAggregateTypeSignature::Request&,
|
||||
protocol::ComputeAggregateTypeSignature::Response&)>
|
||||
ComputeAggregateTypeSignatureCallback;
|
||||
|
||||
typedef MethodBinder<DataTypeInfoProvider*,
|
||||
void (DataTypeInfoProvider::*)(const protocol::GetDataTypeInfo::Request&,
|
||||
protocol::GetDataTypeInfo::Response&)> GetDataTypeInfoCallback;
|
||||
void (DataTypeInfoProvider::*)(const protocol::GetDataTypeInfo::Request&,
|
||||
protocol::GetDataTypeInfo::Response&)> GetDataTypeInfoCallback;
|
||||
|
||||
ServiceServer<protocol::ComputeAggregateTypeSignature, ComputeAggregateTypeSignatureCallback> cats_srv_;
|
||||
ServiceServer<protocol::GetDataTypeInfo, GetDataTypeInfoCallback> gdti_srv_;
|
||||
@@ -39,8 +39,8 @@ class DataTypeInfoProvider : Noncopyable
|
||||
|
||||
public:
|
||||
DataTypeInfoProvider(INode& node)
|
||||
: cats_srv_(node)
|
||||
, gdti_srv_(node)
|
||||
: cats_srv_(node)
|
||||
, gdti_srv_(node)
|
||||
{ }
|
||||
|
||||
int start();
|
||||
|
||||
@@ -26,8 +26,8 @@ class GlobalTimeSyncMaster : protected LoopbackFrameListenerBase
|
||||
|
||||
public:
|
||||
IfaceMaster(INode& node, uint8_t iface_index)
|
||||
: pub_(node)
|
||||
, iface_index_(iface_index)
|
||||
: pub_(node)
|
||||
, iface_index_(iface_index)
|
||||
{
|
||||
assert(iface_index < MaxCanIfaces);
|
||||
}
|
||||
@@ -48,9 +48,9 @@ class GlobalTimeSyncMaster : protected LoopbackFrameListenerBase
|
||||
|
||||
public:
|
||||
GlobalTimeSyncMaster(INode& node)
|
||||
: LoopbackFrameListenerBase(node.getDispatcher())
|
||||
, node_(node)
|
||||
, initialized_(false)
|
||||
: LoopbackFrameListenerBase(node.getDispatcher())
|
||||
, node_(node)
|
||||
, initialized_(false)
|
||||
{ }
|
||||
|
||||
int init();
|
||||
|
||||
@@ -14,7 +14,8 @@ namespace uavcan
|
||||
class GlobalTimeSyncSlave : Noncopyable
|
||||
{
|
||||
typedef MethodBinder<GlobalTimeSyncSlave*,
|
||||
void (GlobalTimeSyncSlave::*)(const ReceivedDataStructure<protocol::GlobalTimeSync>&)> GlobalTimeSyncCallback;
|
||||
void (GlobalTimeSyncSlave::*)(const ReceivedDataStructure<protocol::GlobalTimeSync>&)>
|
||||
GlobalTimeSyncCallback;
|
||||
|
||||
// Static buffers are explicitly disabled because time should never be unicasted.
|
||||
Subscriber<protocol::GlobalTimeSync, GlobalTimeSyncCallback, 2, 0> sub_;
|
||||
@@ -39,9 +40,9 @@ class GlobalTimeSyncSlave : Noncopyable
|
||||
|
||||
public:
|
||||
GlobalTimeSyncSlave(INode& node)
|
||||
: sub_(node)
|
||||
, state_(Update)
|
||||
, prev_iface_index_(0xFF)
|
||||
: sub_(node)
|
||||
, state_(Update)
|
||||
, prev_iface_index_(0xFF)
|
||||
{ }
|
||||
|
||||
int start();
|
||||
|
||||
@@ -41,8 +41,8 @@ private:
|
||||
|
||||
public:
|
||||
Logger(INode& node)
|
||||
: logmsg_pub_(node)
|
||||
, external_sink_(NULL)
|
||||
: logmsg_pub_(node)
|
||||
, external_sink_(NULL)
|
||||
{
|
||||
level_ = protocol::debug::LogLevel::ERROR;
|
||||
setTxTimeout(MonotonicDuration::fromMSec(DefaultTxTimeoutMs));
|
||||
|
||||
@@ -19,11 +19,11 @@ namespace uavcan
|
||||
|
||||
class NodeStatusProvider : private Timer
|
||||
{
|
||||
typedef MethodBinder<NodeStatusProvider*, void(NodeStatusProvider::*)(const protocol::GlobalDiscoveryRequest&)>
|
||||
typedef MethodBinder<NodeStatusProvider*, void (NodeStatusProvider::*)(const protocol::GlobalDiscoveryRequest&)>
|
||||
GlobalDiscoveryRequestCallback;
|
||||
typedef MethodBinder<NodeStatusProvider*,
|
||||
void(NodeStatusProvider::*)(const protocol::GetNodeInfo::Request&,
|
||||
protocol::GetNodeInfo::Response&)> GetNodeInfoCallback;
|
||||
void (NodeStatusProvider::*)(const protocol::GetNodeInfo::Request&,
|
||||
protocol::GetNodeInfo::Response&)> GetNodeInfoCallback;
|
||||
|
||||
const MonotonicTime creation_timestamp_;
|
||||
|
||||
@@ -46,11 +46,11 @@ class NodeStatusProvider : private Timer
|
||||
|
||||
public:
|
||||
NodeStatusProvider(INode& node)
|
||||
: Timer(node)
|
||||
, creation_timestamp_(node.getMonotonicTime())
|
||||
, node_status_pub_(node)
|
||||
, gdr_sub_(node)
|
||||
, gni_srv_(node)
|
||||
: Timer(node)
|
||||
, creation_timestamp_(node.getMonotonicTime())
|
||||
, node_status_pub_(node)
|
||||
, gdr_sub_(node)
|
||||
, gni_srv_(node)
|
||||
{
|
||||
assert(!creation_timestamp_.isZero());
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ class PanicBroadcaster : private Timer
|
||||
|
||||
public:
|
||||
PanicBroadcaster(INode& node)
|
||||
: Timer(node)
|
||||
, pub_(node)
|
||||
: Timer(node)
|
||||
, pub_(node)
|
||||
{
|
||||
pub_.setTxTimeout(MonotonicDuration::fromMSec(protocol::Panic::BROADCASTING_INTERVAL_MS - 10));
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
#include <uavcan/debug.hpp>
|
||||
#include <uavcan/node/subscriber.hpp>
|
||||
#include <uavcan/util/method_binder.hpp>
|
||||
#include <uavcan/protocol/Panic.hpp>
|
||||
@@ -17,10 +19,10 @@ namespace uavcan
|
||||
* void (const protocol::Panic&)
|
||||
* The listener can be stopped from the callback.
|
||||
*/
|
||||
template <typename Callback = void(*)(const ReceivedDataStructure<protocol::Panic>&)>
|
||||
template <typename Callback = void (*)(const ReceivedDataStructure<protocol::Panic>&)>
|
||||
class PanicListener : Noncopyable
|
||||
{
|
||||
typedef MethodBinder<PanicListener*, void(PanicListener::*)(const ReceivedDataStructure<protocol::Panic>&)>
|
||||
typedef MethodBinder<PanicListener*, void (PanicListener::*)(const ReceivedDataStructure<protocol::Panic>&)>
|
||||
PanicMsgCallback;
|
||||
|
||||
Subscriber<protocol::Panic, PanicMsgCallback> sub_;
|
||||
@@ -73,9 +75,9 @@ class PanicListener : Noncopyable
|
||||
|
||||
public:
|
||||
PanicListener(INode& node)
|
||||
: sub_(node)
|
||||
, callback_()
|
||||
, num_subsequent_msgs_(0)
|
||||
: sub_(node)
|
||||
, callback_()
|
||||
, num_subsequent_msgs_(0)
|
||||
{ }
|
||||
|
||||
int start(const Callback& callback)
|
||||
|
||||
@@ -22,8 +22,8 @@ public:
|
||||
class RestartRequestServer : Noncopyable
|
||||
{
|
||||
typedef MethodBinder<const RestartRequestServer*,
|
||||
void(RestartRequestServer::*)(const ReceivedDataStructure<protocol::RestartNode::Request>&,
|
||||
protocol::RestartNode::Response&) const> RestartNodeCallback;
|
||||
void (RestartRequestServer::*)(const ReceivedDataStructure<protocol::RestartNode::Request>&,
|
||||
protocol::RestartNode::Response&) const> RestartNodeCallback;
|
||||
|
||||
ServiceServer<protocol::RestartNode, RestartNodeCallback> srv_;
|
||||
IRestartRequestHandler* handler_;
|
||||
@@ -33,8 +33,8 @@ class RestartRequestServer : Noncopyable
|
||||
|
||||
public:
|
||||
RestartRequestServer(INode& node)
|
||||
: srv_(node)
|
||||
, handler_(NULL)
|
||||
: srv_(node)
|
||||
, handler_(NULL)
|
||||
{ }
|
||||
|
||||
IRestartRequestHandler* getHandler() const { return handler_; }
|
||||
|
||||
Reference in New Issue
Block a user