From e4b28ee98aba34abf6d5e432fbf5c03dacb89905 Mon Sep 17 00:00:00 2001 From: JacobCrabill Date: Fri, 28 Aug 2020 08:58:43 -0700 Subject: [PATCH] make format --- src/drivers/uavcan/sensors/analog_measurement.cpp | 6 ++++-- src/drivers/uavcan/sensors/analog_measurement.hpp | 3 ++- src/drivers/uavcannode/UavcanNode.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/drivers/uavcan/sensors/analog_measurement.cpp b/src/drivers/uavcan/sensors/analog_measurement.cpp index 1539e61378..a2ff60fe58 100644 --- a/src/drivers/uavcan/sensors/analog_measurement.cpp +++ b/src/drivers/uavcan/sensors/analog_measurement.cpp @@ -37,7 +37,8 @@ const char *const UavcanAnalogMeasurementBridge::NAME = "analog_measurement"; UavcanAnalogMeasurementBridge::UavcanAnalogMeasurementBridge(uavcan::INode &node) : - UavcanCDevSensorBridgeBase("uavcan_airspeed", "/dev/uavcan/analog_measurement", "/dev/analog_measurement", ORB_ID(analog_measurement)), + UavcanCDevSensorBridgeBase("uavcan_airspeed", "/dev/uavcan/analog_measurement", "/dev/analog_measurement", + ORB_ID(analog_measurement)), _sub_analog_data(node) { } @@ -61,7 +62,7 @@ int UavcanAnalogMeasurementBridge::init() void UavcanAnalogMeasurementBridge::analog_measurement_sub_cb(const - uavcan::ReceivedDataStructure &msg) + uavcan::ReceivedDataStructure &msg) { analog_measurement_s report{}; @@ -69,6 +70,7 @@ UavcanAnalogMeasurementBridge::analog_measurement_sub_cb(const report.id = node_id; int numIndices = msg.values.size(); + for (int i = 0; i < numIndices; i++) { report.values[i] = msg.values[i]; report.unit_type[i] = msg.unit_type[i]; diff --git a/src/drivers/uavcan/sensors/analog_measurement.hpp b/src/drivers/uavcan/sensors/analog_measurement.hpp index d0307ce620..a2938eaa46 100644 --- a/src/drivers/uavcan/sensors/analog_measurement.hpp +++ b/src/drivers/uavcan/sensors/analog_measurement.hpp @@ -55,7 +55,8 @@ public: private: - void analog_measurement_sub_cb(const uavcan::ReceivedDataStructure &msg); + void analog_measurement_sub_cb(const uavcan::ReceivedDataStructure + &msg); typedef uavcan::MethodBinder < UavcanAnalogMeasurementBridge *, void (UavcanAnalogMeasurementBridge::*) diff --git a/src/drivers/uavcannode/UavcanNode.cpp b/src/drivers/uavcannode/UavcanNode.cpp index 3656ed95d3..fa5deebadf 100644 --- a/src/drivers/uavcannode/UavcanNode.cpp +++ b/src/drivers/uavcannode/UavcanNode.cpp @@ -541,7 +541,7 @@ void UavcanNode::send_analog_measurements() com::volansi::equipment::adc::AnalogMeasurement report{}; - for (size_t i = 0; i < sizeof(measurement.values)/sizeof(measurement.values[0]); i++) { + for (size_t i = 0; i < sizeof(measurement.values) / sizeof(measurement.values[0]); i++) { if (measurement.unit_type[i]) { report.unit_type[i] = measurement.unit_type[i]; report.values[i] = measurement.values[i];