diff options
author | Daniel Agar <daniel@agar.ca> | 2015-03-27 19:08:44 -0400 |
---|---|---|
committer | Daniel Agar <daniel@agar.ca> | 2015-03-27 23:38:58 -0400 |
commit | 8aae66b893444c74a22ad7beb89e3828e0444108 (patch) | |
tree | 893833e818d8138360f8fa0bf5554dc6b036f369 /src/modules/uavcan | |
parent | 5cc1a5dfdae53626c3cdf35e3d7b60f1a4ca68ed (diff) | |
download | px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.tar.gz px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.tar.bz2 px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.zip |
trivial code style cleanup round 2
Diffstat (limited to 'src/modules/uavcan')
-rw-r--r-- | src/modules/uavcan/sensors/baro.hpp | 6 | ||||
-rw-r--r-- | src/modules/uavcan/sensors/gnss.hpp | 6 | ||||
-rw-r--r-- | src/modules/uavcan/sensors/mag.hpp | 6 | ||||
-rw-r--r-- | src/modules/uavcan/uavcan_main.hpp | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/uavcan/sensors/baro.hpp b/src/modules/uavcan/sensors/baro.hpp index c7bbc5af8..16cd476ea 100644 --- a/src/modules/uavcan/sensors/baro.hpp +++ b/src/modules/uavcan/sensors/baro.hpp @@ -47,7 +47,7 @@ class UavcanBarometerBridge : public UavcanCDevSensorBridgeBase public: static const char *const NAME; - UavcanBarometerBridge(uavcan::INode& node); + UavcanBarometerBridge(uavcan::INode &node); const char *get_name() const override { return NAME; } @@ -58,9 +58,9 @@ private: void air_data_sub_cb(const uavcan::ReceivedDataStructure<uavcan::equipment::air_data::StaticAirData> &msg); - typedef uavcan::MethodBinder<UavcanBarometerBridge*, + typedef uavcan::MethodBinder < UavcanBarometerBridge *, void (UavcanBarometerBridge::*) - (const uavcan::ReceivedDataStructure<uavcan::equipment::air_data::StaticAirData>&)> + (const uavcan::ReceivedDataStructure<uavcan::equipment::air_data::StaticAirData> &) > AirDataCbBinder; uavcan::Subscriber<uavcan::equipment::air_data::StaticAirData, AirDataCbBinder> _sub_air_data; diff --git a/src/modules/uavcan/sensors/gnss.hpp b/src/modules/uavcan/sensors/gnss.hpp index 96ff9404f..4b94d9306 100644 --- a/src/modules/uavcan/sensors/gnss.hpp +++ b/src/modules/uavcan/sensors/gnss.hpp @@ -56,7 +56,7 @@ class UavcanGnssBridge : public IUavcanSensorBridge public: static const char *const NAME; - UavcanGnssBridge(uavcan::INode& node); + UavcanGnssBridge(uavcan::INode &node); const char *get_name() const override { return NAME; } @@ -72,8 +72,8 @@ private: */ void gnss_fix_sub_cb(const uavcan::ReceivedDataStructure<uavcan::equipment::gnss::Fix> &msg); - typedef uavcan::MethodBinder<UavcanGnssBridge*, - void (UavcanGnssBridge::*)(const uavcan::ReceivedDataStructure<uavcan::equipment::gnss::Fix>&)> + typedef uavcan::MethodBinder < UavcanGnssBridge *, + void (UavcanGnssBridge::*)(const uavcan::ReceivedDataStructure<uavcan::equipment::gnss::Fix> &) > FixCbBinder; uavcan::INode &_node; diff --git a/src/modules/uavcan/sensors/mag.hpp b/src/modules/uavcan/sensors/mag.hpp index db38aee1d..b74afeb0b 100644 --- a/src/modules/uavcan/sensors/mag.hpp +++ b/src/modules/uavcan/sensors/mag.hpp @@ -47,7 +47,7 @@ class UavcanMagnetometerBridge : public UavcanCDevSensorBridgeBase public: static const char *const NAME; - UavcanMagnetometerBridge(uavcan::INode& node); + UavcanMagnetometerBridge(uavcan::INode &node); const char *get_name() const override { return NAME; } @@ -59,9 +59,9 @@ private: void mag_sub_cb(const uavcan::ReceivedDataStructure<uavcan::equipment::ahrs::Magnetometer> &msg); - typedef uavcan::MethodBinder<UavcanMagnetometerBridge*, + typedef uavcan::MethodBinder < UavcanMagnetometerBridge *, void (UavcanMagnetometerBridge::*) - (const uavcan::ReceivedDataStructure<uavcan::equipment::ahrs::Magnetometer>&)> + (const uavcan::ReceivedDataStructure<uavcan::equipment::ahrs::Magnetometer> &) > MagCbBinder; uavcan::Subscriber<uavcan::equipment::ahrs::Magnetometer, MagCbBinder> _sub_mag; diff --git a/src/modules/uavcan/uavcan_main.hpp b/src/modules/uavcan/uavcan_main.hpp index 19b9b4b48..96b3ec1a6 100644 --- a/src/modules/uavcan/uavcan_main.hpp +++ b/src/modules/uavcan/uavcan_main.hpp @@ -82,7 +82,7 @@ public: static int start(uavcan::NodeID node_id, uint32_t bitrate); - Node& get_node() { return _node; } + Node &get_node() { return _node; } // TODO: move the actuator mixing stuff into the ESC controller class static int control_callback(uintptr_t handle, uint8_t control_group, uint8_t control_index, float &input); @@ -94,7 +94,7 @@ public: void print_info(); - static UavcanNode* instance() { return _instance; } + static UavcanNode *instance() { return _instance; } private: void fill_node_info(); @@ -122,7 +122,7 @@ private: UavcanEscController _esc_controller; - List<IUavcanSensorBridge*> _sensor_bridges; ///< List of active sensor bridges + List<IUavcanSensorBridge *> _sensor_bridges; ///< List of active sensor bridges MixerGroup *_mixers = nullptr; |