Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

make format

Browse Source
This commit is contained in:
JacobCrabill
2020-08-28 08:58:43 -07:00
parent f356112aed
commit e4b28ee98a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/uavcan/sensors/analog_measurement.cpp
+4 -2
View File
@@ -37,7 +37,8 @@
const char *const UavcanAnalogMeasurementBridge::NAME = "analog_measurement"; const char *const UavcanAnalogMeasurementBridge::NAME = "analog_measurement";
UavcanAnalogMeasurementBridge::UavcanAnalogMeasurementBridge(uavcan::INode &node) : 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) _sub_analog_data(node)
{ } { }
@@ -61,7 +62,7 @@ int UavcanAnalogMeasurementBridge::init()
void void
UavcanAnalogMeasurementBridge::analog_measurement_sub_cb(const UavcanAnalogMeasurementBridge::analog_measurement_sub_cb(const
uavcan::ReceivedDataStructure<com::volansi::equipment::adc::AnalogMeasurement> &msg) uavcan::ReceivedDataStructure<com::volansi::equipment::adc::AnalogMeasurement> &msg)
{ {
analog_measurement_s report{}; analog_measurement_s report{};
@@ -69,6 +70,7 @@ UavcanAnalogMeasurementBridge::analog_measurement_sub_cb(const
report.id = node_id; report.id = node_id;
int numIndices = msg.values.size(); int numIndices = msg.values.size();
for (int i = 0; i < numIndices; i++) { for (int i = 0; i < numIndices; i++) {
report.values[i] = msg.values[i]; report.values[i] = msg.values[i];
report.unit_type[i] = msg.unit_type[i]; report.unit_type[i] = msg.unit_type[i];
src/drivers/uavcan/sensors/analog_measurement.hpp
+2 -1
View File
@@ -55,7 +55,8 @@ public:
private: private:
void analog_measurement_sub_cb(const uavcan::ReceivedDataStructure<com::volansi::equipment::adc::AnalogMeasurement> &msg); void analog_measurement_sub_cb(const uavcan::ReceivedDataStructure<com::volansi::equipment::adc::AnalogMeasurement>
&msg);
typedef uavcan::MethodBinder < UavcanAnalogMeasurementBridge *, typedef uavcan::MethodBinder < UavcanAnalogMeasurementBridge *,
void (UavcanAnalogMeasurementBridge::*) void (UavcanAnalogMeasurementBridge::*)
src/drivers/uavcannode/UavcanNode.cpp
+1 -1
View File
@@ -541,7 +541,7 @@ void UavcanNode::send_analog_measurements()
com::volansi::equipment::adc::AnalogMeasurement report{}; 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]) { if (measurement.unit_type[i]) {
report.unit_type[i] = measurement.unit_type[i]; report.unit_type[i] = measurement.unit_type[i];
report.values[i] = measurement.values[i]; report.values[i] = measurement.values[i];